From 7da9604c55617a4f2eb660a1be5e19489e633f6b 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: Fri, 2 Aug 2024 15:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E7=8F=AD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/DataService.java | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 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 277e089..4ff086f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java @@ -293,38 +293,35 @@ public class DataService { ); - tbHandover tbHandover=new tbHandover(); - - if(ObjectUtil.isNotNull(shopStaff)){ - tbHandover.setStaffId(shopStaff.getId()); - tbHandover.setStaffName(shopStaff.getName()); - } - 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); +// tbHandover tbHandover=new tbHandover(); +// +// if(ObjectUtil.isNotNull(shopStaff)){ +// tbHandover.setStaffId(shopStaff.getId()); +// tbHandover.setStaffName(shopStaff.getName()); +// } +// 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)); - - - }); }