From 5ed9c3abef8a7377a9129fe3bfc03ee68c5be6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Mon, 5 Aug 2024 14:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E7=8F=AD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/ConsService.java   | 22 ++++++++++---
 .../cashierservice/service/DataService.java   | 32 +++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java
index 99c2e34..ca6fdf7 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.system.cashierservice.dao.*;
 import com.chaozhanggui.system.cashierservice.entity.*;
 import com.chaozhanggui.system.cashierservice.entity.po.ConsInfoPO;
+import com.chaozhanggui.system.cashierservice.util.N;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -90,7 +91,6 @@ public class ConsService {
                         flow.setBizType("-");
 
                         tbConsInfo.setStockConsume(tbConsInfo.getStockConsume().add(amount));
-                        flow.setBalance(tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()));
                         tbConsInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
 
                     }else if("delete".equals(type)){
@@ -103,11 +103,25 @@ public class ConsService {
 
                         tbConsInfo.setStockConsume(tbConsInfo.getStockConsume().add(amount));
 
-                        flow.setBalance(tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()));
+
                         tbConsInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
                     }
-//                    ConsInfoPO consInfoPO=new ConsInfoPO(tbConsInfo.getId(),amount);
-//                    consInfoPOS.add(consInfoPO);
+
+                    if(N.gt(BigDecimal.ZERO,tbConsInfo.getStockNumber())){
+                        if(N.gt(BigDecimal.ZERO,tbConsInfo.getStockConsume())){
+                            flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume()));
+                        }else {
+                            flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume().negate()));
+                        }
+
+                    }else {
+                        if(N.gt(BigDecimal.ZERO,tbConsInfo.getStockConsume())){
+                            flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume().negate()));
+                        }else {
+                            flow.setBalance(tbConsInfo.getStockNumber().add(tbConsInfo.getStockConsume().negate()));
+                        }
+                    }
+
 
                     flow.setOrderId(tbOrderInfo.getId());
                     flow.setOrderNo(tbOrderInfo.getOrderNo());
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
index 4ff086f..e19eda0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
@@ -134,6 +134,38 @@ public class DataService {
                     productInfoPOS,productInfos
 
             );
+
+
+            tbHandover tbHandover=new tbHandover();
+
+            if(ObjectUtil.isNotNull(shopStaff)){
+                tbHandover.setStaffId(shopStaff.getId());
+                tbHandover.setStaffName(shopStaff.getName());
+            }
+            tbHandover.setTradeDay(DateUtils.getDays());
+            tbHandover.setPrintNo("usb");
+            tbHandover.setDutyId(shopUserDuty.getId());
+            tbHandover.setShopId(shopInfo.getId());
+            tbHandover.setMerchantName(handoverInfo.getMerchantName());
+            tbHandover.setStartTime(handoverInfo.getStartTime());
+            tbHandover.setEndTime(handoverInfo.getEndTime());
+            tbHandover.setPayInfos(JSONUtil.toJSONString(handoverInfo.getPayInfos()));
+            tbHandover.setMemberData(JSONUtil.toJSONString(handoverInfo.getMemberData()));
+            tbHandover.setProductCategories(JSONUtil.toJSONString(handoverInfo.getProductCategories()));
+            tbHandover.setTotalAmount(handoverInfo.getTotalAmount());
+            tbHandover.setImprest(handoverInfo.getImprest());
+            tbHandover.setPayable(handoverInfo.getPayable());
+            tbHandover.setHandIn(handoverInfo.getHandIn());
+            tbHandover.setReturnAmount(handoverInfo.getReturnAmount());
+            tbHandover.setOrderNum(handoverInfo.getOrderNum());
+            tbHandover.setQuickAmount(handoverInfo.getQuickAmount());
+            tbHandover.setProductInfoPos(JSONUtil.toJSONString(handoverInfo.getProductInfoPOS()));
+            tbHandover.setProductInfos(JSONUtil.toJSONString(handoverInfo.getProductInfos()));
+            tbHandover.setCreateTime(new Date());
+            tbHandoverMapper.insert(tbHandover);
+
+
+
             return Result.success(CodeEnum.SUCCESS,handoverInfo);
         }else{
             HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),