提交代码

hai-bweb/src/main/java/com/bweb/controller/HighMerchantTripartitePlatformController.java

@@ -55,8 +55,8 @@ public class HighMerchantTripartitePlatformController {
 
             if (body.getBoolean("profitSharingStatus") == true &&
                     (body.getBigDecimal("profitSharingRatio") == null ||
-                            StringUtils.isBlank(body.getString("profitSharingReceiversNumber"))) ||
+                            StringUtils.isBlank(body.getString("profitSharingReceiversNumber")) ||
-                            StringUtils.isBlank(body.getString("profitSharingReceiversName"))) {
+                            StringUtils.isBlank(body.getString("profitSharingReceiversName")))) {
                 log.error("HighMerchantController -> insertMerchantStore() error!","");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
             }
@@ -74,8 +74,8 @@ public class HighMerchantTripartitePlatformController {
             platform.setProfitSharingReceiversNumber(body.getString("profitSharingReceiversNumber"));
             platform.setProfitSharingReceiversName(body.getString("profitSharingReceiversName"));
 
-            // 微信平台
+            // 微信平台 增加分账关系
-            if (platform.getPlatformType().equals(1)) {
+            if (platform.getPlatformType().equals(1) && platform.getProfitSharingStatus().equals(true)) {
                 WxSharingReceiversVO receiversVO = new WxSharingReceiversVO();
                 receiversVO.setAccount(platform.getProfitSharingReceiversNumber());
                 receiversVO.setType("MERCHANT_ID");

hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java

@@ -225,12 +225,11 @@ public class OrderController {
                         profitSharing = "N";
 
                         // 第三方平台
-                        HighMerchantTripartitePlatform merTripartitePlatform = tripartitePlatformService.getDetail(store.getId(), 1);
+                        HighMerchantTripartitePlatform merTripartitePlatform = tripartitePlatformService.getDetail(store.getMerchantId(), 1);
                         if (merTripartitePlatform != null) {
                             weChatPayReqInfo.setSub_mch_id(merTripartitePlatform.getPlatformMerNumber());
-                            if (merTripartitePlatform.getProfitSharingRatio().compareTo(new BigDecimal("0")) == 1) {
+                            // 是否分账
-                                profitSharing = merTripartitePlatform.getProfitSharingStatus().equals(true)?"Y":"N";
+                            profitSharing = merTripartitePlatform.getProfitSharingStatus().equals(true)?"Y":"N";
-                            }
                         }
                     }
                     if (store.getPrestoreType().equals(1)) {