From 60f64282b7ec99104ce721f6ee91772407b7e6df Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 04 Aug 2021 10:08:06 +0800
Subject: [PATCH] 20210804
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 9 ++++++---
gc-user/src/main/java/com/xzx/gc/user/vo/ViewScoreSettingVo.java | 3 +++
2 files changed, 9 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..5a7f6f5 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,10 @@
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.setSharingProfitType("register_score,share_score,share_score_time,first_score");
redPaperRule.setShareRatio(stringBuffer.toString());
redPaperRuleMapper.insert(redPaperRule);
}
@@ -457,7 +460,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());
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewScoreSettingVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewScoreSettingVo.java
index 3ae0bdc..36f4a50 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewScoreSettingVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewScoreSettingVo.java
@@ -19,4 +19,7 @@
@ApiModelProperty(value = "分享朋友圈得(shareScore)积分/次 单日上限次数(shareScoreTime)次")
private Integer shareScore;
private Integer shareScoreTime;
+
+ @ApiModelProperty("开关0：已经关闭，1：正常")
+ private Short status;
}
--
Gitblit v1.9.1