From 2ae1c473221cdb369d787378be8c1bb5e0f60757 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 18 Jul 2024 16:11:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BA=BF=E4=B8=8B=E9=80=80=E6=AC=BE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 45047a8..d7fb66d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -784,6 +784,9 @@ public class PayService {
         String masterId = orderInfo.getMasterId();
         String payType = orderInfo.getPayType();
         String orderNo = generateReturnOrderNumber();
+        if (!isOnline) {
+            orderNo = "XX" + orderNo;
+        }
         BigDecimal orderAmount = orderInfo.getPayAmount();
 
 
@@ -830,7 +833,8 @@ public class PayService {
 //                totalAmount = totalAmount.add(it.getPriceAmount());
                 totalAmount = totalAmount.add(it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN).multiply(new BigDecimal(map1.get(it.getId()))));
                 saleAmount = saleAmount.add(it.getPrice());
-                payAmount = payAmount.add(it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN).multiply(new BigDecimal(map1.get(it.getId()))));
+                payAmount = payAmount.add(it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN)
+                        .multiply(new BigDecimal(map1.get(it.getId()))));
 //                payAmount=payAmount.add(it.getPriceAmount());
                 packAMount = packAMount.add(it.getPackAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN).multiply(new BigDecimal(map1.get(it.getId()))));