From f805f0ccb34967614ef8a2890e8dece864c41d7a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 31 八月 2023 11:00:11 +0800
Subject: [PATCH] 修改志愿者活动积分发放接口    新增小程序社区积分兑换取消

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
index 66dc53b..598652a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java
@@ -61,12 +61,18 @@
     }
 
     @Override
-    public R grantIntegral(GrantIntegral grantIntegral) {
+    public R grantIntegral(GrantIntegral grantIntegral)
+    {
         for (GrantIntegral item: grantIntegral.getPeopleAndGranList() )
         {
             if(StringUtils.isEmpty(grantIntegral.getId()))
             {
                 return R.fail("奖励发放id不能为空!");
+            }
+
+            if(StringUtils.isEmpty(grantIntegral.getGrantIntegral()))
+            {
+                return R.fail("奖励发放积分不能为空!");
             }
 
             VolunteerActivitiesPeopleVO vla=new VolunteerActivitiesPeopleVO();
@@ -75,10 +81,10 @@
             vla.setIssueStatus("1");
             baseMapper.vapUpdate(vla);
 
-
+            //用户新增积分
             LoginUserInfoVO sysUser=userService.getUserInfoByUserId(item.getUserId()).getData();
             int grant=0;
-            if(!StringUtils.isNotEmpty(sysUser.getLoveIntegral()))
+            if(!StringUtils.isEmpty(sysUser.getLoveIntegral()))
             {
                 grant=Integer.valueOf(sysUser.getLoveIntegral());
             }
@@ -92,15 +98,15 @@
             volunteerIntegralRecordVO.setVolunteerId(item.getVolunteerId());
             volunteerIntegralRecordVO.setUserId(item.getUserId());
             volunteerIntegralRecordVO.setIType("1");
+            volunteerIntegralRecordVO.setCommunityId(item.getCommunityId());
             volunteerIntegralRecordService.insertVolunteer(volunteerIntegralRecordVO);
-
 
         }
 
-        VolunteerActivityVO activityVO=new VolunteerActivityVO();
-        activityVO.setId(grantIntegral.getActivityId());
-        activityVO.setAwardState("1");
-        volunteerActivityService.updateById(activityVO);
+//        VolunteerActivityVO activityVO=new VolunteerActivityVO();
+//        activityVO.setId(grantIntegral.getActivityId());
+//        activityVO.setAwardState("1");
+//        volunteerActivityService.updateById(activityVO);
         return R.ok();
     }
 

--
Gitblit v1.7.1