czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/annotation/LimitSubmit.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/LimitSubmitAspect.java
#	src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisConfig.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RedisUtils.java
#	src/main/resources/generator-mapper/generatorConfig.xml
This commit is contained in:
韩鹏辉
2024-06-19 16:46:27 +08:00
parent 50fa846cf1 90a8fd4a54
commit 5b97722699
4 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@@ -4,6 +4,7 @@ import com.chaozhanggui.system.cashierservice.annotation.LimitSubmit;
import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
import com.chaozhanggui.system.cashierservice.entity.dto.ReturnGroupOrderDto;
import com.chaozhanggui.system.cashierservice.service.PayService;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.IpUtil;
import lombok.extern.slf4j.Slf4j;
@@ -70,6 +71,7 @@ public class PayController {
* @param memberId
* @return
*/
@GetMapping("accountPay")
@LimitSubmit(key = "accountPay:%s")
public Result accountPay(@RequestHeader("token") String token,
@@ -94,6 +96,7 @@ public class PayController {
* @return
*/
@GetMapping("quickPay")
@LimitSubmit(key = "quickPay:%s")
public Result quickPay(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@@ -156,6 +159,7 @@ public class PayController {
* @return
*/
@GetMapping("memberScanPay")
@LimitSubmit(key = "memberScanPay:%s")
public Result memberScanPay(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@@ -176,6 +180,7 @@ public class PayController {
* @return
*/
@GetMapping("cashPay")
@LimitSubmit(key = "cashPay:%s")
public Result cashPay(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@@ -195,6 +200,7 @@ public class PayController {
* @return
*/
@GetMapping("bankPay")
@LimitSubmit(key = "bankPay:%s")
public Result bankPay(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@@ -205,6 +211,7 @@ public class PayController {
@RequestMapping("returnOrder")
@LimitSubmit(key = "returnOrder:%s")
public Result returnOrder(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@@ -226,4 +233,11 @@ public class PayController {
public Result returnOrder(@RequestBody ReturnGroupOrderDto param){
return payService.returnGroupOrder(param);
}
@RequestMapping("test")
@LimitSubmit(key = "testOrder:%s")
public Result testOrder( @RequestParam("orderId") String orderId){
return Result.success(CodeEnum.SUCCESS);
}
}