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());