From 4ad4b51a4fb177eafee8a3a355496e7b6c1be662 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 16:24:46 +0800
Subject: [PATCH] 花城 小程序签退打卡获取积分详情报错2

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
index a17faef..0f257f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java
@@ -11,7 +11,6 @@
 import com.panzhihua.service_dangjian.entity.UserTrade;
 import com.panzhihua.service_dangjian.service.NeedProblemClaimService;
 import com.panzhihua.service_dangjian.service.NeedProblemInventoryService;
-import io.swagger.annotations.ApiModelProperty;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -156,7 +155,7 @@
             NeedProblemInventoryDTO dto=inventoryService.getDetails(taskId,userId);
             UserTrade userTrade=new UserTrade();
             //增加积分
-            UserIntegral integral = baseMapper.getUserIntegral(userId);
+            UserIntegral integral = baseMapper.getUserIntegral(userId,dto.getCommunityId());
             if (integral == null) {
                 UserIntegral addIn = new UserIntegral();
                 addIn.setId(Snowflake.getId()+"");
@@ -169,9 +168,25 @@
             }
             else
             {
-                int award=Integer.valueOf(dto.getAward());
-                int integralAvailableSum=Integer.valueOf(integral.getIntegralAvailableSum())+award;
-                int integralSum=Integer.valueOf(integral.getIntegralSum())+award;
+                int award=0;
+                int integralAvailableSum=0;
+                int integralSum=0;
+
+                if(!StringUtils.isEmpty(dto.getAward()))
+                {
+                    award=Integer.valueOf(dto.getAward());
+                }
+
+                if(!StringUtils.isEmpty(integral.getIntegralAvailableSum()))
+                {
+                    integralAvailableSum=Integer.valueOf(integral.getIntegralAvailableSum())+award;
+                }
+
+                if(!StringUtils.isEmpty(integral.getIntegralSum()))
+                {
+                    integralSum=Integer.valueOf(integral.getIntegralSum())+award;
+                }
+
                 userTrade.setIntegralId(integral.getId());
                 integral.setIntegralAvailableSum(integralAvailableSum+"");
                 integral.setIntegralSum(integralSum+"");

--
Gitblit v1.7.1