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 | 1 +
gc-shop/src/main/resources/sql | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gc-shop/src/main/resources/sql b/gc-shop/src/main/resources/sql
index 950c277..6d65312 100644
--- a/gc-shop/src/main/resources/sql
+++ b/gc-shop/src/main/resources/sql
@@ -76,6 +76,11 @@
ALTER TABLE `xzx_sys_banner`
ADD COLUMN `status` int(1) NULL DEFAULT 1 COMMENT '状态 1：未上架 2：已上架' AFTER `city_id`;
+ALTER TABLE `xzx_user_redpaper_rule`
+MODIFY COLUMN `rule_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规则类型：1：红包规则，2：分享分利规则 3阶梯 4推广 5重量返利 7提成 8提佣 9积分规则 10邀请奖励规则' AFTER `share_ratio`;
+
+
+
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 5a7f6f5..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
@@ -444,6 +444,7 @@
stringBuffer.append(firstScore);
redPaperRule.setStatus((short) 0);
redPaperRule.setRuleName("积分运行设置");
+ redPaperRule.setRuleType("10");
redPaperRule.setSharingProfitType("register_score,share_score,share_score_time,first_score");
redPaperRule.setShareRatio(stringBuffer.toString());
redPaperRuleMapper.insert(redPaperRule);
--
Gitblit v1.9.1