From 0acab5ce5c116cb26605ac8b0e6bf00e8b109209 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, 25 Sep 2025 14:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/VipPayController.java  |  4 ++--
 .../com/czg/service/order/dto/RechargeDTO.java     | 14 +++++++++++++-
 .../com/czg/service/order/dto/VipPayParamDTO.java  |  2 ++
 .../com/czg/service/order/service/PayService.java  |  2 +-
 .../service/order/service/impl/PayServiceImpl.java |  4 ++--
 5 files changed, 20 insertions(+), 6 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 c178e659..74c288b9 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
@@ -80,8 +80,8 @@ public class VipPayController {
      */
     @PostMapping("/recharge")
     @Debounce(value = "#payParam.shopUserId")
-    public CzgResult<Map<String, Object>> recharge(HttpServletRequest request, @Validated @RequestBody RechargeDTO rechargeDTO) {
-        if (rechargeDTO.getRechargeDetailId() == null && rechargeDTO.getMoney() == null) {
+    public CzgResult<Map<String, Object>> recharge(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO rechargeDTO) {
+        if (rechargeDTO.getRechargeDetailId() == null && rechargeDTO.getAmount() == null) {
             return CzgResult.failure("充值失败 未指定充值金额");
         }
         rechargeDTO.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/RechargeDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/RechargeDTO.java
index 02d74924..668bd569 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/RechargeDTO.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/RechargeDTO.java
@@ -23,7 +23,9 @@ public class RechargeDTO {
      */
     private Long rechargeDetailId;
     @DecimalMin("0.01")
-    private BigDecimal money;
+    private BigDecimal amount;
+    private Integer allPack;
+
     /**
      * 跳转地址
      */
@@ -39,6 +41,16 @@ public class RechargeDTO {
 
     private String payType;
 
+    private Long orderId;
+    private Integer seatNum;
+    /**
+     * 用户端 使用 全打包 或者 全不打包
+     */
+    private Integer userAllPack;
+
+    public boolean isAllPack() {
+        return allPack != null && allPack == 1;
+    }
 
 
 }
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 aadea133..ffcb1cf0 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
@@ -51,9 +51,11 @@ public class VipPayParamDTO {
      */
     private String authCode;
     private String pwd;
+    private Long rechargeDetailId;
 
 
     public boolean isAllPack() {
         return allPack != null && allPack == 1;
     }
+
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
index 63ae2ab5..2afb4600 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
@@ -120,5 +120,5 @@ public interface PayService {
 
     CzgResult<Map<String, Object>> ltPayMember(String clientIP, VipMemberPayParamDTO payParam);
 
-    CzgResult<Map<String, Object>> recharge(String clientIP, RechargeDTO rechargeDTO, Long userId);
+    CzgResult<Map<String, Object>> recharge(String clientIP, VipPayParamDTO rechargeDTO, Long userId);
 }
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 6352af30..c0716f5f 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
@@ -424,7 +424,7 @@ public class PayServiceImpl implements PayService {
     }
 
     @Override
-    public CzgResult<Map<String, Object>> recharge(String clientIP, RechargeDTO rechargeDTO, Long userId) {
+    public CzgResult<Map<String, Object>> recharge(String clientIP, VipPayParamDTO rechargeDTO, Long userId) {
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, rechargeDTO.getShopId())
                 .eq(ShopUser::getUserId, userId));
         AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在");
@@ -433,7 +433,7 @@ public class PayServiceImpl implements PayService {
             throw new CzgException("未开启自定义充值金额");
         }
 
-        BigDecimal amount = shopRechargeService.checkRecharge(StpKit.USER.getHeadId(), rechargeDTO.getShopId(), userId, rechargeDTO.getRechargeDetailId(), rechargeDTO.getMoney());
+        BigDecimal amount = shopRechargeService.checkRecharge(StpKit.USER.getHeadId(), rechargeDTO.getShopId(), userId, rechargeDTO.getRechargeDetailId(), rechargeDTO.getAmount());
         String payOrderNo = rechargeDTO.getPlatformType() + IdUtil.getSnowflakeNextId();
         initOrderPayment(new OrderPayment(rechargeDTO.getShopId(), shopUser.getId(), "memberIn", payOrderNo,
                 "", amount, rechargeDTO.getRechargeDetailId()));