From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java
index 91ca97e..79dfd5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java
@@ -64,9 +64,11 @@
         ComActIntegralRuleDO integralRuleSSPDO = new ComActIntegralRuleDO();
         integralRuleSSPDO.setCommunityId(communityId);
         integralRuleSSPDO.setName("发布随手拍");
-        integralRuleSSPDO.setAmount(0);
+        integralRuleSSPDO.setAmount(5);
         integralRuleSSPDO.setIntegralDescribe("发布随手拍并被公示后");
-        integralRuleSSPDO.setIsRestrict(2);
+        integralRuleSSPDO.setIsRestrict(1);
+        integralRuleSSPDO.setType(ComActIntegralRuleDO.type.day);
+        integralRuleSSPDO.setCount(0);
         integralRuleSSPDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
         integralRuleList.add(integralRuleSSPDO);
 
@@ -74,23 +76,23 @@
         ComActIntegralRuleDO integralRuleWXYDO = new ComActIntegralRuleDO();
         integralRuleWXYDO.setCommunityId(communityId);
         integralRuleWXYDO.setName("发布微心愿");
-        integralRuleWXYDO.setAmount(0);
+        integralRuleWXYDO.setAmount(7);
         integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
         integralRuleWXYDO.setIsRestrict(1);
         integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
-        integralRuleWXYDO.setCount(5);
-        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
+        integralRuleWXYDO.setCount(0);
+        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
         integralRuleList.add(integralRuleWXYDO);
 
         //议事投票默认积分规则
         ComActIntegralRuleDO integralRuleYSTPDO = new ComActIntegralRuleDO();
         integralRuleYSTPDO.setCommunityId(communityId);
         integralRuleYSTPDO.setName("参与议事投票");
-        integralRuleYSTPDO.setAmount(0);
+        integralRuleYSTPDO.setAmount(4);
         integralRuleYSTPDO.setIntegralDescribe("参与议事投票");
         integralRuleYSTPDO.setIsRestrict(1);
         integralRuleYSTPDO.setType(ComActIntegralRuleDO.type.day);
-        integralRuleYSTPDO.setCount(3);
+        integralRuleYSTPDO.setCount(0);
         integralRuleYSTPDO.setIntegralType(ComActIntegralRuleDO.integralType.cyystp);
         integralRuleList.add(integralRuleYSTPDO);
 
@@ -98,11 +100,11 @@
         ComActIntegralRuleDO integralRuleZYZDO = new ComActIntegralRuleDO();
         integralRuleZYZDO.setCommunityId(communityId);
         integralRuleZYZDO.setName("参与志愿者活动");
-        integralRuleZYZDO.setAmount(0);
+        integralRuleZYZDO.setAmount(2);
         integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动,仅限志愿者");
         integralRuleZYZDO.setIsRestrict(1);
         integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
-        integralRuleZYZDO.setCount(5);
+        integralRuleZYZDO.setCount(0);
         integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
         integralRuleList.add(integralRuleZYZDO);
 
@@ -110,11 +112,11 @@
         ComActIntegralRuleDO integralRuleSQHDDO = new ComActIntegralRuleDO();
         integralRuleSQHDDO.setCommunityId(communityId);
         integralRuleSQHDDO.setName("参与社区活动");
-        integralRuleSQHDDO.setAmount(0);
+        integralRuleSQHDDO.setAmount(2);
         integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动,所有人可参与");
         integralRuleSQHDDO.setIsRestrict(1);
         integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
-        integralRuleSQHDDO.setCount(5);
+        integralRuleSQHDDO.setCount(0);
         integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
         integralRuleList.add(integralRuleSQHDDO);
 
@@ -122,11 +124,11 @@
         ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
         integralRuleDYHDDO.setCommunityId(communityId);
         integralRuleDYHDDO.setName("参与党员活动");
-        integralRuleDYHDDO.setAmount(0);
+        integralRuleDYHDDO.setAmount(1);
         integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动,党员可参与");
         integralRuleDYHDDO.setIsRestrict(1);
         integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
-        integralRuleDYHDDO.setCount(3);
+        integralRuleDYHDDO.setCount(0);
         integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
         integralRuleList.add(integralRuleDYHDDO);
 
@@ -134,11 +136,11 @@
         ComActIntegralRuleDO integralRuleWJDCDO = new ComActIntegralRuleDO();
         integralRuleWJDCDO.setCommunityId(communityId);
         integralRuleWJDCDO.setName("参与问卷调查");
-        integralRuleWJDCDO.setAmount(0);
+        integralRuleWJDCDO.setAmount(4);
         integralRuleWJDCDO.setIntegralDescribe("参与问卷调查");
         integralRuleWJDCDO.setIsRestrict(1);
         integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day);
-        integralRuleWJDCDO.setCount(3);
+        integralRuleWJDCDO.setCount(0);
         integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cydcwj);
         integralRuleList.add(integralRuleWJDCDO);
         return integralRuleList;

--
Gitblit v1.7.1