From 18a9f86a8c1fdb6c42c4212dcaa1de437f6f4861 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 15 十月 2025 14:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
index 217afee..d6b500f 100644
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -3,7 +3,11 @@
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
+import cn.lili.modules.lmk.domain.form.CustomizeTemplateForm;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
import cn.lili.modules.payment.kit.CashierSupport;
import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.entity.enums.PaymentClientEnum;
@@ -15,11 +19,14 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
/**
* 涔板绔�,鏀堕摱鍙版帴鍙�
@@ -37,12 +44,14 @@
private CashierSupport cashierSupport;
+
@ApiImplicitParams({
@ApiImplicitParam(name = "client", value = "瀹㈡埛绔被鍨�", paramType = "path", allowableValues = "PC,H5,WECHAT_MP,APP")
})
- @GetMapping(value = "/tradeDetail")
+ @PostMapping(value = "/tradeDetail")
@ApiOperation(value = "鑾峰彇鏀粯璇︽儏")
- public ResultMessage paymentParams(@Validated PayParam payParam) {
+ @Transactional(rollbackFor = Exception.class)
+ public ResultMessage paymentParams(@Validated @RequestBody PayParam payParam) {
CashierParam cashierParam = cashierSupport.cashierParam(payParam);
return ResultUtil.data(cashierParam);
}
--
Gitblit v1.8.0