Merge remote-tracking branch 'origin/master'

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -605,24 +605,13 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
         } else {
             throw new JeecgBootException("查询数据异常");
         }
-        //查询付款用户服务商合同
-        List<HlgUserSubcontract> userSubcontractList = new ArrayList<>();
-        for (JSONObject jsonObject : list) {
-            String idcardNumber = jsonObject.getString("idcardNumber");
-            Integer subcontractorId = jsonObject.getInteger("subcontractorId");
-            HlgUserSubcontract hlgUserSubcontract = hlgUserSubcontractService.getByIdcardNumber(idcardNumber, subcontractorId);
-            if (hlgUserSubcontract != null) {
-                hlgUserSubcontract.setOrderId(jsonObject.getInteger("orderId"));
-                userSubcontractList.add(hlgUserSubcontract);
-            }
-        }
-        //关联付款，同时更新用户服务商合同
+
+        //关联付款
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("id", hlgPayment.getId());
         parameters.put("requirementName", hlgPayment.getRequirementName());
         parameters.put("description", hlgPayment.getRequirementDescription());
         parameters.put("requirementTime", hlgPayment.getRequirmentTime());
-        parameters.put("userSubcontract", userSubcontractList);
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
         JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);