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/ComActWarehouseApplyServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java
index 2c34a98..420fa25 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java
@@ -7,6 +7,7 @@
 import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseOperationVO;
 import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
 import com.panzhihua.service_community.dao.ComActWarehouseOperationDao;
 import com.panzhihua.service_community.dao.ComPbServiceTeamDao;
@@ -64,16 +65,17 @@
     @Transactional(rollbackFor = Exception.class)
     @Override
     public R update(ComActWarehouseApply comActWarehouseApply) {
-        ComActWarehouseApplyVO comActWarehouseApply1=this.comActWarehouseApplyDao.selectById(comActWarehouseApply.getId());
+        ComActWarehouseApply comActWarehouseApply1=this.comActWarehouseApplyDao.selectById(comActWarehouseApply.getId());
         if(comActWarehouseApply.getStatus().equals(ComActWarehouseApplyVO.status.ylq)){
-            ComActWarehouseDonates comActWarehouseDonates=this.comActWarehouseDonatesDao.selectById(comActWarehouseApply.getGoodsId());
-            if(comActWarehouseDonates!=null&&comActWarehouseDonates.getSurplusQuantity()>0){
-                comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonates.getSurplusQuantity()-1);
+            ComActWarehouseDonates comActWarehouseDonates=this.comActWarehouseDonatesDao.selectById(comActWarehouseApply1.getGoodsId());
+            if(comActWarehouseDonates!=null&&comActWarehouseDonates.getSurplusQuantity()>=comActWarehouseApply1.getGoodsNum()){
+                comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonates.getSurplusQuantity()-comActWarehouseApply1.getGoodsNum());
                 this.comActWarehouseDonatesDao.updateById(comActWarehouseDonates);
                 ComActWarehouseOperation comActWarehouseOperation=new ComActWarehouseOperation();
-                comActWarehouseOperation.setGoodsId(comActWarehouseApply.getGoodsId());
+                comActWarehouseOperation.setGoodsId(comActWarehouseApply1.getGoodsId());
                 comActWarehouseOperation.setCreateTime(new Date());
-                comActWarehouseOperation.setContent("爱心传递给了"+comActWarehouseApply1.getApplyName().charAt(0)+"**,"+"减少了"+comActWarehouseApply1.getReason()+"的困难,谢谢你的帮助");
+                comActWarehouseOperation.setType(ComActWarehouseOperation.type.xs);
+                comActWarehouseOperation.setApplyId(comActWarehouseApply.getId());
                 this.comActWarehouseOperationDao.insert(comActWarehouseOperation);
             }
             else {

--
Gitblit v1.7.1