From 4b43fa079970e67c9d7d316c2cd3be754bec9b22 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期五, 04 七月 2025 14:07:18 +0800
Subject: [PATCH] 修改支付接口

---
 src/main/java/com/lunhan/water/host/controller/pay/PaymentServicesController.java |    4 +---
 src/main/java/com/lunhan/water/service/PaymentServices.java                       |   12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lunhan/water/host/controller/pay/PaymentServicesController.java b/src/main/java/com/lunhan/water/host/controller/pay/PaymentServicesController.java
index a6a0f3b..439b4ed 100644
--- a/src/main/java/com/lunhan/water/host/controller/pay/PaymentServicesController.java
+++ b/src/main/java/com/lunhan/water/host/controller/pay/PaymentServicesController.java
@@ -49,10 +49,8 @@
         ParameterValidator validator = new ParameterValidator()
                 // 必须是枚举值
                 .addMustEnum(ParameterUtil.named("业务类型"), request.getBusinessType(), EBusinessType.class)
-                // 必须大于0
-                .addGreater(ParameterUtil.named("交易金额"), request.getTradeAmount(), BigDecimal.ZERO)
                 //水表编号不能为空
-                .addNotNullOrEmpty(ParameterUtil.named("支付token"), request.getPayToken());
+                //.addNotNullOrEmpty(ParameterUtil.named("支付token"), request.getPayToken());
                 ;
         ParameterValidateResult result = validator.validate();
         if (result.getIsFiled()) {
diff --git a/src/main/java/com/lunhan/water/service/PaymentServices.java b/src/main/java/com/lunhan/water/service/PaymentServices.java
index 11b0c75..e9f00f8 100644
--- a/src/main/java/com/lunhan/water/service/PaymentServices.java
+++ b/src/main/java/com/lunhan/water/service/PaymentServices.java
@@ -75,12 +75,12 @@
     @Transactional(rollbackFor = Exception.class)
     public ExecutedResult<Map<String, Object>> weiXinPay(LoginUserDTO loginUser, ReqCreatePay request) {
         //判断token是否存在,如果不存在,说明重复提交订单
-        String redisToken = redisTemplate.opsForValue().get(request.getPayToken()).toString();
-        if (StringUtil.isNullOrEmpty(redisToken)) {
-            throw new RuntimeException("请勿重复提交充值订单!");
-        }
-        //删除token
-        redisTemplate.delete(request.getPayToken());
+//        String redisToken = redisTemplate.opsForValue().get(request.getPayToken()).toString();
+//        if (StringUtil.isNullOrEmpty(redisToken)) {
+//            throw new RuntimeException("请勿重复提交充值订单!");
+//        }
+//        //删除token
+//        redisTemplate.delete(request.getPayToken());
 
         EBusinessType type = EBusinessType.getByValue(request.getBusinessType());
         if (Objects.isNull(type)) {

--
Gitblit v1.9.3