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 d1b1318..780606c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -1,6 +1,5 @@
 package com.chaozhanggui.system.cashierservice.rabbit;
 
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -180,7 +179,7 @@ public class PrintMechineConsumer {
                     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(), it.getPriceAmount().toPlainString(), remark);
                     detailList.add(detail);
 
                 });
@@ -195,7 +194,7 @@ public class PrintMechineConsumer {
 
 
                 if (ObjectUtil.isNotEmpty(detailList) && detailList.size() > 0) {
-                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId()) || ObjectUtil.isNull(orderInfo.getMasterId()) ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getPayAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList, orderInfo.getRemark(), null, null);
+                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId()) || ObjectUtil.isNull(orderInfo.getMasterId()) ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList, orderInfo.getRemark(), null, null);
 
                     String printType = "退款单";
 
@@ -228,7 +227,7 @@ public class PrintMechineConsumer {
                     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(), it.getPriceAmount().toPlainString(), remark);
                     detailList.add(detail);
                 }
             });
@@ -246,7 +245,7 @@ public class PrintMechineConsumer {
                 OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                         orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
                         orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                        "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,
+                        "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance,
                         (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
                         "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() != null ? orderInfo.getDiscountAmount().toPlainString() : null,
                         orderInfo.getDiscountRatio() != null ? orderInfo.getDiscountRatio().toPlainString() : null);
@@ -583,7 +582,7 @@ public class PrintMechineConsumer {
                     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(), it.getPriceAmount().toPlainString(), remark);
                     detailList.add(detail);
 
                 });
@@ -603,7 +602,7 @@ public class PrintMechineConsumer {
                             "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId()) || ObjectUtil.isNull(orderInfo.getMasterId())
                             ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(),
                             DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                            "【POS-1】001", orderInfo.getOrderAmount().toPlainString(),
+                            "【POS-1】001", orderInfo.getOriginAmount().toPlainString(),
                             balance, orderInfo.getPayType(), "0",
                             detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(),
                             orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
@@ -656,7 +655,7 @@ public class PrintMechineConsumer {
                     }
                 }
                 if (ObjectUtil.isNotEmpty(detailList) && detailList.size() > 0) {
-                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()), "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
+                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance, (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()), "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
                     String printType = "结算单";
 
                     if ("return".equals(orderInfo.getOrderType())) {
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 506c928..7aec6a2 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
@@ -81,7 +81,7 @@ public class FeiPrinter extends PrinterHandler {
         OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                 orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
                 orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,
+                "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance,
                 (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
                 "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
         String printType = "退款单";
@@ -101,7 +101,7 @@ public class FeiPrinter extends PrinterHandler {
         OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                 orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
                 orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,
+                "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance,
                 (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
                 "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
         String printType = "结算单";
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
index 6324306..d66ca2b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
@@ -1,7 +1,6 @@
 package com.chaozhanggui.system.cashierservice.rabbit.print;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
@@ -168,7 +167,7 @@ public abstract class PrinterHandler {
             if (isTemporary == 1) {
                 it.setProductName("【临】" + it.getProductName());
             }
-            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(), it.getPriceAmount().toPlainString(), remark);
             detailList.add(detail);
 
         });
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
index 2f11557..0d27d8b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
@@ -91,7 +91,7 @@ public class YxyPrinter extends PrinterHandler {
         TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
         OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", getPickupNum(orderInfo),
                 orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                "【POS-1】001", orderInfo.getPayAmount().toPlainString(), balance, orderInfo.getPayType(),
+                "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance, orderInfo.getPayType(),
                 "0", detailList, orderInfo.getRemark(), null, null);
 
         String printType = "退款单";
@@ -110,7 +110,7 @@ public class YxyPrinter extends PrinterHandler {
         OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                 getPickupNum(orderInfo),
                 orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,
+                "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance,
                 (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
                 "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() != null ? orderInfo.getDiscountAmount().toPlainString() : null,
                 orderInfo.getDiscountRatio() != null ? orderInfo.getDiscountRatio().toPlainString() : null);
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 bf80f8c..93c1318 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
@@ -1,7 +1,6 @@
 package com.chaozhanggui.system.cashierservice.service;
 
 
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -277,7 +276,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(), it.getPriceAmount().toPlainString(), remark);
                     detailList.add(detail);
 
                 });
@@ -296,7 +295,7 @@ public class CloudPrinterService {
                     OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                             ObjectUtil.isEmpty(orderInfo.getMasterId()) || ObjectUtil.isNull(orderInfo.getMasterId()) ? orderInfo.getTableName() : orderInfo.getMasterId(),
                             orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                            "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0",
+                            "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance, orderInfo.getPayType(), "0",
                             detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
                     detailPO.setOutNumber(orderInfo.getOutNumber());
                     String printType = "退款单";
@@ -362,7 +361,7 @@ public class CloudPrinterService {
                 OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                         orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
                         orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                        "【POS-1】001", orderInfo.getOrderAmount().toPlainString(),
+                        "【POS-1】001", orderInfo.getOriginAmount().toPlainString(),
                         balance, (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()), "0",
                         detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() != null ? orderInfo.getDiscountAmount().toPlainString() : null, orderInfo.getDiscountRatio() != null ? orderInfo.getDiscountRatio().toPlainString() : null);
                 String printType = "结算单";
@@ -412,7 +411,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(), it.getPriceAmount().toPlainString(), remark);
                     detailList.add(detail);
 
                 });
@@ -428,7 +427,7 @@ public class CloudPrinterService {
 
                 if (ObjectUtil.isNotEmpty(detailList) && detailList.size() > 0) {
 //                                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList);
-                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId()) || ObjectUtil.isNull(orderInfo.getMasterId()) ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList, orderInfo.getRemark(), null, null);
+                    OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印", ObjectUtil.isEmpty(orderInfo.getMasterId()) || ObjectUtil.isNull(orderInfo.getMasterId()) ? orderInfo.getTableName() : orderInfo.getMasterId(), orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), "【POS-1】001", orderInfo.getOriginAmount().toPlainString(), balance, orderInfo.getPayType(), "0", detailList, orderInfo.getRemark(), null, null);
 
                     String printType = "退款单";
 
@@ -487,7 +486,7 @@ public class CloudPrinterService {
                 OrderDetailPO detailPO = new OrderDetailPO(shopInfo.getShopName(), "普通打印",
                         orderInfo.getOrderType().equals("miniapp") ? orderInfo.getTableName() : orderInfo.getMasterId(),
                         orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
-                        "【POS-1】001", orderInfo.getOrderAmount().toPlainString(),
+                        "【POS-1】001", orderInfo.getOriginAmount().toPlainString(),
                         balance, (ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
                         "0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount() == null ? null : orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio() == null ? null : orderInfo.getDiscountRatio().toPlainString());
                 String printType = "结算单";