订单管理-电签甲方签章取订单表的而不是需求表的

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/ordermanager/service/impl/HwOrderServiceImpl.java

@@ -208,6 +208,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
 
     /**
      * 开启订单
+     *
      * @param hwOrder
      * @return
      */
@@ -848,8 +849,6 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
             }
             //用户编号
             String accountId = "";
-            //获取服务商名称
-            HwRequirement hwRequirement = hwRequirementMapper.getById(hwOrder.getRequirementId());
 
             //是否添加员工
             if (StringUtils.isNotBlank(hwUser.getAccountId())) {
@@ -859,7 +858,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
                 HwUserContract hwUserContract = new HwUserContract();
                 BeanUtils.copyProperties(hwUser, hwUserContract);
                 //添加员工
-                RestResult result = contractUtil.batchAddStaff(hwUserContract, hwRequirement.getPartASign());
+                RestResult result = contractUtil.batchAddStaff(hwUserContract, hwOrder.getPartASign());
                 //请求成功
                 if (ContractConst.CODE_1.equals(result.getCode())) {
                     JSONArray jsonArray = JSONArray.parseArray(result.getData().toString());
@@ -875,7 +874,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
             }
             try {
                 //电子合同确认订单(第二步)
-                returnMap = this.confirmECOrdersNext(hwOrder, hwRequirement, hwUser, accountId);
+                returnMap = this.confirmECOrdersNext(hwOrder, hwUser, accountId);
             } catch (Exception e) {
                 System.out.println("电子合同确认订单(第二步)异常");
                 returnMap.put("success", "1030");
@@ -890,16 +889,15 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
      * PROPAGATION_REQUIRES_NEW：创建一个新的事务，如果当前存在事务，则把当前事务挂起。
      *
      * @param hwOrder
-     * @param hwRequirement
      * @param hwUser
      * @param accountId
      * @return
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public Map<String, Object> confirmECOrdersNext(HwOrder hwOrder, HwRequirement hwRequirement, HwUser hwUser, String accountId) {
+    public Map<String, Object> confirmECOrdersNext(HwOrder hwOrder, HwUser hwUser, String accountId) {
         Map<String, Object> returnMap = new HashMap<String, Object>();
         //甲方签章
-        String partAsign = hwRequirement.getPartASign();
+        String partAsign = hwOrder.getPartASign();
         //慧盈-查询所有服务商信息
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.SUBCONTRACTOR_LIST;
@@ -941,7 +939,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
          */
         //模板填充
         List<HwContractTemplate> hwContractTemplateList = makeContractTemplate(hwOrder, hwSubcontractor, hwUser);
-        RestResult resultFill = contractUtil.templateFill(accountId, hwRequirement.getPartASign(), hwContractTemplateList);
+        RestResult resultFill = contractUtil.templateFill(accountId, partAsign, hwContractTemplateList);
         if (ContractConst.CODE_1.equals(resultFill.getCode())) {
             JSONObject jsonObject = JSONObject.parseObject(resultFill.getData().toString());
             //更新订单表