From 345ec77279ac912de74a1c037bd73e00a4210952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 29 Oct 2024 11:48:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E6=89=93=E5=8D=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/util/FeieyunPrintUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java index 40c3758..68589fb 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java @@ -120,15 +120,15 @@ public class FeieyunPrintUtil { public static String buildPrintContent(String pickupNumber, String date, String productName, Integer number, String remark) { StringBuilder builder = new StringBuilder(); - + log.error("打印数据pickupNumber>>>>>>>>>>>>>>>>>>>>>:{}", pickupNumber); builder.append("" + pickupNumber + "

"); builder.append("时间: " + date + "


"); remark = StrUtil.emptyToDefault(remark, ""); if (productName.length() > 4 || remark.length() > 4) { - builder.append("" + productName + " x " + number + "

"); + builder.append("" + productName + " x " + number + "

"); builder.append("" + remark + "
"); } else { - builder.append("" + productName + " x " + number + "

"); + builder.append("" + productName + " x " + number + "

"); builder.append("" + remark + "
"); } builder.append(""); From 93e43a2cf7268b95f0e5e7634995a070248a9a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 29 Oct 2024 13:38:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E6=89=93=E5=8D=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rabbit/PrintMechineConsumer.java | 2 +- .../rabbit/print/FeiPrinter.java | 2 +- .../service/CloudPrinterService.java | 6 +++--- .../cashierservice/util/FeieyunPrintUtil.java | 21 ++++++++++++++++--- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java index 29f2eb4..db67347 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java @@ -673,7 +673,7 @@ public class PrintMechineConsumer { } - FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark); + FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark); } }); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java index 8949c77..cc26ce6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java @@ -69,7 +69,7 @@ public class FeiPrinter extends PrinterHandler { return; } String remark = sku.getSpecSnap(); - String[] resp = FeieyunPrintUtil.getPrintData(machine.getAddress(), orderInfo.getMasterId(), + String[] resp = FeieyunPrintUtil.getPrintData(machine.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), remark); shopPrintLogService.save(machine, "新订单", resp[0], resp[1]); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java index d3b8c29..1bc6bab 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java @@ -262,7 +262,7 @@ public class CloudPrinterService { if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) { remark = tbProductSkuWithBLOBs.getSpecSnap(); } - OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark); + OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(), it.getPrice()).toPlainString(), remark); detailList.add(detail); }); @@ -397,7 +397,7 @@ public class CloudPrinterService { if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) { remark = tbProductSkuWithBLOBs.getSpecSnap(); } - OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark); + OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(), it.getPrice()).toPlainString(), remark); detailList.add(detail); }); @@ -527,7 +527,7 @@ public class CloudPrinterService { remark = tbProductSkuWithBLOBs.getSpecSnap(); } - FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark); + FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark); } }); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java index 68589fb..0b39e06 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java @@ -8,6 +8,8 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.chaozhanggui.system.cashierservice.bean.OrderUseTypeEnum; +import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo; import com.chaozhanggui.system.cashierservice.entity.po.CallNumPrintPO; import com.chaozhanggui.system.cashierservice.model.OrderDetailPO; import lombok.extern.slf4j.Slf4j; @@ -120,7 +122,6 @@ public class FeieyunPrintUtil { public static String buildPrintContent(String pickupNumber, String date, String productName, Integer number, String remark) { StringBuilder builder = new StringBuilder(); - log.error("打印数据pickupNumber>>>>>>>>>>>>>>>>>>>>>:{}", pickupNumber); builder.append("" + pickupNumber + "

"); builder.append("时间: " + date + "


"); remark = StrUtil.emptyToDefault(remark, ""); @@ -135,8 +136,8 @@ public class FeieyunPrintUtil { return builder.toString(); } - public static String[] getPrintData(String sn, String pickupNumber, String date, String productName, Integer number, String remark) { - String content = buildPrintContent(pickupNumber, date, productName, number, remark); + public static String[] getPrintData(String sn, TbOrderInfo orderInfo, String date, String productName, Integer number, String remark) { + String content = buildPrintContent(getPickupNum(orderInfo), date, productName, number, remark); System.out.println("content:".concat(content)); @@ -200,6 +201,20 @@ public class FeieyunPrintUtil { } + private static String getPickupNum(TbOrderInfo orderInfo) { + String pickupNum = ""; + if ("miniapp".equals(orderInfo.getOrderType())) { + if (OrderUseTypeEnum.TAKEOUT.getValue().equals(orderInfo.getUseType())) { + pickupNum = orderInfo.getOutNumber(); + } else { + pickupNum = orderInfo.getTableName(); + } + } else { + pickupNum = orderInfo.getMasterId(); + } + return pickupNum; + } + public static String buildPrintContent(OrderDetailPO detailPO, String type, String orderType) { StringBuffer data = new StringBuffer(); data.append(StrUtil.format("{}
", detailPO.getMerchantName())); From 7765758c9b88e1406f316275cb0919bd5a3a3209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 29 Oct 2024 14:08:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=B6=E9=93=B6=E6=9C=BA=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=BC=82=E5=B8=B8=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/controller/MemberController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java index 9a71769..f6c7cc8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java @@ -75,6 +75,7 @@ public class MemberController { try { return memberService.memberAccountPay(map, token); } catch (Exception e) { + log.error("》》》》》》》》》》账户支付异常：",e); e.printStackTrace(); } return Result.fail(CodeEnum.SYS_EXCEPTION); From 4f2e4e7f2e5588103d5cbbbcfb39dcfaab473cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 29 Oct 2024 14:24:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E6=9C=BA=E5=85=85=E5=80=BC=E5=BC=82=E5=B8=B8=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/MemberService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index 78cd912..3307fe3 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -717,7 +717,7 @@ public class MemberService { JSONObject baObj = new JSONObject(); baObj.put("userId", shopUser.getUserId()); baObj.put("shopId", shopInfo.getId()); - baObj.put("amount", ObjectUtil.isNull(fl) ? amount : amount.add(fl.get())); + baObj.put("amount", ObjectUtil.isNull(fl.get()) ? amount : amount.add(fl.get())); baObj.put("balance", shopUser.getAmount()); baObj.put("type", "充值"); baObj.put("time", flow.get().getCreateTime()); @@ -852,5 +852,4 @@ public class MemberService { } - }