Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -104,4 +104,11 @@ public class BusSalesOrder extends BaseEntity {
     private String type;
     @ApiModelProperty("单台开票金额")
     private BigDecimal oneBillMoney; // 单台开票金额
+
+    @ApiModelProperty(value = "客户类型key")
+    private String customerClassKey;
+    @ApiModelProperty(value = "客户类型")
+    private String customerClass;
+    @ApiModelProperty(value = "客户头像")
+    private String customerPhoto;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -92,6 +92,7 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
         for (int i = 0; i < busDepositFictitiousDtoList.size(); i++) {
             BusDepositFictitious busDepositFictitious = new BusDepositFictitious();
             BeanUtil.copyProperties(busDepositFictitiousDtoList.get(i), busDepositFictitious, "sid");
+            busDepositFictitious.setDepositSid(sid);
             baseMapper.insert(busDepositFictitious);
         }
     }

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

@@ -35,8 +35,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMapper.java <br/>
@@ -54,12 +52,14 @@ import java.util.List;
 public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     IPage<BusSalesOrderVo> selectPageVo(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrder> qw);
+
     void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState,
                          @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
 
 
     @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
-    int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney);
+    int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid, @Param("oneBillMoney") String oneBillMoney);
+
     /**
      * App销售订单分页列表
      *
@@ -84,4 +84,12 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      * @return
      */
     AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid更新销售订单的状态
+     *
+     * @param state       状态：审批通过1，不通过2
+     * @param businessSid 销售订单sid
+     */
+    void updateStateByBusinessSid(@Param("state") int state, @Param("businessSid") String businessSid);
 }

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

@@ -5,23 +5,23 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo">
         SELECT bo.sid,
-        bo.nodeState,
+               bo.nodeState,
-        bo.billNo,
+               bo.billNo,
-        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
+               DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
-        bo.customerName,
+               bo.customerName,
-        bo.mobile,
+               bo.mobile,
-        bm.brandName,
+               bm.brandName,
-        bp.singleFinalPrice,
+               bp.singleFinalPrice,
-        bp.quantity,
+               bp.quantity,
-        bo.payType,
+               bo.payType,
-        bd.depositAll,
+               bd.depositAll,
-        case bo.isInsurance
+               case bo.isInsurance
-        when 0 then '否'
+                   when 0 then '否'
-        when 1 then '是' end as isInsurance
+                   when 1 then '是' end                as isInsurance
         FROM bus_sales_order bo
-        left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
+                 left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+                 left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -37,24 +37,24 @@
     </update>
     <!--app查询销售订单列表-->
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo">
-        SELECT bo.sid AS saleOrderSid,
+        SELECT bo.sid                                 AS saleOrderSid,
-        bo.billNo AS saleOrderId,
+               bo.billNo                              AS saleOrderId,
-        bo.customerClass AS customerType,
+               bo.customerClass                       AS customerType,
-        bo.customerSid,
+               bo.customerSid,
-        bo.customerName,
+               bo.customerName,
-        bo.customerPhoto AS customerImage,
+               bo.customerPhoto                       AS customerImage,
-        bo.mobile,
+               bo.mobile,
-        bo.payType AS carPurchaseType,
+               bo.payType                             AS carPurchaseType,
-        bo.payTypeKey AS carPurchaseKey,
+               bo.payTypeKey                          AS carPurchaseKey,
-        bd.depositAll AS deposit,
+               bd.depositAll                          AS deposit,
-        bo.nodeState AS saleOrderState,
+               bo.nodeState                           AS saleOrderState,
-        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
+               DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
-        case bo.isInsurance
+               case bo.isInsurance
-        when 0 then '否'
+                   when 0 then '否'
-        when 1 then '是' end as insuranceInfo
+                   when 1 then '是' end                as insuranceInfo
         FROM bus_sales_order bo
-        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+                 left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -81,4 +81,10 @@
         FROM bus_sales_order bo
         WHERE bo.sid = #{saleOrderSid}
     </select>
+    <!--根据销售订单sid更新销售订单的状态-->
+    <update id="updateStateByBusinessSid">
+        update bus_sales_order
+        set state = #{state}
+        where sid = #{businessSid}
+    </update>
 </mapper>

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

@@ -134,8 +134,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
     private FlowableFeign flowableFeign;
+    @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
     @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
@@ -405,9 +408,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //判断补交金额和订金合计-本次结转金额
             String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
-            if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
+            if(StringUtils.isNotBlank(makeUpDeposit)){
-                return rb.setMsg("订金信息中需补交订金数值计算错误");
+                if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
+                    return rb.setMsg("订金信息中需补交订金数值计算错误");
+                }
             }
