Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/entity/HlwCompanySubcontractor.java

@@ -136,5 +136,5 @@ public class HlwCompanySubcontractor implements Serializable {
      * 通过平台的服务商id
      */
     @TableField(exist = false)
-    private String cpSubcontractorId;
+    private Integer cpSubcontractorId;
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/service/impl/HlwPaymentDetailServiceImpl.java

@@ -229,6 +229,11 @@ public class HlwPaymentDetailServiceImpl extends ServiceImpl<HlwPaymentDetailMap
         Double serviceRate=jsonObject.getDouble("serviceRate");
         if(cpType==1){
             hlwPayment.setSubcontractorId(subcontractorId);
+        }else{
+            Integer cpSubcontractorId=jsonObject.getInteger("cpSubcontractorId");
+            if(cpSubcontractorId!=null){
+               hlwPayment.setSubcontractorId(cpSubcontractorId);
+            }
         }
         serviceFee=businessAccountUtils.mul(serviceRate*0.01,payment);
         hlwPayment.setServiceRate(serviceRate);