From 19be4e41f53df714a2f4dcf65f393f491e2d165f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 17:07:55 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 26d4447..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
@@ -65,18 +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.setUserId(comActWarehouseApply.getId());
+ comActWarehouseOperation.setApplyId(comActWarehouseApply.getId());
this.comActWarehouseOperationDao.insert(comActWarehouseOperation);
}
else {
--
Gitblit v1.7.1