From a7dc5d2d03deacb8c7c0028a46aba2f141f35649 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 20:19:09 +0800
Subject: [PATCH] Merge branch 'master' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java | 102 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 42 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 79dfd5b..a5ce78a 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
@@ -57,8 +57,26 @@
* @param communityId 社区id
* @return 默认积分规则列表
*/
- private List<ComActIntegralRuleDO> getIntegralRuleList(Long communityId){
+ @Override
+ public List<ComActIntegralRuleDO> getIntegralRuleList(Long communityId){
List<ComActIntegralRuleDO> integralRuleList = new ArrayList<>();
+
+ List<ComActIntegralRuleDO> defaultRuleList = this.baseMapper.getIntegralDefaultList();
+ if(!defaultRuleList.isEmpty()){
+ defaultRuleList.forEach(defaultRule -> {
+ ComActIntegralRuleDO integralRuleDO = new ComActIntegralRuleDO();
+ integralRuleDO.setCommunityId(communityId);
+ integralRuleDO.setName(defaultRule.getName());
+ integralRuleDO.setAmount(defaultRule.getAmount());
+ integralRuleDO.setIntegralDescribe(defaultRule.getIntegralDescribe());
+ integralRuleDO.setIsRestrict(defaultRule.getIsRestrict());
+ integralRuleDO.setType(defaultRule.getType());
+ integralRuleDO.setCount(defaultRule.getCount());
+ integralRuleDO.setIntegralType(defaultRule.getIntegralType());
+ integralRuleList.add(integralRuleDO);
+ });
+ return integralRuleList;
+ }
//随手拍默认积分规则
ComActIntegralRuleDO integralRuleSSPDO = new ComActIntegralRuleDO();
@@ -73,16 +91,16 @@
integralRuleList.add(integralRuleSSPDO);
//微心愿默认积分规则
- ComActIntegralRuleDO integralRuleWXYDO = new ComActIntegralRuleDO();
- integralRuleWXYDO.setCommunityId(communityId);
- integralRuleWXYDO.setName("发布微心愿");
- integralRuleWXYDO.setAmount(7);
- integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
- integralRuleWXYDO.setIsRestrict(1);
- integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
- integralRuleWXYDO.setCount(0);
- integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
- integralRuleList.add(integralRuleWXYDO);
+// ComActIntegralRuleDO integralRuleWXYDO = new ComActIntegralRuleDO();
+// integralRuleWXYDO.setCommunityId(communityId);
+// integralRuleWXYDO.setName("发布微心愿");
+// integralRuleWXYDO.setAmount(7);
+// integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
+// integralRuleWXYDO.setIsRestrict(1);
+// integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
+// integralRuleWXYDO.setCount(0);
+// integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
+// integralRuleList.add(integralRuleWXYDO);
//议事投票默认积分规则
ComActIntegralRuleDO integralRuleYSTPDO = new ComActIntegralRuleDO();
@@ -97,42 +115,42 @@
integralRuleList.add(integralRuleYSTPDO);
//志愿者活动默认积分规则
- ComActIntegralRuleDO integralRuleZYZDO = new ComActIntegralRuleDO();
- integralRuleZYZDO.setCommunityId(communityId);
- integralRuleZYZDO.setName("参与志愿者活动");
- integralRuleZYZDO.setAmount(2);
- integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动，仅限志愿者");
- integralRuleZYZDO.setIsRestrict(1);
- integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
- integralRuleZYZDO.setCount(0);
- integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
- integralRuleList.add(integralRuleZYZDO);
+// ComActIntegralRuleDO integralRuleZYZDO = new ComActIntegralRuleDO();
+// integralRuleZYZDO.setCommunityId(communityId);
+// integralRuleZYZDO.setName("参与志愿者活动");
+// integralRuleZYZDO.setAmount(2);
+// integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动，仅限志愿者");
+// integralRuleZYZDO.setIsRestrict(1);
+// integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
+// integralRuleZYZDO.setCount(0);
+// integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
+// integralRuleList.add(integralRuleZYZDO);
//社区活动默认积分规则
- ComActIntegralRuleDO integralRuleSQHDDO = new ComActIntegralRuleDO();
- integralRuleSQHDDO.setCommunityId(communityId);
- integralRuleSQHDDO.setName("参与社区活动");
- integralRuleSQHDDO.setAmount(2);
- integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动，所有人可参与");
- integralRuleSQHDDO.setIsRestrict(1);
- integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
- integralRuleSQHDDO.setCount(0);
- integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
- integralRuleList.add(integralRuleSQHDDO);
+// ComActIntegralRuleDO integralRuleSQHDDO = new ComActIntegralRuleDO();
+// integralRuleSQHDDO.setCommunityId(communityId);
+// integralRuleSQHDDO.setName("参与社区活动");
+// integralRuleSQHDDO.setAmount(2);
+// integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动，所有人可参与");
+// integralRuleSQHDDO.setIsRestrict(1);
+// integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
+// integralRuleSQHDDO.setCount(0);
+// integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
+// integralRuleList.add(integralRuleSQHDDO);
//党员活动默认积分规则
- ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
- integralRuleDYHDDO.setCommunityId(communityId);
- integralRuleDYHDDO.setName("参与党员活动");
- integralRuleDYHDDO.setAmount(1);
- integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动，党员可参与");
- integralRuleDYHDDO.setIsRestrict(1);
- integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
- integralRuleDYHDDO.setCount(0);
- integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
- integralRuleList.add(integralRuleDYHDDO);
+// ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
+// integralRuleDYHDDO.setCommunityId(communityId);
+// integralRuleDYHDDO.setName("参与党员活动");
+// integralRuleDYHDDO.setAmount(1);
+// integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动，党员可参与");
+// integralRuleDYHDDO.setIsRestrict(1);
+// integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
+// integralRuleDYHDDO.setCount(0);
+// integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
+// integralRuleList.add(integralRuleDYHDDO);
- //党员活动默认积分规则
+ //问卷调查默认积分规则
ComActIntegralRuleDO integralRuleWJDCDO = new ComActIntegralRuleDO();
integralRuleWJDCDO.setCommunityId(communityId);
integralRuleWJDCDO.setName("参与问卷调查");
--
Gitblit v1.7.1