yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

zhanglei
dimengzhe 2 years ago
parent
9ad5f6c5b0
commit
105bfb96e7
4 changed files with 61 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  3. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  4. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

101
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -468,7 +468,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrderModelDetailsVo != null) {
//查询现车车辆
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum())){
if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())){
List<String> vinList = new ArrayList<>();
vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")");
busSalesOrderModelDetailsVo.setVinNo(vinList);
@ -523,52 +523,55 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
String topMessage = "";
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
//颜色
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
topMessage = topMessage + busSalesOrderMakeup.getColor();
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
topMessage = topMessage + busSalesOrderMakeup.getTopName();
}
//板材厚度
String ssMessage = "";
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())) {
ssMessage = "底" + busSalesOrderMakeup.getThicknessBottom() + "mm";
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())) {
ssMessage = ssMessage + "边" + busSalesOrderMakeup.getThicknessEdge() + "mm";
}
if (StringUtils.isNotBlank(ssMessage)) {
topMessage = topMessage + "、" + ssMessage;
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
}
//篷布滑道
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide()) && !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
}
//冷藏冷机
if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
if (!busSalesOrderMakeup.getRefirgerator().contains("机")) {
topMessage = topMessage + "冷机";
if(busSalesOrderMakeup != null){
//颜色
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
topMessage = topMessage + busSalesOrderMakeup.getColor();
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
topMessage = topMessage + busSalesOrderMakeup.getTopName();
}
//板材厚度
String ssMessage = "";
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())) {
ssMessage = "底" + busSalesOrderMakeup.getThicknessBottom() + "mm";
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())) {
ssMessage = ssMessage + "边" + busSalesOrderMakeup.getThicknessEdge() + "mm";
}
if (StringUtils.isNotBlank(ssMessage)) {
topMessage = topMessage + "、" + ssMessage;
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
}
//篷布滑道
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide()) && !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
}
//冷藏冷机
if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
if (!busSalesOrderMakeup.getRefirgerator().contains("机")) {
topMessage = topMessage + "冷机";
}
}
//自卸液压盖板
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl()) && !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
}
//底板加热
if (StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating()) && !"-".equals(busSalesOrderMakeup.getFloorHeating())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
}
//更多配置
if (StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig()) && !"-".equals(busSalesOrderMakeup.getMoreConfig())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
}
busSalesOrderMakeupDetailsVo.setTopMessage(topMessage);
vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
}
//自卸液压盖板
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl()) && !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
}
//底板加热
if (StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating()) && !"-".equals(busSalesOrderMakeup.getFloorHeating())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
}
//更多配置
if (StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig()) && !"-".equals(busSalesOrderMakeup.getMoreConfig())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
}
busSalesOrderMakeupDetailsVo.setTopMessage(topMessage);
vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
}
/*************************************************优惠明细*****************************************************/
List<BusSalesOrderDiscountDetailsVo> busSalesOrderDiscountDetailsVoList = busSalesOrderDiscountService.detailsList(entity.getSid());
@ -1323,7 +1326,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> initBigDecimalOneList = new ArrayList<>();
//是否是现车//ToDo:促销政策
if ("1".equals(busSalesOrder.getType())) {
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
@ -2418,7 +2421,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型：0现车、1采购订单、2排产
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) {
if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum());
} else {
//类型为现车，查询该销售订单的现车车辆信息
@ -3416,7 +3419,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//若前端传值的订单类型为0则为现车，为1采购订单，为2排产
//数据库中1为现车，2为采购订单，3为排产
if ("0".equals(modelInfo.getType())) {
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())){
List<String> vinList = new ArrayList<>();
vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")");
modelInfo.setVinList(vinList);
@ -5177,7 +5180,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
//更新已选择的车架号的状态为销售订单锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
list.removeAll(Collections.singleton(null));

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -235,7 +235,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
}
//现车下不确定车架号的车辆数量
String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum();
if(StringUtils.isBlank(nowCarUnknownVinNum)){
if(StringUtils.isBlank(nowCarUnknownVinNum) || "0".equals(nowCarUnknownVinNum)){
//添加上装信息===========
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
if (details.getData() != null) {
@ -685,7 +685,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
int num = 0;
if ("0".equals(state)) {//现车
type = "1";
if(StringUtils.isNotBlank(nowCarUnknownVinNum)){//不确定车架号
if(StringUtils.isNotBlank(nowCarUnknownVinNum) && !"0".equals(nowCarUnknownVinNum)){//不确定车架号
num = Integer.valueOf(nowCarUnknownVinNum).intValue();
busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
@ -766,7 +766,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
}
if ("3".equals(type) || "2".equals(type) || StringUtils.isNotBlank(nowCarUnknownVinNum)) {
if ("3".equals(type) || "2".equals(type) || (StringUtils.isNotBlank(nowCarUnknownVinNum) && !"0".equals(nowCarUnknownVinNum))) {
for (int i = 0; i < num; i++) {
BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -368,10 +368,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto = dingList.get(i);
BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getCurrentReceivableMoney());
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getSubscriptionMoney());
if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) {
return rb.setMsg("订金不允许多收，请检查");
if(finSelectedReceivablesDetailedDto.getSubscribedOf() == 0){
if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) {
return rb.setMsg("应收未收中的订金不允许多收，请检查");
}
}
}
}
return rb.success();

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
View File

@ -685,7 +685,7 @@ public class AppBusSalesOrderService {
List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
flowOrderVo.setList(list);
}
if ("3".equals(busSalesOrder.getType()) || StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) {
if ("3".equals(busSalesOrder.getType()) || (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
flowOrderVo.setShow(true);
} else {
flowOrderVo.setShow(false);

Write Preview
Loading…
Cancel
Save