From e83501edf6b6595592e432aeac6bfa83c1f21af8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 20 十一月 2023 13:48:55 +0800
Subject: [PATCH] 用户积分任务  积分任务领取   积分添加模块

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
index eba9717..14c746e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
@@ -9,6 +9,7 @@
 import com.panzhihua.service_dangjian.dao.ComActIntegralUsersMapper;
 import com.panzhihua.service_dangjian.entity.ComActIntegralUser;
 import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade;
+import com.panzhihua.service_dangjian.entity.IntegratingTask;
 import com.panzhihua.service_dangjian.service.ComActIntegralUserChangeDAOService;
 import com.panzhihua.service_dangjian.service.ComActIntegralUserTradeDaoService;
 import com.panzhihua.service_dangjian.service.ComActIntegralUsersService;
@@ -39,6 +40,7 @@
 
     @Resource
     private NewFightIntegratingTaskService taskService;
+
 
     @Override
     public R upIntegral(NewFightIntegral item)
@@ -113,6 +115,14 @@
                 break;
             case "11":
                 //花城登录
+
+                IntegratingTask task=taskService.getDetails(item.getUserId(),
+                        item.getCommunityId(),item.getType());
+                if(task!=null && StringUtils.equals("2",task.getIsDraw()) )
+                {
+                    return R.ok();
+                }
+
                 item.setAddOrReduce(1);
                 item.setIntegralNum("2");
 
@@ -131,18 +141,23 @@
                 //15查看微心愿
             case "16":
                 //查看随手拍
+//                item.setAddOrReduce(1);
+//                item.setIntegralNum("1");
+//                break;
+            case "17":
+                //每日签到
+                IntegratingTask task2=taskService.getDetails(item.getUserId(),
+                        item.getCommunityId(),item.getType());
+                if(task2!=null && StringUtils.equals("2",task2.getIsDraw()) )
+                {
+                    return R.ok();
+                }
                 item.setAddOrReduce(1);
                 item.setIntegralNum("1");
-
                 IntegratingTaskVO taskVO2=new IntegratingTaskVO();
                 taskVO2.setIsDraw("2");
                 taskVO2.setId(item.getTaskId());
                 taskService.editData(taskVO2);
-                break;
-            case "17":
-                //每日签到
-                item.setAddOrReduce(1);
-                item.setIntegralNum("1");
                 break;
             case "18":
                 //上传“随手拍”或“微心愿
@@ -150,9 +165,6 @@
                 item.setIntegralNum("2");
                 break;
         }
-
-
-
 
         // 根据不同身份,计算钱包金额
 //        if (identityType.equals(ComActIntegralUserTrade.identityType.jm)) {
@@ -179,6 +191,23 @@
 //        }
 
 
+        //积分总数加减
+        if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.reduce)
+        {
+            int integralResidentNow = addIntegral(integralResident + amount);
+            integralUserDO.setIntegralResident(integralResidentNow);
+            integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() + amount));
+
+        }
+        else {
+
+            int integralResidentNow = addIntegral(integralResident - amount);
+            integralUserDO.setIntegralResident(integralResidentNow);
+            integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() - amount));
+        }
+
+
+        //积分总数加减
         if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.reduce)
         {
             integralUserDO.setIntegralSum(addIntegral(integralSum - amount));

--
Gitblit v1.7.1