From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
index 12dc396..b0c1a5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -267,7 +267,7 @@
      */
     @Override
     @Transactional
-    public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
+    public synchronized R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
         Long id = comActMicroWishVO.getId();
         int type = comActMicroWishVO.getType().intValue();
         String rejectReason = comActMicroWishVO.getRejectReason();
@@ -286,6 +286,7 @@
         if(microWishDO == null){
             return R.fail("未查询到该微心愿记录");
         }
+
 //        1 审核通过 2驳回 3分配人员 4发起活动 5反馈
         switch (type){
             case 1:
@@ -315,6 +316,15 @@
                 comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
                 break;
             case 3:
+                /**
+                 * 状态
+                 * 状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成
+                 */
+                if(comActMicroWishDO.getStatus()!=null && comActMicroWishDO.getStatus()!=2)
+                {
+                    return R.fail("该微心愿已认领,不可重复认领");
+                }
+
                 isUpdate = true;
                 comActMicroWishDO.setDistributionAt(date);
                 comActMicroWishDO.setResponsibleId(responsibleId);
@@ -398,7 +408,7 @@
                     //添加操作记录
                     comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.fk);
                     comActMicroWishOperationRecordDO.setContent(feedback);
-                    if(microWishDO.getForm()==3)
+                    if(comActMicroWishVO.getForm()==null || comActMicroWishVO.getForm() ==3  )
                     {
                         comActMicroWishOperationRecordDO.setRemark("用户反馈");
                     }

--
Gitblit v1.7.1