Merge remote-tracking branch 'origin/jd_cons' into jd_cons

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/consFee/ConsFeeServiceImpl.java

@@ -13,9 +13,11 @@ import cn.iocoder.yudao.module.bpm.api.BpmCreateServiceFactory;
 import cn.iocoder.yudao.module.bpm.enums.WorkFlowEmus;
 import cn.iocoder.yudao.module.ecw.dal.dataobject.currency.CurrencyDO;
 import cn.iocoder.yudao.module.order.convert.consFee.ConsFeeConvert;
+import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consApproval.ConsApprovalDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consFee.ConsFeeDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderFeeApplication.OrderFeeApplicationDO;
+import cn.iocoder.yudao.module.order.dal.mysql.cons.ConsMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.consApproval.ConsApprovalMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.consFee.ConsFeeMapper;
 import cn.iocoder.yudao.module.order.enums.ApprovalResultStatusEnum;
@@ -50,6 +52,9 @@ public class ConsFeeServiceImpl extends AbstractService<ConsFeeMapper, ConsFeeDO
     @Resource
     private ConsApprovalMapper consApprovalMapper;
 
+    @Resource
+    private ConsMapper consMapper;
+
     @Override
     public Long createConsFee(ConsFeeCreateReqVO createReqVO) {
         // 插入
@@ -95,14 +100,16 @@ public class ConsFeeServiceImpl extends AbstractService<ConsFeeMapper, ConsFeeDO
     @Transactional
     @Override
     public void createFeeBatchApplication(ConsFeeCreateReqVO createReqVO) {
+
         ConsApprovalDO consApprovalDO = new ConsApprovalDO();
         consApprovalDO.setConsId(createReqVO.getConsId());
         consApprovalDO.setApprovalType(6);
         consApprovalDO.setStatus(1);
         consApprovalMapper.insert(consApprovalDO);
+        ConsDO consDO = consMapper.selectById(createReqVO.getConsId());
         //发起流程
         String formId = bpmCreateServiceFactory.createBmp(SecurityFrameworkUtils.getLoginUserId(),
-                createReqVO.getConsId(), WorkFlowEmus.ECW_CONS_FEE_APPLY.getKey(), createReqVO.getConsNum(), createReqVO.getCopyUserId());
+                createReqVO.getConsId(), WorkFlowEmus.ECW_CONS_FEE_APPLY.getKey(), consDO.getConsNum(), createReqVO.getCopyUserId());
         consApprovalDO.setFormId(formId);
         List<ConsFeeUpdateReqVO> consFeeUpdateReqLists = createReqVO.getConsFeeUpdateReqLists();
         List<ConsFeeDO> addList = new ArrayList<>();