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

mall-server-api/src/main/java/com/gree/mall/manager/bean/websit/SettlementOrderLogicVO.java

@@ -104,4 +104,8 @@ public class SettlementOrderLogicVO      {
     private SaleTypeEnum saleType;
 
 
+    @ApiModelProperty(value = "结算人")
+    private String settlementName;
+
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -5,10 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.github.binarywang.wxpay.bean.profitsharing.ProfitSharingFinishRequest;
-import com.github.binarywang.wxpay.bean.profitsharing.ProfitSharingReceiverRequest;
-import com.github.binarywang.wxpay.bean.profitsharing.ProfitSharingReceiverResult;
-import com.github.binarywang.wxpay.bean.profitsharing.ProfitSharingRequest;
+import com.github.binarywang.wxpay.bean.profitsharing.*;
 import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@@ -122,7 +119,6 @@ public class WechatLogic {
      */
     public WxPayService getPayWebstiService(String id,String source){
 
-
         return WxConfiguration.wxPayWebsitServices.get(id);
 
     }
@@ -627,7 +623,7 @@ public class WechatLogic {
 
             settlementOrder.setStatus(SettlementStatusNewEnum.YC.toString());
             settlementOrder.setYcRemark(e.getMessage());
-            settlementOrder.updateById();
+           // settlementOrder.updateById();
         }
     }
 
@@ -649,7 +645,7 @@ public class WechatLogic {
 
         for(String openId : amountMap.keySet()){
             //添加分账人
-            addShareReveiver(openId,companyWechatId,source);
+            addShareReveiver(openId,config,source);
 
             BigDecimal shareAmount = amountMap.get(openId);
             String workerUserPhone = phoneMap.get(openId);
@@ -818,7 +814,7 @@ public class WechatLogic {
         //receiver.put("name",name);
         receiver.put("relation_type", "STAFF");
         //添加分账人
-        ProfitSharingService profitSharingService = this.getPayService(companyWechatId,source).getProfitSharingService();
+        ProfitSharingService profitSharingService = this.getPayWebstiService(companyWechatId,source).getProfitSharingService();
 
         ProfitSharingReceiverRequest profitSharingReceiverRequest = new ProfitSharingReceiverRequest();
         profitSharingReceiverRequest.setReceiver(JSONObject.toJSONString(receiver));