From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java | 11 +++++------
1 files changed, 5 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 26d4447..da6d46b 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
@@ -67,16 +67,15 @@
public R update(ComActWarehouseApply comActWarehouseApply) {
ComActWarehouseApplyVO 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