From 631a5aa09e0147ca81fffcb1434e57b1cd1ba6f6 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 09 八月 2023 09:34:53 +0800
Subject: [PATCH] app端口:积分变动记录增加变动类型字段，代码同步更新；积分兑换操作的数量校验功能完善
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 92 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 9 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index b5ebd02..20c0fd9 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -1,10 +1,14 @@
package com.dsh.activity.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.Coupon;
+import com.dsh.activity.entity.CouponStore;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
+import com.dsh.activity.feignclient.model.QueryUserCouponByIdAndUserId;
import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.service.CouponStoreService;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
import com.dsh.activity.util.ResultUtil;
@@ -29,9 +33,6 @@
public class UserCouponController {
@Autowired
- private UserCouponService uconService;
-
- @Autowired
private ICouponService cService;
@Autowired
@@ -41,16 +42,20 @@
private UserCouponService userCouponService;
+ @Autowired
+ private CouponStoreService csServie;
+
+
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId){
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId){
List<CouponStuAvailableVo> availableVos = new ArrayList<>();
- List<UserCoupon> list = uconService.list(new QueryWrapper<UserCoupon>()
+ List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>()
.eq("userId", appUserId)
.eq("status",1));
if (list.size() > 0){
@@ -84,6 +89,11 @@
return availableVos;
}
+ @PostMapping("/base/userConpon/queryCouponRules")
+ public Map<String,Object> getCouponRules(@RequestBody Integer couponId){
+ return cService.queryConponRuleOfJson(couponId);
+ }
+
@ResponseBody
@@ -96,7 +106,7 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CouponListVo>> queryAvailableCouponList(@RequestBody Integer coursePackageId, @RequestBody Double price, @RequestBody String lon, @RequestBody String lat){
+ public ResultUtil<List<CouponListVo>> queryAvailableCouponList(Integer coursePackageId, Double price, String lon, String lat){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -111,6 +121,35 @@
}
+
+
+ @ResponseBody
+ @PostMapping("/api/coupon/querySiteCouponList")
+ @ApiOperation(value = "获取场地支付页面可用优惠券列表", tags = {"APP-预约场地", ""})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "场地id", name = "siteId", dataType = "int", required = true),
+ @ApiImplicitParam(value = "支付金额", name = "price", dataType = "double", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = true),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<CouponListVo>> querySiteCouponList(Integer siteId, Double price, String lon, String lat){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ List<CouponListVo> listVos = userCouponService.querySiteCouponList(uid, siteId, price, lon, lat);
+ return ResultUtil.success(listVos);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
/**
* 根据id获取用户优惠券数据
* @param id
@@ -118,13 +157,48 @@
*/
@ResponseBody
@PostMapping("/userCoupon/queryUserCouponById")
- public UserCoupon queryUserCouponById(@RequestBody Long id){
+ public UserCoupon queryUserCouponById(@RequestBody QueryUserCouponByIdAndUserId userCouponByIdAndUserId){
try {
- UserCoupon userCoupon = userCouponService.getById(id);
+ UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getCouponId,userCouponByIdAndUserId.getId()).eq(UserCoupon::getUserId,userCouponByIdAndUserId.getUserId()));
return userCoupon;
}catch (Exception e){
e.printStackTrace();
return null;
}
}
+
+
+ /**
+ * 修改优惠券数据
+ * @param userCoupon
+ */
+ @ResponseBody
+ @PostMapping("/userCoupon/updateUserCoupon")
+ public void updateUserCoupon(@RequestBody UserCoupon userCoupon){
+ try {
+ userCouponService.updateById(userCoupon);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+ @PostMapping("/userCoupon/queryCouponOfStore")
+ public List<Integer> getCouponStoreIds(@RequestBody Integer couponId){
+ try {
+ List<Integer> storeIds = new ArrayList<>();
+ List<CouponStore> list = csServie.list(new QueryWrapper<CouponStore>()
+ .eq("couponId",couponId));
+ if (list.size() > 0 ){
+ storeIds = list.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ }
+ return storeIds;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
}
--
Gitblit v1.7.1