Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java

@@ -90,4 +90,10 @@ public class BusDeposit extends BaseEntity {
 
     @ApiModelProperty("付款凭证")
     private String paymentProof;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java

@@ -104,4 +104,11 @@ public class BusDepositDto implements Dto {
 
     @ApiModelProperty("订车车辆信息List")
     private List<BusDepositVehicleDto> busDepositVehicleDto;
+
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java

@@ -38,4 +38,5 @@ public interface BusDepositFeign {
     @GetMapping("/getDepositInfoDetails/{virtualOrderSid}")
     public ResultBean<AppBusDepositBuscenterDetailVo> getDepositInfoDetails(@PathVariable("virtualOrderSid") String virtualOrderSid);
 
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java

@@ -53,4 +53,10 @@ public class BusDepositVo extends BusMainDepositVo{
 
     @ApiModelProperty("客户列表")
     private List<BusDepositCustomerVo> customerList = new ArrayList<>();
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@@ -77,4 +77,11 @@ public class BusMainDeposit extends BaseEntity {
     
 	@ApiModelProperty("单据类型")
     private String depositBillType;
+
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java

@@ -69,15 +69,15 @@ public interface BusMainDepositFeign {
 
     @ApiOperation("保存虚拟订单（订金）")
     @PostMapping("/saveDeposit")
-    public ResultBean saveDeposit(@Valid @RequestBody BusDepositDto dto);
+    public ResultBean saveOrUpdateDeposit(@Valid @RequestBody BusDepositDto dto);
 
     @ApiOperation("保存虚拟订单（预定车辆）")
     @PostMapping("/saveDepositVehicle")
     public ResultBean saveDepositVehicle(@Valid @RequestBody BusMainDepositVehicleDto dto);
 
-    @ApiOperation("修改虚拟订单（订金）信息")
+   /* @ApiOperation("修改虚拟订单（订金）信息")
     @PostMapping("/updateDeposit/{sid}")
-    public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid);
+    public ResultBean updateDeposit(@Valid @RequestBody BusDepositDto dto, @PathVariable("sid") String sid);*/
 
     @ApiOperation("修改虚拟订单（预定车辆）信息")
     @PostMapping("/updateDepositVehicle/{sid}")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java

@@ -62,7 +62,7 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
 	}
 
 	@Override
-	public ResultBean saveDeposit(BusDepositDto dto){
+	public ResultBean saveOrUpdateDeposit(BusDepositDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDeposit无法访问");
 	}
 
@@ -71,10 +71,10 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign {
 		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/saveDepositVehicle无法访问");
 	}
 
-	@Override
+	/*@Override
 	public ResultBean updateDeposit(BusDepositDto dto, String sid){
 		return ResultBean.fireFail().setMsg("接口anrui-buscenter/busmaindeposit/updateDeposit无法访问");
-	}
+	}*/
 
 	@Override
 	public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java

@@ -41,4 +41,5 @@ public interface BusDepositMapper extends BaseMapper<BusDeposit> {
 
 	@Delete("delete from bus_deposit where billSid=#{billSid}")
 	int delByBillSid(String billSid);
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -43,4 +43,5 @@
           AND staffSid = #{staffSid}
     </select>
 
+
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -5,6 +5,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.*;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
+import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
@@ -153,4 +154,6 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
 
 
     }
+
+
 }

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

@@ -69,5 +69,14 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     int deleteVirtualOrder(@Param("staffSid") String staffSid, @Param("virtualOrderSid") String virtualOrderSid);
 
     BusMainDeposit selectBySid(@Param("virtualOrderSid") String virtualOrderSid);
-
+    /**
+     * 更新虚拟订单审批（订金）业务表中的流程状态
+     * @param businessSid 业务sid
+     * @param proDefId 流程定义sid
+     * @param nodeState 环节状态
+     * @param procInsId 流程实例sid
+     * @param taskDefKey 环节sid
+     */
+    void modifiBusDepositFlowState(@Param("businessSid") String businessSid,@Param("procDefId")  String procDefId,@Param("nodeState")  String nodeState,
+                                   @Param("procInstSid")  String procInstSid,@Param("nodeSid")  String nodeSid);
 }

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

@@ -113,4 +113,10 @@
         FROM bus_main_deposit bmd
         WHERE bmd.sid = #{virtualOrderSid}
     </select>
+
+
+    <update id="modifiBusDepositFlowState">
+       update bus_main_deposit set procDefId=#{procDefId},nodeState=#{nodeState},procInstSid=#{procInstSid},nodeSid=#{nodeSid}
+       where sid=#{businessSid}
+    </update>
 </mapper>

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

@@ -79,11 +79,11 @@ public class BusMainDepositRest implements BusMainDepositFeign {
     }
 
     @Override
-    public ResultBean saveDeposit(BusDepositDto dto) {
+    public ResultBean saveOrUpdateDeposit(BusDepositDto dto) {
         if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) {
             return new ResultBean().fail().setMsg("只可上传一张付款凭证");
         }
-        return busMainDepositService.saveDeposit(dto);
+        return busMainDepositService.saveOrUpdateDeposit(dto);
     }
 
     @Override
@@ -91,13 +91,13 @@ public class BusMainDepositRest implements BusMainDepositFeign {
         return busMainDepositService.saveDepositVehicle(dto);
     }
 
-    @Override
+    /*@Override
     public ResultBean updateDeposit(BusDepositDto dto, String sid) {
         if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) {
             return new ResultBean().fail().setMsg("只可上传一张付款凭证");
         }
-        return busMainDepositService.updateDeposit(dto, sid);
-    }
+        return saveDeposit(dto);// busMainDepositService.updateDeposit(dto, sid);
+    }*/
 
     @Override
     public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) {

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

@@ -195,7 +195,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean saveDeposit(BusDepositDto dto) {
+    public ResultBean saveOrUpdateDeposit(BusDepositDto dto) {
+        if(StringUtils.isBlank(dto.getSid())){
+            return saveFictitiousDeposit(dto);
+        }else{
+            return updateDeposit(dto,dto.getSid());
+        }
+    }
+
+    /**
+     * 新增订金类型的虚拟订单
+     * @param dto
+     * @return
+     */
+    private ResultBean saveFictitiousDeposit(BusDepositDto dto) {
         ResultBean rb = ResultBean.fireFail();
         Map<String, String> map = generateBillNo(dto.getUserSid());
         BusMainDeposit busMainDeposit = new BusMainDeposit();
@@ -305,7 +318,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean updateDeposit(BusDepositDto dto, String sid) {
+    ResultBean updateDeposit(BusDepositDto dto, String sid) {
         if (checkCouldChange(sid)) {
             return new ResultBean().fail().setMsg("该条信息不可更改");
         }
@@ -318,7 +331,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         busDepositCustomerService.delByBillSid(sid);
         // 保存客户信息
         saveDepositCustomer(dto.getCustomerList(), sid);
-        return new ResultBean().success();
+        return new ResultBean().success().setData(sid);
     }
 
     /**
@@ -693,6 +706,41 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
         String orgSid = checkUserOrg(dto.getUserSid());
+       // String businessSid = dto.getSid();
+        ResultBean resultBean1 = saveOrUpdateDeposit(dto);
+        String  businessSid = resultBean1.getData().toString();
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("businessSid", businessSid);
+        variables.put("isLoan", true);
+        variables.put("orgSid", orgSid);//部门sid
+        ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
+        if (resultBean.getSuccess() && resultBean.getData() != null) {
+            Map<String, String> map = (Map<String, String>) resultBean.getData();
+            /*saveSysFormLink(map);*/
+            //更新虚拟订单审批（订金）业务表中的流程状态
+            modifiBusMainDepositFlowState(businessSid,
+                    procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId
+                    map.get("nodeState"),//state
+                    map.get("procInsId"),//procInstSid
+                    map.get("taskDefKey")//nodeSid
+                    );
+        }
+        return resultBean;
+    }
+  private void  modifiBusMainDepositFlowState(String businessSid,
+                                          String proDefId,//procDefId
+                                          String nodeState,//state
+                                          String procInsId,//procInstSid
+                                          String taskDefKey//nodeSid
+     ){
+        baseMapper.modifiBusDepositFlowState(businessSid,
+                 proDefId,//procDefId
+                 nodeState,//state
+                 procInsId,//procInstSid
+                 taskDefKey);
+    }
+    /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
+        String orgSid = checkUserOrg(dto.getUserSid());
         String businessSid = "";
         if (StringUtils.isBlank(orgSid)) {
             return new ResultBean().fail().setMsg("用户组织机构不能为空");
@@ -724,7 +772,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             saveSysFormLink(map);
         }
         return resultBean;
-    }
+    }*/
 
     /**
      * 保存流程业务关联表 数据