From 84a3ef10e4219ad844e6ea86af65d8dec84f28d4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 04 Aug 2021 16:51:28 +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 | 10 +++++++---
1 files changed, 7 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 5ac2574..598264b 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
@@ -406,6 +406,7 @@
viewScoreSettingVo.setShareScore(0);
viewScoreSettingVo.setShareScoreTime(0);
viewScoreSettingVo.setFirstScore(0);
+ viewScoreSettingVo.setStatus((short) 0);
}else{
String shareRatio = redPaperRule.getShareRatio();
if(StrUtil.isNotEmpty(shareRatio)){
@@ -416,6 +417,7 @@
viewScoreSettingVo.setShareScore(StrUtil.isEmpty(shareRatios.get(1))?0:Integer.parseInt(shareRatios.get(1)));
viewScoreSettingVo.setShareScoreTime(StrUtil.isEmpty(shareRatios.get(2))?0:Integer.parseInt(shareRatios.get(2)));
viewScoreSettingVo.setFirstScore(StrUtil.isEmpty(shareRatios.get(3))?0:Integer.parseInt(shareRatios.get(3)));
+ viewScoreSettingVo.setStatus(redPaperRule.getStatus());
}
}else{
viewScoreSettingVo.setId(redPaperRule.getId());
@@ -423,6 +425,7 @@
viewScoreSettingVo.setShareScore(0);
viewScoreSettingVo.setShareScoreTime(0);
viewScoreSettingVo.setFirstScore(0);
+ viewScoreSettingVo.setStatus(redPaperRule.getStatus());
}
}
return viewScoreSettingVo;
@@ -438,10 +441,11 @@
int shareScoreTime = ObjectUtil.isEmpty(model.getShareScoreTime()) ? 0 : model.getShareScoreTime();
stringBuffer.append(shareScoreTime+",");
int firstScore = ObjectUtil.isEmpty(model.getFirstScore()) ? 0 : model.getFirstScore();
- stringBuffer.append(firstScore+",");
+ stringBuffer.append(firstScore);
redPaperRule.setStatus((short) 0);
redPaperRule.setRuleName("积分运行设置");
- redPaperRule.setSharingProfitType("register_score,share_score,share_score_time");
+ redPaperRule.setRuleType("10");
+ redPaperRule.setSharingProfitType("register_score,share_score,share_score_time,first_score");
redPaperRule.setShareRatio(stringBuffer.toString());
redPaperRuleMapper.insert(redPaperRule);
}
@@ -457,7 +461,7 @@
int shareScoreTime = ObjectUtil.isEmpty(model.getShareScoreTime()) ? 0 : model.getShareScoreTime();
stringBuffer.append(shareScoreTime+",");
int firstScore = ObjectUtil.isEmpty(model.getFirstScore()) ? 0 : model.getFirstScore();
- stringBuffer.append(firstScore+",");
+ stringBuffer.append(firstScore);
redPaperRule.setStatus(model.getStatus());
redPaperRule.setSharingProfitType("register_score,share_score,share_score_time,first_score");
redPaperRule.setShareRatio(stringBuffer.toString());
--
Gitblit v1.9.1