Commit 0b018a60 by fanjiaxin

联调问题处理

parent 1cf8a856
Pipeline #71617 passed with stages
in 56 seconds
...@@ -39,6 +39,7 @@ import org.springframework.stereotype.Component; ...@@ -39,6 +39,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function; import java.util.function.Function;
...@@ -147,12 +148,13 @@ public class DrmSharerConfig { ...@@ -147,12 +148,13 @@ public class DrmSharerConfig {
private void setSharerDefaultCommissionInfo(ConfigChange change, WeChatSharerInfoVO sharerInfoVO) { private void setSharerDefaultCommissionInfo(ConfigChange change, WeChatSharerInfoVO sharerInfoVO) {
// 分佣比例为小数, 微信接口参数应当分佣比例*倍数 为整数 // 分佣比例为小数, 微信接口参数应当分佣比例*倍数 为整数
BigDecimal commissionRatio = new BigDecimal(change.getNewValue()) BigDecimal commissionRatio = new BigDecimal(change.getNewValue())
.multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER)); .multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
.setScale(0, RoundingMode.DOWN);
// 设置推客分佣比例 // 设置推客分佣比例
boolean isSuccess = false; boolean isSuccess = false;
try { try {
// 设置推客分佣比例 // 设置推客分佣比例
weChatShopSetSharerCommissionRequest.handle(sharerInfoVO.getSharer_appid(), commissionRatio.toPlainString()); weChatShopSetSharerCommissionRequest.handle(sharerInfoVO.getSharer_appid(), commissionRatio.intValue());
isSuccess = true; isSuccess = true;
} catch (Exception e) { } catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e); log.error("设置推客的的分佣类型和比例信息失败", e);
...@@ -212,12 +214,13 @@ public class DrmSharerConfig { ...@@ -212,12 +214,13 @@ public class DrmSharerConfig {
} }
// 分佣比例为小数, 微信接口参数应当分佣比例*1000 为整数 // 分佣比例为小数, 微信接口参数应当分佣比例*1000 为整数
BigDecimal commissionRatio = newCommissionSharer.getCommissionRatio() BigDecimal commissionRatio = newCommissionSharer.getCommissionRatio()
.multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER)); .multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
.setScale(0, RoundingMode.DOWN);
// 设置推客分佣比例 // 设置推客分佣比例
boolean isSuccess = false; boolean isSuccess = false;
try { try {
// 设置推客分佣比例 // 设置推客分佣比例
weChatShopSetSharerCommissionRequest.handle(sharerAppid, commissionRatio.toPlainString()); weChatShopSetSharerCommissionRequest.handle(sharerAppid, commissionRatio.intValue());
isSuccess = true; isSuccess = true;
} catch (Exception e) { } catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e); log.error("设置推客的的分佣类型和比例信息失败", e);
...@@ -241,12 +244,13 @@ public class DrmSharerConfig { ...@@ -241,12 +244,13 @@ public class DrmSharerConfig {
// 分佣比例为小数, 微信接口参数应当分佣比例*倍数 为整数 // 分佣比例为小数, 微信接口参数应当分佣比例*倍数 为整数
BigDecimal sharerCommissionRatio = getSharerCommissionRatio(oldCommissionSharer.getOpenId(), null); BigDecimal sharerCommissionRatio = getSharerCommissionRatio(oldCommissionSharer.getOpenId(), null);
BigDecimal commissionRatio = sharerCommissionRatio BigDecimal commissionRatio = sharerCommissionRatio
.multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER)); .multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
.setScale(0, RoundingMode.DOWN);
// 设置推客分佣比例 // 设置推客分佣比例
boolean isSuccess = false; boolean isSuccess = false;
try { try {
// 设置推客分佣比例 // 设置推客分佣比例
weChatShopSetSharerCommissionRequest.handle(sharerAppid, commissionRatio.toPlainString()); weChatShopSetSharerCommissionRequest.handle(sharerAppid, commissionRatio.intValue());
isSuccess = true; isSuccess = true;
} catch (Exception e) { } catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e); log.error("设置推客的的分佣类型和比例信息失败", e);
......
...@@ -164,8 +164,11 @@ public class UserServiceImpl implements IUserService { ...@@ -164,8 +164,11 @@ public class UserServiceImpl implements IUserService {
throw new NoBindSharerException("未绑定推客"); throw new NoBindSharerException("未绑定推客");
} }
BigDecimal defaultCommissionRatio = drmSharerConfig.getDefaultCommissionRatio(); BigDecimal defaultCommissionRatio = drmSharerConfig.getDefaultCommissionRatio();
BigDecimal commissionRatio = defaultCommissionRatio
.multiply(new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER))
.setScale(0, RoundingMode.DOWN);
// 设置推客分佣比例 // 设置推客分佣比例
weChatShopSetSharerCommissionRequest.handle(loginUserInfo.getSharerAppId(), defaultCommissionRatio.toPlainString()); weChatShopSetSharerCommissionRequest.handle(loginUserInfo.getSharerAppId(), commissionRatio.intValue());
} }
private SharerInfoVO getSharerRegisterBindInfo(String openId) { private SharerInfoVO getSharerRegisterBindInfo(String openId) {
......
...@@ -54,4 +54,9 @@ public interface CoreConstant { ...@@ -54,4 +54,9 @@ public interface CoreConstant {
* Redis微信小店认证Token锁时间,秒 * Redis微信小店认证Token锁时间,秒
*/ */
int REDIS_TOKEN_WECHAT_SHOP_LOCK_TIME = 5; int REDIS_TOKEN_WECHAT_SHOP_LOCK_TIME = 5;
/**
* Redis商品详情ID缓存KEY
*/
String REDIS_PRODUCT_DETAIL_ID_KEY = "PRODUCT:DETAIL:ID:KEY";
} }
...@@ -42,7 +42,7 @@ public class WeChatShopSetSharerCommissionRequest implements IWeChatRequest { ...@@ -42,7 +42,7 @@ public class WeChatShopSetSharerCommissionRequest implements IWeChatRequest {
/** /**
* 处理 * 处理
*/ */
public WeChatCoreVO handle(String sharerAppid, String commissionRatio) { public WeChatCoreVO handle(String sharerAppid, Integer commissionRatio) {
WeChatSetSharerCommissionBO params = WeChatSetSharerCommissionBO.builder() WeChatSetSharerCommissionBO params = WeChatSetSharerCommissionBO.builder()
.sharer_appid(sharerAppid) .sharer_appid(sharerAppid)
.commission_type(CommissionTypeEnum.PLATFORM.getCode()) .commission_type(CommissionTypeEnum.PLATFORM.getCode())
......
...@@ -26,5 +26,5 @@ public class WeChatSetSharerCommissionBO implements Serializable { ...@@ -26,5 +26,5 @@ public class WeChatSetSharerCommissionBO implements Serializable {
/** /**
* 平台分佣时的分佣比例,范围为【100000 - 900000】,代表【10%-90%】 * 平台分佣时的分佣比例,范围为【100000 - 900000】,代表【10%-90%】
*/ */
private String commission_ratio; private Integer commission_ratio;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment