From 569f9c5d163068b7039c1748e6f0cd65d4fde186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 15:31:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=93=81?=
 =?UTF-8?q?=E6=94=B9=E4=BB=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrderController.java           |  2 ++
 .../cashierservice/entity/TbOrderDetail.java  |  4 ++++
 .../entity/dto/WaitCallDTO.java               | 19 +++++++++++++++++++
 .../cashierservice/service/OrderService.java  |  2 ++
 4 files changed, 27 insertions(+)
 create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/WaitCallDTO.java

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index de80582..0085da8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -68,6 +68,8 @@ public class OrderController {
         return Result.success(CodeEnum.SUCCESS, orderService.updatePrice(updatePriceDTO));
     }
 
+
+
     @GetMapping("/queryCart")
     public Result queryCart(@RequestHeader("token") String token,
                             @RequestHeader("loginName") String loginName,
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
index 13d5e1d..e712681 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
@@ -59,5 +59,9 @@ public class TbOrderDetail implements Serializable {
     private BigDecimal returnAmount;
     private Integer isPrint;
 
+    private BigDecimal discountSaleAmount;
+    private String discountSaleNote;
+
+
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/WaitCallDTO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/WaitCallDTO.java
new file mode 100644
index 0000000..89703ed
--- /dev/null
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/WaitCallDTO.java
@@ -0,0 +1,19 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WaitCallDTO {
+    @NotNull
+    private Integer shopId;
+    @NotNull
+    private Integer isWaitCall;
+    private Integer orderId;
+    private String code;
+    @NotBlank
+    private String useType;
+    private String tableId;
+}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index b0ff0f7..88c0067 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -934,6 +934,8 @@ public class OrderService {
                 saleAmount = saleAmount.add(shopInfo.getTableFee());
             }
 
+            orderDetail.setDiscountSaleNote(cashierCart.getDiscountSaleNote());
+            orderDetail.setDiscountSaleAmount(cashierCart.getDiscountSaleAmount());
             orderDetail.setIsPrint(cashierCart.getIsPrint());
             orderDetail.setMemberPrice(cashierCart.getMemberPrice());
             orderDetail.setCreateTime(new Date());