优化积分分账bug

java110-bean/src/main/java/com/java110/dto/integral/GiftIntegralDto.java

@@ -14,7 +14,7 @@ public class GiftIntegralDto implements Serializable {
     }
 
     public GiftIntegralDto(int integral, double money,String communityId,
-                           String ruleId,String ruleName,String configId,String configName
+                           String ruleId,String ruleName,String configId,String configName,String platformMchId,String platformMchName
     ) {
         this.integral = integral;
         this.money = money;
@@ -23,6 +23,8 @@ public class GiftIntegralDto implements Serializable {
         this.ruleName = ruleName;
         this.configId = configId;
         this.configName = configName;
+        this.platformMchId = platformMchId;
+        this.platformMchName = platformMchName;
     }
 
     private int integral;

java110-bean/src/main/java/com/java110/dto/mall/MallConfigDto.java

@@ -0,0 +1,26 @@
+package com.java110.dto.mall;
+
+import java.io.Serializable;
+
+public class MallConfigDto implements Serializable {
+
+    private String platformMchId;
+
+    private String platformMchName;
+
+    public String getPlatformMchId() {
+        return platformMchId;
+    }
+
+    public void setPlatformMchId(String platformMchId) {
+        this.platformMchId = platformMchId;
+    }
+
+    public String getPlatformMchName() {
+        return platformMchName;
+    }
+
+    public void setPlatformMchName(String platformMchName) {
+        this.platformMchName = platformMchName;
+    }
+}

java110-interface/src/main/java/com/java110/intf/job/IMallInnerServiceSMO.java

@@ -6,6 +6,7 @@ import com.java110.dto.IotDataDto;
 import com.java110.dto.MallDataDto;
 import com.java110.dto.integral.DeductionIntegralDto;
 import com.java110.dto.integral.GiftIntegralDto;
+import com.java110.dto.mall.MallConfigDto;
 import com.java110.dto.user.UserDto;
 import com.java110.vo.ResultVo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -60,4 +61,7 @@ public interface IMallInnerServiceSMO {
 
     @RequestMapping(value = "/userIntegralToCommunity", method = RequestMethod.POST)
     ResultVo userIntegralToCommunity(@RequestBody DeductionIntegralDto deductionIntegralDto);
+
+    @RequestMapping(value = "/getMallConfig", method = RequestMethod.POST)
+    MallConfigDto getMallConfig(@RequestBody MallConfigDto mallConfigDto);
 }

service-acct/src/main/java/com/java110/acct/integral/impl/ComputeGiftIntegralImpl.java

@@ -5,6 +5,7 @@ import com.java110.acct.integral.IComputeGiftIntegral;
 import com.java110.dto.integral.GiftIntegralDto;
 import com.java110.dto.integral.IntegralRuleConfigDto;
 import com.java110.dto.integral.IntegralRuleFeeDto;
+import com.java110.dto.mall.MallConfigDto;
 import com.java110.intf.acct.IIntegralRuleConfigV1InnerServiceSMO;
 import com.java110.intf.acct.IIntegralRuleFeeV1InnerServiceSMO;
 import com.java110.intf.job.IMallInnerServiceSMO;
@@ -76,12 +77,18 @@ public class ComputeGiftIntegralImpl implements IComputeGiftIntegral {
 
         double money = mallInnerServiceSMOImpl.computeIntegralMoney(quantity);
 
+        MallConfigDto mallConfigDto = new MallConfigDto();
+        mallConfigDto = mallInnerServiceSMOImpl.getMallConfig(mallConfigDto);
+
+
 
         return new GiftIntegralDto(quantity, money, communityId,
                 integralRuleFeeDtos.get(0).getRuleId(),
                 integralRuleConfigDtos.get(0).getRuleName(),
                 integralRuleConfigDtos.get(0).getConfigId(),
-                integralRuleConfigDtos.get(0).getConfigName()
+                integralRuleConfigDtos.get(0).getConfigName(),
+                mallConfigDto.getPlatformMchId(),
+                mallConfigDto.getPlatformMchName()
                 );
     }
 

service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatIntegralShareAcct.java

@@ -106,6 +106,7 @@ public class WechatIntegralShareAcct {
             paramMap.put("mch_id", MappingCache.getValue(DOMAIN_WECHAT_PAY, WECHAT_SERVICE_MCH_ID));  //服务商商户号
             //paramMap.put("sub_appid", smallWeChatDto.getAppId());//起调小程序appid
             paramMap.put("sub_mch_id", giftIntegralDto.getMchId());//起调小程序的商户号
+
         }
         paramMap.put("receiver", paramIn.toJSONString());
         paramMap.put("sign", PayUtil.createSignSha256(paramMap, giftIntegralDto.getMchKey()));

service-job/src/main/java/com/java110/job/smo/impl/MallInnerServiceSMOImpl.java

@@ -7,12 +7,14 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.MallDataDto;
 import com.java110.dto.integral.DeductionIntegralDto;
 import com.java110.dto.integral.GiftIntegralDto;
+import com.java110.dto.mall.MallConfigDto;
 import com.java110.dto.user.UserDto;
 import com.java110.intf.job.IMallInnerServiceSMO;
 import com.java110.job.adapt.hcIot.IotConstant;
 import com.java110.job.adapt.hcIotNew.http.ISendIot;
 import com.java110.job.mall.ISendMall;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -176,4 +178,25 @@ public class MallInnerServiceSMOImpl extends BaseServiceSMO implements IMallInne
         return resultVo;
     }
 
+    @Override
+    public MallConfigDto getMallConfig(MallConfigDto mallConfigDto) {
+        String mallSwitch = MappingCache.getValue(MALL_DOMAIN, "MALL_SWITCH");
+
+        if (!"ON".equals(mallSwitch)) {
+            return mallConfigDto;
+        }
+
+
+        JSONObject paramIn = BeanConvertUtil.beanCovertJson(mallConfigDto);
+
+        paramIn.put("mallApiCode", "getMallConfig");
+        ResultVo resultVo = sendMallImpl.post("/mall/api/common.openCommonApi", paramIn);
+
+        if(resultVo.getCode() != 0){
+            throw new IllegalArgumentException(resultVo.getMsg());
+        }
+        mallConfigDto = BeanConvertUtil.covertBean(resultVo.getData(),MallConfigDto.class);
+        return mallConfigDto;
+    }
+
 }