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/ComActWarehouseDonatesServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java
index cf1787b..297b301 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java
@@ -88,8 +88,8 @@
Long donateId = donate.getId();
if (nonNull(donateId)) {
ComActWarehouseOperation comActWarehouseOperation = new ComActWarehouseOperation();
- comActWarehouseOperation.setGoodsId(donateId.intValue());
- comActWarehouseOperation.setUserId(donate.getSigningBy().intValue());
+ comActWarehouseOperation.setGoodsId(donateId);
+ comActWarehouseOperation.setUserId(donate.getSigningBy());
comActWarehouseOperation.setContent("工作人员完成了物品签收");
comActWarehouseOperation.setCreateTime(nowDate);
comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
@@ -175,8 +175,8 @@
if (result > 0) {
if (comActWarehouseDonates.getStatus().intValue() == 2) {
ComActWarehouseOperation comActWarehouseOperation = new ComActWarehouseOperation();
- comActWarehouseOperation.setGoodsId(comActWarehouseDonates.getId().intValue());
- comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy().intValue());
+ comActWarehouseOperation.setGoodsId(comActWarehouseDonates.getId());
+ comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy());
comActWarehouseOperation.setContent("工作人员完成了物品签收");
comActWarehouseOperation.setCreateTime(nowDate);
comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
@@ -236,13 +236,16 @@
}
BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates);
Date nowDate = new Date();
+ if (nonNull(comActWarehouseDonatesDTO.getQuantity())) {
+ comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonatesDTO.getQuantity());
+ }
comActWarehouseDonates.setSigningAt(nowDate);
comActWarehouseDonates.setStatus(2);
int result = this.baseMapper.updateById(comActWarehouseDonates);
if (result > 0) {
ComActWarehouseOperation comActWarehouseOperation = new ComActWarehouseOperation();
- comActWarehouseOperation.setGoodsId(comActWarehouseDonates.getId().intValue());
- comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy().intValue());
+ comActWarehouseOperation.setGoodsId(comActWarehouseDonates.getId());
+ comActWarehouseOperation.setUserId(comActWarehouseDonates.getSigningBy());
comActWarehouseOperation.setContent("工作人员完成了物品签收");
comActWarehouseOperation.setCreateTime(nowDate);
comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
@@ -274,8 +277,8 @@
int result = this.baseMapper.updateById(comActWarehouseDonates);
if (result > 0) {
ComActWarehouseOperation comActWarehouseOperation = new ComActWarehouseOperation();
- comActWarehouseOperation.setGoodsId(comActWarehouseDonates.getId().intValue());
- comActWarehouseOperation.setUserId(currentUser.intValue());
+ comActWarehouseOperation.setGoodsId(comActWarehouseDonates.getId());
+ comActWarehouseOperation.setUserId(currentUser);
comActWarehouseOperation.setContent("已取消捐赠");
comActWarehouseOperation.setCreateTime(new Date());
comActWarehouseOperation.setType(ComActWarehouseOperation.type.bxs);
@@ -315,7 +318,7 @@
if (!applyItems.isEmpty()) {
Date nowDate = new Date();
applyItems.forEach(item -> {
- Integer goodsId = item.getGoodsId();
+ Long goodsId = item.getGoodsId();
Integer goodsNum = item.getGoodsNum();
if (isNull(goodsId) || isNull(goodsNum)) {
throw new ServiceException("请求参数有误");
--
Gitblit v1.7.1