From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java
index 84b2e98..1872c94 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CouponController.java
@@ -77,15 +77,16 @@
@ApiOperation(value = "删除优惠券", tags = {"用户端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "优惠券id", name = "id", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil delMyCoupon(Integer id, HttpServletRequest request){
+ public ResultUtil delMyCoupon(Integer id, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return userCouponRecordService.delMyCoupon(id, uid);
+ return userCouponRecordService.delMyCoupon(id, uid, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -106,15 +107,16 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "优惠券id", name = "id", required = true, dataType = "int"),
@ApiImplicitParam(value = "赠送用户id", name = "userId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言类型（1=简体中文，2=英语，3=法语）", name = "language", required = false, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil handselCoupon(Integer id, Integer userId, HttpServletRequest request){
+ public ResultUtil handselCoupon(Integer id, Integer userId, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return userCouponRecordService.handselCoupon(id, uid, userId);
+ return userCouponRecordService.handselCoupon(id, uid, userId, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1