Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -99,6 +99,7 @@
                    integralCountDTO.setUserId(userId);
                    integralCountDTO.setCommunityId(communityId);
                    integralCountDTO.setType(ComActIntegralUserTradeDO.changeType.add);
                    integralCountDTO.setServiceType(integralUserRule.getIntegralType());
                    if(integralUserRule.getType().equals(ComActIntegralRuleDO.type.month)){
                        integralCountDTO.setStartTime(DateUtils.getFirstDayOfMonthString());
                        integralCountDTO.setEndTime(DateUtils.getLastDayOfMonthString());
@@ -190,7 +191,7 @@
        integralRuleWXYDO.setIsRestrict(1);
        integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month);
        integralRuleWXYDO.setCount(0);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp);
        integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy);
        integralRuleList.add(integralRuleWXYDO);

        //议事投票默认积分规则