From d00b77006470f07727404e0215d7a15c0af77a63 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 17:40:59 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index 3337ac7..b9a3738 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -78,7 +78,7 @@
viewSettingVo.setRegularPoint(StrUtil.isEmpty(shareRatios.get(2))?0:Integer.parseInt(shareRatios.get(2)));
viewSettingVo.setRegularMoneyPercent(StrUtil.isEmpty(shareRatios.get(3))?BigDecimal.ZERO:new BigDecimal(shareRatios.get(3)));
// viewSettingVo.setFinishOrderNum(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));
- viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(5))?0:Integer.parseInt(shareRatios.get(5)));
+ viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));
viewSettingVo.setStatus(redPaperRule.getStatus());
}
}else{
@@ -177,7 +177,7 @@
stringBuffer.append(pointReward);
redPaperRule.setStatus((short) 0);
redPaperRule.setRuleName("分销规则");
- redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,finish_order_num,point_reward");
+ redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,point_reward");
redPaperRule.setShareRatio(stringBuffer.toString());
redPaperRuleMapper.insert(redPaperRule);
}
@@ -199,7 +199,7 @@
int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();
stringBuffer.append(pointReward);
redPaperRule.setStatus(model.getStatus());
- redPaperRule.setSharingProfitType("first_reward,order_num_first,regular_point,regular_money_percent,finish_order_num,point_reward");
+ redPaperRule.setSharingProfitType("first_reward,order_num_first,regular_point,regular_money_percent,point_reward");
redPaperRule.setShareRatio(stringBuffer.toString());
redPaperRuleMapper.updateByPrimaryKey(redPaperRule);
}
@@ -262,6 +262,11 @@
public ViewDistribInfoVo viewDistribInfo(String id) {
//获取团长基本信息
+ ViewDistribInfoVo viewDistribInfoVo = accountMapper.selectDistribByAccountId(id);
+ if(StrUtil.isNotEmpty(viewDistribInfoVo.getNickname())){
+ String decode = StringUtils.decode(viewDistribInfoVo.getNickname());
+ viewDistribInfoVo.setNickname(decode);
+ }
return accountMapper.selectDistribByAccountId(id);
}
--
Gitblit v1.9.1