Commit 4ec30ea6 by fanjiaxin

分佣比例记录表,加入异常信息

parent b774ecdf
Pipeline #71796 passed with stages
in 1 minute 9 seconds
......@@ -152,6 +152,7 @@ public class DrmSharerConfig {
.setScale(0, RoundingMode.DOWN);
// 设置推客分佣比例
boolean isSuccess = false;
String errorMsg = null;
try {
// 设置推客分佣比例
if (StringUtils.isNotBlank(sharerInfo.getSharerAppid())) {
......@@ -161,11 +162,12 @@ public class DrmSharerConfig {
isSuccess = true;
} catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e);
errorMsg = StringUtils.substring(e.getMessage(), 0, 1000);
} finally {
// 保存记录
saveSharerProductCommissionRecord(sharerInfo.getOpenId(), sharerInfo.getSharerAppid(), null,
new BigDecimal(change.getOldValue()), new BigDecimal(change.getNewValue()),
CommissionChangeOptTypeEnum.DEFAULT_CHANGE, isSuccess);
CommissionChangeOptTypeEnum.DEFAULT_CHANGE, isSuccess, errorMsg);
}
}
......@@ -210,18 +212,20 @@ public class DrmSharerConfig {
}
// 设置推客分佣比例
boolean isSuccess = false;
String errorMsg = null;
try {
// 更新分佣比例,同步微信
updateSharerOrProductCommissionRatio(sharerInfo, newCommissionSharer.getCommissionRatio());
isSuccess = true;
} catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e);
errorMsg = StringUtils.substring(e.getMessage(), 0, 1000);
} finally {
// 保存记录
saveSharerProductCommissionRecord(sharerInfo.getOpenId(), sharerInfo.getSharerAppid(), null,
null != oldCommissionSharer ? oldCommissionSharer.getCommissionRatio() : null,
newCommissionSharer.getCommissionRatio(),
CommissionChangeOptTypeEnum.SET, isSuccess);
CommissionChangeOptTypeEnum.SET, isSuccess, errorMsg);
}
}
......@@ -240,17 +244,19 @@ public class DrmSharerConfig {
BigDecimal sharerCommissionRatio = getDefaultCommissionRatio();
// 设置推客分佣比例
boolean isSuccess = false;
String errorMsg = null;
try {
// 更新分佣比例,同步微信
updateSharerOrProductCommissionRatio(sharerInfo, sharerCommissionRatio);
isSuccess = true;
} catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e);
errorMsg = StringUtils.substring(e.getMessage(), 0, 1000);
} finally {
// 保存记录
saveSharerProductCommissionRecord(sharerInfo.getOpenId(), sharerInfo.getSharerAppid(), null,
oldCommissionSharer.getCommissionRatio(), sharerCommissionRatio,
CommissionChangeOptTypeEnum.UNSET, isSuccess);
CommissionChangeOptTypeEnum.UNSET, isSuccess, errorMsg);
}
}
......@@ -322,6 +328,7 @@ public class DrmSharerConfig {
BigDecimal sharerCommissionRatio = getSharerCommissionRatio(openId);
return null != sharerCommissionRatio ? sharerCommissionRatio : defaultCommissionRatio;
}
/**
* 获取推客分佣比例
*/
......@@ -358,6 +365,7 @@ public class DrmSharerConfig {
.setScale(0, RoundingMode.DOWN);
// 设置推客分佣比例
boolean isSuccess = false;
String errorMsg = null;
try {
if (StringUtils.isNotBlank(sharerInfo.getSharerAppid())) {
// 设置推客分佣比例
......@@ -371,13 +379,14 @@ public class DrmSharerConfig {
isSuccess = true;
} catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e);
errorMsg = StringUtils.substring(e.getMessage(), 0, 1000);
} finally {
// 保存记录
saveSharerProductCommissionRecord(sharerInfo.getOpenId(),
sharerInfo.getSharerAppid(), newBo.getProductId(),
null != oldBo ? oldBo.getCommissionRatio() : null,
newBo.getCommissionRatio(),
CommissionChangeOptTypeEnum.SET, isSuccess);
CommissionChangeOptTypeEnum.SET, isSuccess, errorMsg);
}
}
......@@ -394,6 +403,7 @@ public class DrmSharerConfig {
}
// 设置推客分佣比例
boolean isSuccess = false;
String errorMsg = null;
try {
// 获取推客的分佣比例
BigDecimal sharerCommissionRatio = new BigDecimal(sharerInfo.getCommissionRatio());
......@@ -412,22 +422,23 @@ public class DrmSharerConfig {
isSuccess = true;
} catch (Exception e) {
log.error("设置推客的的分佣类型和比例信息失败", e);
errorMsg = StringUtils.substring(e.getMessage(), 0, 1000);
} finally {
// 保存记录
saveSharerProductCommissionRecord(sharerInfo.getOpenId(),
sharerInfo.getSharerAppid(), oldBo.getProductId(),
oldBo.getCommissionRatio(), null,
CommissionChangeOptTypeEnum.UNSET, isSuccess);
CommissionChangeOptTypeEnum.UNSET, isSuccess, errorMsg);
}
}
/**
* 保存推客商品分佣记录
*/
private void saveSharerProductCommissionRecord(String openId, String sharerAppid, String productId,
BigDecimal oldCommissionRatio, BigDecimal newCommissionRatio,
CommissionChangeOptTypeEnum optTypeEnum, boolean isSuccess) {
CommissionChangeOptTypeEnum optTypeEnum,
boolean isSuccess, String extInfo) {
Date now = new Date();
SharerProductCommissionRecord record = new SharerProductCommissionRecord();
record.setOpenId(openId);
......@@ -438,7 +449,7 @@ public class DrmSharerConfig {
+ (null == newCommissionRatio ? "" : newCommissionRatio.toPlainString()));
record.setOptTime(now);
record.setOptStatus(isSuccess ? "1" : "2");
record.setExtInfo("");
record.setExtInfo(extInfo);
record.setCreateTime(now);
record.setUpdateTime(now);
sharerProdutcCommissionRecordMapper.insert(record);
......@@ -467,7 +478,7 @@ public class DrmSharerConfig {
sharerProductCommission.setCreateTime(now);
}
// 配置
if(SharerProductCommission.UnsetEnum.SET.equals(unsetEnum)){
if (SharerProductCommission.UnsetEnum.SET.equals(unsetEnum)) {
// 微信分佣比例倍数
BigDecimal wechatMultiplier = new BigDecimal(WeChatApi.WECHAT_COMMISSION_RATIO_MULTIPLIER);
commissionRatio = 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