+
         }
         return rb.success();
     }
@@ -500,32 +506,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         baseMapper.insert(busSalesOrder);
         String sid = busSalesOrder.getSid();
         //主车车型信息保存
-        busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
+        busSalesOrderModelService.saveModel(busSalesOrderModelDto, sid);
         if ("1".equals(dto.getType())) {
             //现车车辆信息
-            busSalesOrderVehicleService.saveVehicle(list, dto.getSid());
+            busSalesOrderVehicleService.saveVehicle(list, sid);
         } else if ("2".equals(dto.getType())) {
             //采购订单信息
-            busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid());
+            busSalesVehicleOrderService.saveOrder(vehicleList, sid);
         }
         //是否含有上装信息
         String isTop = dto.getIsTop();
         if ("1".equals(isTop)) {
-            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid());
+            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, sid);
         }
         //价格信息
-        busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, dto.getSid());
+        busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, sid);
         //主车优惠明细
-        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid());
+        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, sid);
         //是否有保险说明
         String isInsurance = dto.getIsInsurance();
         if ("1".equals(isInsurance)) {
-            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid());
+            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, sid);
         }
-        busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, dto.getSid());
+        String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid);
         if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
             //现交订金
-            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid());
+            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, depositSid);
         }
         return sid;
 
@@ -731,6 +737,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+                //更新销售订单的状态为已通过的状态:审批通过1
+                //ToDo:
+                updateStateByBusinessSid(1,variables.get("businessSid").toString());
+
+
+
             }
         }
         map.put("nodeState", nodeState);
@@ -739,6 +751,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
+    /**
+     * 更新销售订单的状态
+     * @param state 状态，审批通过1，不通过2
+     * @param businessSid
+     */
+    private void updateStateByBusinessSid(int state, String businessSid) {
+        baseMapper.updateStateByBusinessSid(state,businessSid);
+    }
+
     public ResultBean reject(BusSalesOrderFlowDto dto) {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         BeanUtil.copyProperties(dto, flowTaskVo);
@@ -763,6 +784,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         BeanUtil.copyProperties(dto, flowTaskVo);
+        //查询是否是最后一步
+        ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId());
+        if (listResultBean.getData().size() == 0) {
+            //更新销售订单的状态为不通过
+            updateStateByBusinessSid(2,dto.getBusinessSid());
+        }
         ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo);
         if (!resultBean.getSuccess()) {
             return resultBean;
@@ -1185,10 +1212,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderInsuranceService.deleteByOrderSid(sid);
             }
             BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
-            busSalesOrderDepositService.deleteByOrderSid(sid);
+            if(busSalesOrderDeposit != null){
-            if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                busSalesOrderDepositService.deleteByOrderSid(sid);
-                busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+                if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                    busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+                }
             }
+
         }
         return rb.success().setMsg("删除成功");
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -79,10 +79,12 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         return vo;
     }
 
-    public void saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
+    public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
         BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
+        busSalesOrderDeposit.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderDeposit);
+        return busSalesOrderDeposit.getSid();
     }
 
     public void updateOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -87,6 +87,7 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
         for (int i = 0; i < busSalesOrderDiscountList.size(); i++) {
             BusSalesOrderDiscount busSalesOrderDiscount = new BusSalesOrderDiscount();
             BeanUtil.copyProperties(busSalesOrderDiscountList.get(i), busSalesOrderDiscount, "sid");
+            busSalesOrderDiscount.setSalesOrderSid(sid);
             baseMapper.insert(busSalesOrderDiscount);
         }
     }

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

@@ -87,6 +87,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             BusSalesOrderModel busSalesOrderModel1 = new BusSalesOrderModel();
             if (busSalesOrderModelDto != null) {
                 BeanUtil.copyProperties(busSalesOrderModelDto, busSalesOrderModel1, "sid");
+                busSalesOrderModel1.setSalesOrderSid(sid);
                 save(busSalesOrderModel1);
             }
         } else {

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

@@ -82,6 +82,7 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         busSalesOrderPrice.setSingleGuildPrice(guildPriceAll);
         BigDecimal finalPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleFinalPrice());
         busSalesOrderPrice.setSingleFinalPrice(finalPriceAll);
+        busSalesOrderPrice.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderPrice);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -94,6 +94,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
                 BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
+                busSalesOrderVehicle.setSalesOrderSid(sid);
                 save(busSalesOrderVehicle);
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -93,6 +93,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
                 BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
                 BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
+                busSalesVehicleOrder.setSalesOrderSid(sid);
                 save(busSalesVehicleOrder);
             }
         }