From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 46b5255..499eada 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -59,7 +59,7 @@
 
     @ResponseBody
     @PostMapping("/api/useBenefit/indexOfAppUser")
-    @ApiOperation(value = "福利主页", tags = {"APP-使用福利"})
+    @ApiOperation(value = "福利主页【2.0】", tags = {"APP-使用福利"})
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
             @ApiImplicitParam(name = "lat", value = "经度", dataType = "string"),
@@ -428,6 +428,7 @@
     @PostMapping("/base/coupon/weChatPaymentCouponCallback")
     public void weChatPaymentCouponCallback(HttpServletRequest request, HttpServletResponse response){
         try {
+            System.err.println("进入回调");
             Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
             if(null != map){
                 String code = map.get("out_trade_no");

--
Gitblit v1.7.1