From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 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 d3347a1..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
@@ -8,6 +8,7 @@
import com.dsh.account.service.RechargeRecordsService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.UserIntegralChangesService;
+import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
import com.dsh.account.util.ToolUtil;
@@ -20,8 +21,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.List;
+import java.util.Map;
/**
* 使用福利 控制器
@@ -49,10 +53,13 @@
private final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+ @Autowired
+ private PayMoneyUtil payMoneyUtil;
+
@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"),
@@ -307,12 +314,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<Goods>> pointsMallList(MallRequest request) {
-// try {
- System.out.println("======request========" + request);
return ResultUtil.success(tauService.queryAppUserIntegral(request));
-// }catch (Exception e){
-// return ResultUtil.runErr();
-// }
}
@@ -407,7 +409,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType) {
+ public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType) {
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if (null == userIdFormRedis) {
@@ -420,6 +422,60 @@
}
+
+
+ @ResponseBody
+ @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");
+ String trade_no = map.get("transaction_id");
+ String result = map.get("result");
+ ResultUtil resultUtil = tauService.paymentCouponCallback(code, trade_no);
+ if(resultUtil.getCode() == 200){
+ PrintWriter out = response.getWriter();
+ out.print(result);
+ out.flush();
+ out.close();
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/coupon/aliPaymentCouponCallback")
+ public void aliPaymentCouponCallback(HttpServletRequest request, HttpServletResponse response){
+ try {
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ if(null != map){
+ String code = map.get("out_trade_no");
+ String trade_no = map.get("trade_no");
+ ResultUtil resultUtil = tauService.paymentCouponCallback(code, trade_no);
+ if(resultUtil.getCode() == 200){
+ PrintWriter out = response.getWriter();
+ out.print("success");
+ out.flush();
+ out.close();
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+
+
+
/**
* 积分明细
*/
--
Gitblit v1.7.1