From 37e9745ca7a28e7e547bf274773cfa7a24df0f63 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: Thu, 25 Jul 2024 11:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/DataService.java   | 28 +++++++++++++++++++
 .../cashierservice/util/PrinterUtils.java     |  8 +++---
 .../generator-mapper/generatorConfig.xml      |  2 +-
 3 files changed, 33 insertions(+), 5 deletions(-)

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 621ed5e..0a0231f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java
@@ -49,6 +49,9 @@ public class DataService {
     @Autowired
     ShopUserDutyPayMapper shopUserDutyPayMapper;
 
+    @Autowired
+    tbHandoverMapper tbHandoverMapper;
+
 
     public Result handoverprintData(String token, Integer id){
 
@@ -218,8 +221,33 @@ public class DataService {
 
                     );
 
+                    tbHandover tbHandover=new tbHandover();
+                    tbHandover.setTradeDay(DateUtils.getDays());
+                    tbHandover.setPrintNo(it.getAddress());
+                    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);
                     String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
                     PrinterUtils.printTickets(voiceJson, 1, 1, it.getAddress(), PrinterUtils.handoverprintData(handoverInfo));
+
+
+
                 });
 
             }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
index 4ff0c6a..0954ef8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -112,11 +112,11 @@ public class PrinterUtils {
         for (OrderDetailPO.Detail detail : detailPO.getDetailList()) {
 
             if(detail.getProductName().length()>8){
-                sb.append("<S>    "+detail.getProductName()+"</S><BR>");
-                sb.append("<S>    "+String.format("%15s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%10s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
+                sb.append("<S>"+detail.getProductName()+"</S><BR>");
+                sb.append("<S>"+String.format("%15s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%10s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
             }else {
-                int tt=14-detail.getProductName().length();
-                sb.append("<S>    "+String.format("%-"+tt+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%6s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
+                int tt=16-detail.getProductName().length();
+                sb.append("<S>"+String.format("%-"+tt+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%6s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
             }
 
             if(detail.getSpec()!=null&& ObjectUtil.isNotEmpty(detail.getSpec())){
diff --git a/src/main/resources/generator-mapper/generatorConfig.xml b/src/main/resources/generator-mapper/generatorConfig.xml
index 295ab1d..e21a228 100644
--- a/src/main/resources/generator-mapper/generatorConfig.xml
+++ b/src/main/resources/generator-mapper/generatorConfig.xml
@@ -53,7 +53,7 @@
         <!-- 要生成的表tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
         <!--                <table tableName="%" schema="fycashier" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>-->
 
-        <table tableName="tb_user_shop_msg" domainObjectName="TbUserShopMsg"
+        <table tableName="tb_handover" domainObjectName="tbHandover"
                enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
                enableSelectByExample="false" selectByExampleQueryId="false" >
         </table>