From 0be58dbf7774fef98ddac83c3f454b49c6d5a6c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:18:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 6b622ca..c1fceaf 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -2,7 +2,10 @@
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.model.request.CouponPackageReq;
+import com.dsh.activity.model.response.CouponPackageResp;
import com.dsh.activity.service.ICouponService;
+import com.dsh.activity.service.UserCouponService;
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
import io.swagger.annotations.ApiImplicitParam;
@@ -26,6 +29,9 @@
@Autowired
private TokenUtil tokenUtil;
+
+ @Autowired
+ private UserCouponService ucService;
@@ -71,4 +77,30 @@
return null;
}
}
+
+
+ /**
+ * 我的券包列表
+ * @param req
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/api/coupon/queryCouponPackage")
+ @ApiOperation(value = "我的券包列表", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<CouponPackageResp>> queryAppuserCouponList( CouponPackageReq req){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(ucService.queryCouponPackagesList(uid, req));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.success();
+ }
+ }
+
}
--
Gitblit v1.7.1