From 15e826ddc11e7c5b842f6021f8ad6f7020864e0a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Oct 2025 15:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=B8=E7=8E=8B=E9=A4=90=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=20=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/controller/VipPayController.java    | 4 ----
 .../service/impl/MkConsumeCashbackRecordServiceImpl.java  | 3 +++
 .../java/com/czg/service/order/dto/VipPayParamDTO.java    | 8 +++-----
 .../czg/service/order/service/impl/PayServiceImpl.java    | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java
index 38415c67..801de4c1 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java
@@ -1,12 +1,8 @@
 package com.czg.controller;
 
 import com.czg.annotation.Debounce;
-import com.czg.annotation.SaStaffCheckPermission;
 import com.czg.entity.resp.CzgBaseResp;
-import com.czg.order.entity.OrderInfo;
 import com.czg.resp.CzgResult;
-import com.czg.sa.StpKit;
-import com.czg.service.order.dto.RechargeDTO;
 import com.czg.service.order.dto.VipMemberPayParamDTO;
 import com.czg.service.order.dto.VipPayParamDTO;
 import com.czg.service.order.dto.VipRefundDTO;
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackRecordServiceImpl.java
index 5632b2af..7e93a08a 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackRecordServiceImpl.java
@@ -36,7 +36,10 @@ public class MkConsumeCashbackRecordServiceImpl extends ServiceImpl<MkConsumeCas
                 .leftJoin(ShopInfo.class).on(ShopInfo::getId, MkConsumeCashbackRecord::getShopId)
                 .leftJoin(OrderInfo.class).on(OrderInfo::getId, MkConsumeCashbackRecord::getOrderId)
                 .leftJoin(ShopUser.class).on(ShopUser::getId, MkConsumeCashbackRecord::getShopUserId)
+                .le(MkConsumeCashbackRecord::getCreateTime, endTime)
+                .ge(MkConsumeCashbackRecord::getCreateTime, startTime)
                 .eq(MkConsumeCashbackRecord::getShopId, shopId);
+
         QueryWrapper totalQuery = new QueryWrapper()
                 .leftJoin(ShopInfo.class).on(ShopInfo::getId, MkConsumeCashbackRecord::getShopId)
                 .leftJoin(OrderInfo.class).on(OrderInfo::getId, MkConsumeCashbackRecord::getOrderId)
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
index e47ee429..ffae24b6 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
@@ -1,5 +1,6 @@
 package com.czg.service.order.dto;
 
+import com.czg.order.dto.CheckOrderPay;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -52,11 +53,8 @@ public class VipPayParamDTO {
     private String authCode;
     private String pwd;
     private Long rechargeDetailId;
-    private BigDecimal orderAmount;
-    /**
-     * 订单原金额（包含打包费+餐位费） 不含折扣价格
-     */
-    private BigDecimal originAmount;
+    //霸王餐使用
+    private CheckOrderPay checkOrderPay;
 
 
 
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index eb76485d..1870f6d0 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -146,8 +146,8 @@ public class PayServiceImpl implements PayService {
             if (!freeConfig.getEnable()) {
                 throw new CzgException("该店铺未启用霸王餐");
             }
-
-            CheckOrderPay checkOrderPay = BeanUtil.copyProperties(payParam, CheckOrderPay.class);
+            CheckOrderPay checkOrderPay = payParam.getCheckOrderPay();
+//            CheckOrderPay checkOrderPay = BeanUtil.copyProperties(payParam, CheckOrderPay.class);
             OrderInfo orderInfo = orderInfoService.checkOrderPay(checkOrderPay.setFreeDine(true).setWithCoupon(freeConfig.getWithCoupon()).setWithPoints(freeConfig.getWithPoints()));
             payParam.setAmount(orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(freeConfig.getRechargeTimes())));
             return true;