From d769a8683ea6f2ecbc451da71ca3079c6765a99d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 13:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
index 7c8ad4a..936a414 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
+++ b/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);
//议事投票默认积分规则
--
Gitblit v1.7.1