Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-02 fcb6fbf8eb693ccf1e8c8f7215d80d17c053029e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java

@@ -175,7 +175,9 @@
        integralRuleSSPDO.setName("发布随手拍");
        integralRuleSSPDO.setAmount(0);
        integralRuleSSPDO.setIntegralDescribe("发布随手拍并被公示后");
        integralRuleSSPDO.setIsRestrict(2);
        integralRuleSSPDO.setIsRestrict(1);
        integralRuleSSPDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleSSPDO.setCount(0);
        integralRuleSSPDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
        integralRuleList.add(integralRuleSSPDO);

@@ -187,7 +189,7 @@
        integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后");
        integralRuleWXYDO.setIsRestrict(1);
        integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleWXYDO.setCount(5);
        integralRuleWXYDO.setCount(0);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
        integralRuleList.add(integralRuleWXYDO);

@@ -199,7 +201,7 @@
        integralRuleYSTPDO.setIntegralDescribe("参与议事投票");
        integralRuleYSTPDO.setIsRestrict(1);
        integralRuleYSTPDO.setType(ComActIntegralRuleDO.type.day);
        integralRuleYSTPDO.setCount(3);
        integralRuleYSTPDO.setCount(0);
        integralRuleYSTPDO.setIntegralType(ComActIntegralRuleDO.integralType.cyystp);
        integralRuleList.add(integralRuleYSTPDO);

@@ -211,7 +213,7 @@
        integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动，仅限志愿者");
        integralRuleZYZDO.setIsRestrict(1);
        integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleZYZDO.setCount(5);
        integralRuleZYZDO.setCount(0);
        integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd);
        integralRuleList.add(integralRuleZYZDO);

@@ -223,7 +225,7 @@
        integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动，所有人可参与");
        integralRuleSQHDDO.setIsRestrict(1);
        integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleSQHDDO.setCount(5);
        integralRuleSQHDDO.setCount(0);
        integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd);
        integralRuleList.add(integralRuleSQHDDO);

@@ -235,7 +237,7 @@
        integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动，党员可参与");
        integralRuleDYHDDO.setIsRestrict(1);
        integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day);
        integralRuleDYHDDO.setCount(3);
        integralRuleDYHDDO.setCount(0);
        integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd);
        integralRuleList.add(integralRuleDYHDDO);

@@ -247,7 +249,7 @@
        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;