From da101b5826d7ab8adebbde3582b50ffc85730d26 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 24 七月 2022 16:56:22 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java |   18 +++++++++---------
 1 files changed, 9 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 1519cb7..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);
@@ -244,8 +244,8 @@
         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);
@@ -277,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);
@@ -318,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