Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -17,9 +17,7 @@ import com.yxt.anrui.base.api.basediscountpackage.flow.SubmitBaseDiscountpackage
 import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh;
 import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
 import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
-import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo;
 import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDetailsVo;
-import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelFeign;
 import com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehService;
 import com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -406,6 +404,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             }
         }
         qw.eq("salesPolicyKey", "0002");
+        qw.eq("nodeState","已办结");
         return qw;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java

@@ -55,16 +55,16 @@ public class BusSalesOrderPriceDto implements Dto {
 
     private static final long serialVersionUID = -1959772405551004198L;
     @ApiModelProperty(value = "单台指导价（主车加上装）", required = true)
-    @NotBlank(message = "参数错误：价格信息单台指导价不能为空")
+//    @NotBlank(message = "参数错误：价格信息单台指导价不能为空")
     private String singleGuildPrice;
     @ApiModelProperty(value = "单台成交价（主车加上装）", required = true)
-    @NotBlank(message = "参数错误：价格信息单台成交价不能为空")
+//    @NotBlank(message = "参数错误：价格信息单台成交价不能为空")
     private String singleFinalPrice;
     @ApiModelProperty("台数")
     @NotNull(message = "参数错误：价格信息台数不能为空")
     private Integer quantity;
     @ApiModelProperty("车价合计")
-    @NotBlank(message = "参数错误：车价合计不能为空")
+//    @NotBlank(message = "参数错误：车价合计不能为空")
     private String priceSum;
     @ApiModelProperty("计划提车地点")
     @NotBlank(message = "参数错误：计划提车地点不能为空")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1677,8 +1677,16 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bd.staffSid", query.getStaffSid());
 //        qw.eq("bc.customerSid", query.getCustomerSid());
-        qw.eq("bd.state", 1);
+//        qw.eq("bd.state", 1);
         qw.eq("bmd.depositBillTypeKey", "01");
+        //查询已审核通过的款项确认
+        ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
+        if(stringList.getSuccess()){
+            if(!stringList.getData().isEmpty()){
+                qw.in("bmd.billNo",stringList.getData());
+            }
+        }
+        qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         return qw;
     }
 

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

@@ -429,6 +429,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //虚拟订单和订金关联信息
         List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
         if (StringUtils.isBlank(sid)) {//新增
+            //单台整体成交价
+            BigDecimal singleFinalPrice = new BigDecimal("0");
+            //单台整体指导价
+            BigDecimal singleGuildPrice = new BigDecimal("0");
+            //台数
+            Integer num = 0;
+            //订金合计
+            BigDecimal depositAll = new BigDecimal("0");
             //保存单据信息
             BusSalesOrder busSalesOrder = new BusSalesOrder();
             BeanUtil.copyProperties(dto, busSalesOrder, "sid");
@@ -438,6 +446,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             sid = busSalesOrder.getSid();
             //主车车型信息保存
             busSalesOrderModelService.saveModel(busSalesOrderModelDto, sid);
+            if(busSalesOrderModelDto != null){
+                if(StringUtils.isNotBlank(busSalesOrderModelDto.getGuildPrice())){
+                    singleGuildPrice = singleGuildPrice.add(new BigDecimal(busSalesOrderModelDto.getGuildPrice()));
+                }
+                if(StringUtils.isNotBlank(busSalesOrderModelDto.getFinalPrice())){
+                    singleFinalPrice = singleFinalPrice.add(new BigDecimal(busSalesOrderModelDto.getFinalPrice()));
+                }
+            }
             if(StringUtils.isNotBlank(dto.getType())){
                 if ("1".equals(dto.getType())) {
                     //现车车辆信息
@@ -450,8 +466,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             String isTop = dto.getIsTop();
             if ("1".equals(isTop)) {
                 busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, sid);
+                if(busSalesOrderMakeupDto != null){
+                    if(StringUtils.isNotBlank(busSalesOrderMakeupDto.getTopPrice())){
+                        singleFinalPrice = singleFinalPrice.add(new BigDecimal(busSalesOrderMakeupDto.getTopPrice()));
+                        singleGuildPrice = singleGuildPrice.add(new BigDecimal(busSalesOrderMakeupDto.getTopPrice()));
+                    }
+                }
             }
             //价格信息
+            busSalesOrderPriceDto.setSingleFinalPrice(singleFinalPrice.toString());
+            busSalesOrderPriceDto.setSingleGuildPrice(singleGuildPrice.toString());
+            if(busSalesOrderPriceDto != null){
+                if(busSalesOrderPriceDto.getQuantity() != null){
+                    num = busSalesOrderPriceDto.getQuantity();
+                }
+            }
             busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, sid);
             //主车优惠明细
             busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, sid);
@@ -469,6 +498,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                 }
             }
