Commit 3cc33c49 by fanjiaxin

联调问题处理

parent 3b1aadff
Pipeline #71641 passed with stages
in 57 seconds
...@@ -473,7 +473,7 @@ public class DrmSharerConfig { ...@@ -473,7 +473,7 @@ public class DrmSharerConfig {
commissionRatio = commissionRatio commissionRatio = commissionRatio
.divide(wechatMultiplier) .divide(wechatMultiplier)
.setScale(2, RoundingMode.HALF_UP); .setScale(2, RoundingMode.HALF_UP);
sharerProductCommission.setCommissionRatio(commissionRatio); sharerProductCommission.setCommissionRatio(commissionRatio.toPlainString());
sharerProductCommission.setCommissionType(CommissionTypeEnum.PLATFORM.getCode().toString()); sharerProductCommission.setCommissionType(CommissionTypeEnum.PLATFORM.getCode().toString());
sharerProductCommission.setUnset(unsetEnum.getCode()); sharerProductCommission.setUnset(unsetEnum.getCode());
sharerProductCommission.setUpdateTime(now); sharerProductCommission.setUpdateTime(now);
......
...@@ -67,7 +67,7 @@ public class UserServiceImpl implements IUserService { ...@@ -67,7 +67,7 @@ public class UserServiceImpl implements IUserService {
sharerInfo = new SharerInfo(); sharerInfo = new SharerInfo();
sharerInfo.setOpenId(userInfoVO.getOpenid()); sharerInfo.setOpenId(userInfoVO.getOpenid());
// 默认佣金比例 // 默认佣金比例
sharerInfo.setCommissionRatio(drmSharerConfig.getDefaultCommissionRatio()); sharerInfo.setCommissionRatio(drmSharerConfig.getDefaultCommissionRatio().toPlainString());
sharerInfo.setCommissionType(CommissionTypeEnum.PLATFORM.getCode()); sharerInfo.setCommissionType(CommissionTypeEnum.PLATFORM.getCode());
sharerInfo.setCreateTime(now); sharerInfo.setCreateTime(now);
sharerInfo.setUpdateTime(now); sharerInfo.setUpdateTime(now);
...@@ -111,7 +111,7 @@ public class UserServiceImpl implements IUserService { ...@@ -111,7 +111,7 @@ public class UserServiceImpl implements IUserService {
BigDecimal commissionRatio = sharerInfoVO.getCommission_ratio() BigDecimal commissionRatio = sharerInfoVO.getCommission_ratio()
.divide(wechatMultiplier) .divide(wechatMultiplier)
.setScale(2, RoundingMode.HALF_UP); .setScale(2, RoundingMode.HALF_UP);
sharerInfo.setCommissionRatio(commissionRatio); sharerInfo.setCommissionRatio(commissionRatio.toPlainString());
Integer commissionType = null != sharerInfoVO.getCommission_type() ? sharerInfoVO.getCommission_type() : CommissionTypeEnum.PLATFORM.getCode(); Integer commissionType = null != sharerInfoVO.getCommission_type() ? sharerInfoVO.getCommission_type() : CommissionTypeEnum.PLATFORM.getCode();
sharerInfo.setCommissionType(commissionType); sharerInfo.setCommissionType(commissionType);
// 刷新缓存 // 刷新缓存
...@@ -122,7 +122,7 @@ public class UserServiceImpl implements IUserService { ...@@ -122,7 +122,7 @@ public class UserServiceImpl implements IUserService {
// 初始化保存 // 初始化保存
if (null == sharerInfo.getId()) { if (null == sharerInfo.getId()) {
// 默认佣金比例 // 默认佣金比例
sharerInfo.setCommissionRatio(drmSharerConfig.getDefaultCommissionRatio()); sharerInfo.setCommissionRatio(drmSharerConfig.getDefaultCommissionRatio().toPlainString());
sharerInfo.setCommissionType(CommissionTypeEnum.PLATFORM.getCode()); sharerInfo.setCommissionType(CommissionTypeEnum.PLATFORM.getCode());
sharerInfo.setCreateTime(now); sharerInfo.setCreateTime(now);
sharerInfo.setUpdateTime(now); sharerInfo.setUpdateTime(now);
......
...@@ -40,7 +40,7 @@ public class SharerInfo implements Serializable { ...@@ -40,7 +40,7 @@ public class SharerInfo implements Serializable {
/** /**
* 佣金比例 * 佣金比例
*/ */
private BigDecimal commissionRatio; private String commissionRatio;
/** /**
* 分佣类型【0:平台分佣 1:机构分佣】 * 分佣类型【0:平台分佣 1:机构分佣】
*/ */
......
...@@ -8,7 +8,6 @@ import lombok.Getter; ...@@ -8,7 +8,6 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Date; import java.util.Date;
...@@ -42,7 +41,7 @@ public class SharerProductCommission implements Serializable { ...@@ -42,7 +41,7 @@ public class SharerProductCommission implements Serializable {
/** /**
* 佣金比例 * 佣金比例
*/ */
private BigDecimal commissionRatio; private String commissionRatio;
/** /**
* 佣金类型 * 佣金类型
*/ */
......
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