From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 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 ba700e1..ebc0830 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
@@ -125,42 +125,6 @@
integralRuleYSTPDO.setIntegralType(ComActIntegralRuleDO.integralType.cyystp);
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 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 integralRuleWJDCDO = new ComActIntegralRuleDO();
integralRuleWJDCDO.setCommunityId(communityId);
@@ -172,6 +136,40 @@
integralRuleWJDCDO.setCount(0);
integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cydcwj);
integralRuleList.add(integralRuleWJDCDO);
+
+ ComActIntegralRuleDO integralRuleJMHDDO = new ComActIntegralRuleDO();
+ integralRuleWJDCDO.setCommunityId(communityId);
+ integralRuleWJDCDO.setName("参加居民活动");
+ integralRuleWJDCDO.setAmount(0);
+ integralRuleWJDCDO.setIntegralDescribe("以居民身份参与社区活动可获得对应积分奖励");
+ integralRuleWJDCDO.setIsRestrict(1);
+ integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day);
+ integralRuleWJDCDO.setCount(0);
+ integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cyjmhd);
+ integralRuleList.add(integralRuleJMHDDO);
+
+ ComActIntegralRuleDO integralRuleZYZHDDO = new ComActIntegralRuleDO();
+ integralRuleWJDCDO.setCommunityId(communityId);
+ integralRuleWJDCDO.setName("参加志愿者活动");
+ integralRuleWJDCDO.setAmount(0);
+ integralRuleWJDCDO.setIntegralDescribe("以志愿者身份参与社区活动可获得对应积分奖励");
+ integralRuleWJDCDO.setIsRestrict(1);
+ integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day);
+ integralRuleWJDCDO.setCount(0);
+ integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
+ integralRuleList.add(integralRuleZYZHDDO);
+
+ ComActIntegralRuleDO integralRuleDYHDDO = new ComActIntegralRuleDO();
+ integralRuleWJDCDO.setCommunityId(communityId);
+ integralRuleWJDCDO.setName("参加党员活动");
+ integralRuleWJDCDO.setAmount(0);
+ integralRuleWJDCDO.setIntegralDescribe("以党员身份参与社区活动可获得相应积分");
+ integralRuleWJDCDO.setIsRestrict(1);
+ integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day);
+ integralRuleWJDCDO.setCount(0);
+ integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
+ integralRuleList.add(integralRuleDYHDDO);
+
return integralRuleList;
}
--
Gitblit v1.7.1