+            if(busSalesOrderDepositDto != null){
+                if(StringUtils.isNotBlank(busSalesOrderDepositDto.getDeposit())){
+                    depositAll = depositAll.add(new BigDecimal(busSalesOrderDepositDto.getDeposit()).add(new BigDecimal(num)));
+                    busSalesOrderDepositDto.setDepositAll(depositAll.toString());
+                }
+            }
+            BigDecimal makeUpDepositAll = busDepositFictitiousDtoList.stream().map(v->new BigDecimal(StringUtils.isNotBlank(v.getPrice())?v.getPrice():"0")).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal makeUpDeposit = depositAll.subtract(makeUpDepositAll);
+            busSalesOrderDepositDto.setMakeUpDeposit(makeUpDeposit.toString());
             String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid);
             if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
                 //结转
@@ -477,6 +515,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
 
         } else {
+            //单台整体成交价
+            BigDecimal singleFinalPrice = new BigDecimal("0");
+            //单台整体指导价
+            BigDecimal singleGuildPrice = new BigDecimal("0");
+            //台数
+            Integer num = 0;
+            //订金合计
+            BigDecimal depositAll = new BigDecimal("0");
             BusSalesOrder busSalesOrder = fetchBySid(sid);
             if (busSalesOrder == null) {
                 return rb.setMsg("该单据不存在");
@@ -488,6 +534,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             baseMapper.updateById(busSalesOrder);
             //主车车型信息保存
             busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
+            if(busSalesOrderModelDto != null){
+                if(StringUtils.isNotBlank(busSalesOrderModelDto.getGuildPrice())){
+                    singleGuildPrice = singleGuildPrice.add(new BigDecimal(busSalesOrderModelDto.getGuildPrice()));
+                }
+                if(StringUtils.isNotBlank(busSalesOrderModelDto.getFinalPrice())){
+                    singleFinalPrice = singleFinalPrice.add(new BigDecimal(busSalesOrderModelDto.getFinalPrice()));
+                }
+            }
             busSalesOrderVehicleService.deleteByOrderSid(dto.getSid());
             busSalesVehicleOrderService.deleteByOrderSid(dto.getSid());
             if ("1".equals(dto.getType())) {
@@ -508,6 +562,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderMakeupService.deleteBySalesOrderSid(dto.getSid());
             }
             //价格信息
+            busSalesOrderPriceDto.setSingleFinalPrice(singleFinalPrice.toString());
+            busSalesOrderPriceDto.setSingleGuildPrice(singleGuildPrice.toString());
+            if(busSalesOrderPriceDto != null){
+                if(busSalesOrderPriceDto.getQuantity() != null){
+                    num = busSalesOrderPriceDto.getQuantity();
+                }
+            }
             busSalesOrderPriceService.updateOrderPrice(busSalesOrderPriceDto, dto.getSid());
             //主车优惠明细
             busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid());
@@ -524,6 +585,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
 
             }
+            if(busSalesOrderDepositDto != null){
+                if(StringUtils.isNotBlank(busSalesOrderDepositDto.getDeposit())){
+                    depositAll = depositAll.add(new BigDecimal(busSalesOrderDepositDto.getDeposit()).add(new BigDecimal(num)));
+                    busSalesOrderDepositDto.setDepositAll(depositAll.toString());
+                }
+            }
+            BigDecimal makeUpDepositAll = busDepositFictitiousDtoList.stream().map(v->new BigDecimal(StringUtils.isNotBlank(v.getPrice())?v.getPrice():"0")).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal makeUpDeposit = depositAll.subtract(makeUpDepositAll);
+            busSalesOrderDepositDto.setMakeUpDeposit(makeUpDeposit.toString());
             busSalesOrderDepositService.updateOrderDepo(busSalesOrderDepositDto, dto.getSid());
             BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(dto.getSid());
             if (busSalesOrderDeposit != null) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -77,6 +77,12 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         BigDecimal finalPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleFinalPrice());
         busSalesOrderPrice.setSingleFinalPrice(finalPriceAll);
         busSalesOrderPrice.setSalesOrderSid(sid);
+        if(busSalesOrderPrice.getQuantity() != null){
+            BigDecimal priceSum = finalPriceAll.add(new BigDecimal(busSalesOrderPrice.getQuantity()));
+            busSalesOrderPrice.setPriceSum(priceSum);
+        }else{
+            busSalesOrderPrice.setPriceSum(finalPriceAll);
+        }
         baseMapper.insert(busSalesOrderPrice);
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -246,7 +246,10 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
 
     public String getOrgByOrgSid(String orgSid) {
         SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
-        if ("0".equals(sysOrganization.getPsid()) || sysOrganization == null) {
+        if(sysOrganization == null){
+            return "0";
+        }
+        if ("0".equals(sysOrganization.getPsid())) {
             return "0";
         }
         if (sysOrganization.getIsDept() == 0) {