电子合同-确认订单时状态查询代码修改，只查询，不更新

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

@@ -540,7 +540,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
         hwOrder.setSysOrgCode(hwRequirement.getSysOrgCode());
         hwOrder.setUpdateTime(new Date());
         hwOrder.setContractType(hwRequirement.getWorkContractType());
-        if(hwRequirement.getIsAutoConfirm()==1){
+        if (hwRequirement.getIsAutoConfirm() == 1) {
             hwOrder.setStatus(2);
         }
         save(hwOrder);
@@ -552,7 +552,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
         hwOrderProcessDetail.setGenerateTime(new Date());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //前端用户报名自动生成订单拿不到sysuser
-        if(sysUser!=null){
+        if (sysUser != null) {
             hwOrderProcessDetail.setGenerateBy(sysUser.getUsername());
         }
         hwOrderProcessDetail.setSysOrgCode(hwOrder.getSysOrgCode());
@@ -612,6 +612,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
             }
             //电子合同状态不为空
             if (hwOrder.getElectronicContractStatus() != null) {
+                String status = "";
                 /**
                  * 查询合同状态,避免轮询结果未刷新
                  */
@@ -627,7 +628,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
                         JSONObject jsonObject = JSONObject.parseObject(result.getData().toString());
                         System.out.println("status=========" + jsonObject.getString("status"));
                         //更新订单电子合同状态
-                        String status = jsonObject.getString("status");
+                        status = jsonObject.getString("status");
                         //签署方列表信息
                         String contractSignerList = jsonObject.getString("contractSignerList");
                         JSONArray jsonArray = JSONArray.parseArray(contractSignerList);
@@ -651,25 +652,15 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
                                 }
                             }
                         }
-                        hwOrder.setElectronicContractStatus(Integer.parseInt(status));
-                        updateById(hwOrder);
-                        //更新电子合同表
-                        hwElectronicContract.setStatus(Integer.parseInt(status));
-                        hwElectronicContractService.updateById(hwElectronicContract);
                     }
                 }
                 //待他人签署
-                if (hwOrder.getElectronicContractStatus() == 1) {
+                if (Integer.parseInt(status) == 1) {
                     returnMap.put("success", "1031");
                     return returnMap;
                 }
                 //已完成
-                if (hwOrder.getElectronicContractStatus() == 2) {
-                    //将订单状态修改为已确认
-                    if (hwOrder.getStatus() != 2) {
-                        hwOrder.setStatus(2);
-                    }
-                    updateById(hwOrder);
+                if (Integer.parseInt(status) == 2) {
                     returnMap.put("success", "1027");
                     return returnMap;
                 }