From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.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/ComActIntegralUserTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
index 59089a0..eb4131b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -196,7 +196,7 @@
Integer changeType = ComActIntegralUserTradeDO.changeType.add;
- if (!type.equals(8)) {
+ if (!type.equals(8) && !type.equals(4) && !type.equals(5) && !type.equals(6) && !type.equals(9)) {
// 查询随手拍增加积分数量
ComActIntegralRuleDO integralRuleDO =
comActIntegralRuleService.getOne(new QueryWrapper<ComActIntegralRuleDO>().lambda()
@@ -289,6 +289,7 @@
changeType = ComActIntegralUserTradeDO.changeType.reduce;
amount = -integralUserDTO.getIntegral();
remark.append(integralUserDTO.getRemark());
+ identityType = integralUserDTO.getSignIdentity();
break;
case 4:
case 5:
--
Gitblit v1.7.1