From ed5bb107d0be2e008c5271ca1bad9654dc1377a8 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: Mon, 26 Aug 2024 15:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E6=8A=98?=
 =?UTF-8?q?=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/MemberController.java   | 3 ++-
 .../system/cashierservice/entity/po/OrderPo.java             | 5 +++++
 .../system/cashierservice/service/MemberService.java         | 2 ++
 .../system/cashierservice/service/PayService.java            | 2 +-
 src/main/resources/mapper/TbOrderInfoMapper.xml              | 4 +++-
 5 files changed, 13 insertions(+), 3 deletions(-)

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 2f5ce80..0161620 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
@@ -96,7 +96,8 @@ public class MemberController {
 //    public Result returnFlow(@RequestHeader("token") String token,
 //                             @RequestHeader("loginName") String loginName,
 //                             @RequestHeader("clientType") String clientType,
-//                             @RequestParam("flowId") String flowId
+//                             @RequestParam("flowId") String flowId,
+//                             @RequestParam("remark") String remark
 //    ){
 //
 //
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
index e5dadf1..b1f2ce9 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/po/OrderPo.java
@@ -28,4 +28,9 @@ public class OrderPo {
     private String remark;
 
 
+    private BigDecimal discountRatio;
+
+    private BigDecimal discountAmount;
+
+
 }
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 1744c58..92c1f85 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
@@ -701,4 +701,6 @@ public class MemberService {
 
 
 
+
+
 }
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 4ca5e06..f3c7581 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -895,7 +895,7 @@ public class PayService {
         orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount)?orderInfo.getOrderAmount():payAmount);
         orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount)?BigDecimal.ZERO:discountAmount);
         orderInfo.setStaffId(ObjectUtil.isEmpty(staff)?null:staff.getId());
-        orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount)?payAmount.divide(orderInfo.getOrderAmount()).setScale(2,BigDecimal.ROUND_DOWN):null);
+        orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount)?payAmount.divide(orderInfo.getOrderAmount(),2,RoundingMode.HALF_UP).setScale(2,RoundingMode.HALF_DOWN):null);
         orderInfo.setPayType("cash");
         orderInfo.setStatus("closed");
         orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index 7d233fd..007664d 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -78,7 +78,9 @@
         toi.out_number AS outNumber,
         toi.table_name AS tableName,
         toi.remark,
-        toi.master_id as masterId
+        toi.master_id as masterId,
+        toi.discount_ratio as discountRatio,
+        toi.discount_amount as discountAmount
 
 
         FROM