From 4c9035836c18886883d3f69d8443c53d15b068fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 22 八月 2025 14:39:53 +0800
Subject: [PATCH] 会员支付相关
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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 fc7cf21..e894f41 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
@@ -20,6 +20,7 @@
import com.dsh.activity.feignclient.other.OperatorClient;
import com.dsh.activity.feignclient.other.RegionClient;
import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.VipClient;
import com.dsh.activity.feignclient.other.model.CityDataAndProvinceDataVo;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.feignclient.other.model.StoreInfoDto;
@@ -27,10 +28,8 @@
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.CouponRecordQuery;
import com.dsh.activity.model.VipDetailVO;
-import com.dsh.activity.model.request.CommodityRequest;
-import com.dsh.activity.model.request.CouponDataVo;
-import com.dsh.activity.model.request.CouponPackageReq;
-import com.dsh.activity.model.request.VipDetailDto;
+import com.dsh.activity.model.VipPaymentVO;
+import com.dsh.activity.model.request.*;
import com.dsh.activity.model.response.CouponPackageResp;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
@@ -70,9 +69,12 @@
@Autowired
private TokenUtil tokenUtil;
+ @Autowired
+ private VipClient vipClient;
@Autowired
private UserCouponService ucService;
+
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
@@ -102,18 +104,21 @@
@Resource
private StudentClient studentClient;
+ @Resource
+ private PointsMerchandiseService pointsMerchandiseService;
@PostMapping("/base/coupon/vipDetail")
@ResponseBody
- List<VipDetailVO> vipDetail(VipDetailDto vipDetailDto){
+ List<VipDetailVO> vipDetail(@RequestBody VipDetailDto vipDetailDto){
+ List<PointsMerchandise> pointsMerchandiseList = pointsMerchandiseService.list();
List<VipDetailVO> vipDetailVOS = new ArrayList<>();
List<VipDetail> list = vipDetailService.lambdaQuery()
- .in(!vipDetailDto.getVipIds().isEmpty(), VipDetail::getVipId, vipDetailDto.getVipIds())
- .in(!vipDetailDto.getUserIds().isEmpty(), VipDetail::getAppUserId, vipDetailDto.getUserIds())
- .in(!vipDetailDto.getStoreIds().isEmpty(), VipDetail::getUseStoreId, vipDetailDto.getStoreIds())
+ .in(vipDetailDto.getVipIds()!=null&&!vipDetailDto.getVipIds().isEmpty(), VipDetail::getVipId, vipDetailDto.getVipIds())
+ .in(vipDetailDto.getUserIds()!=null&&!vipDetailDto.getUserIds().isEmpty(), VipDetail::getAppUserId, vipDetailDto.getUserIds())
+ .in(vipDetailDto.getStoreIds()!=null&&!vipDetailDto.getStoreIds().isEmpty(), VipDetail::getUseStoreId, vipDetailDto.getStoreIds())
.ge(StringUtils.hasLength(vipDetailDto.getStartTime()), VipDetail::getInsertTime, vipDetailDto.getStartTime())
.le(StringUtils.hasLength(vipDetailDto.getEndTime()), VipDetail::getInsertTime, vipDetailDto.getEndTime())
.ge(StringUtils.hasLength(vipDetailDto.getUseStartTime()), VipDetail::getUseTime, vipDetailDto.getUseStartTime())
@@ -135,12 +140,21 @@
if (coupon!=null){
vipDetailVO.setTicketName(coupon.getName());
vipDetailVO.setGoodsName(coupon.getName());
+ if (coupon.getType()==4){
+ // 查询抵扣商品
+ PointsMerchandise pointsMerchandise1 = pointsMerchandiseList.stream().filter(pointsMerchandise -> pointsMerchandise.getId().equals(coupon.getGoodsId()))
+ .findFirst().orElse(null);
+ if (pointsMerchandise1 != null){
+ vipDetailVO.setGoodsName(pointsMerchandise1.getName());
+ }
+ }
}
- }
+ }
}
return vipDetailVOS;
}
+
/**
* 查询注册赠送优惠券 判断当前优惠券限领数量
@@ -185,24 +199,45 @@
@PostMapping("/api/coupon/queryCouponList")
@ApiOperation(value = "获取优惠券列表", tags = {"APP-成为会员", ""})
@ApiImplicitParams({
- @ApiImplicitParam(value = "1=积分购买，2=注册赠送", name = "distributionMethod", dataType = "int", required = true),
+ @ApiImplicitParam(value = "vipId", name = "vipId", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CouponListVo>> queryCouponList(Integer distributionMethod) {
- if (null == distributionMethod) {
- return ResultUtil.paranErr("distributionMethod");
+ public ResultUtil<VipCouponTicketListResp> queryCouponList(Integer vipId) {
+ if (null == vipId) {
+ return ResultUtil.paranErr("vipId");
}
+ VipCouponTicketListResp vipCouponTicketListResp = new VipCouponTicketListResp();
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
}
- List<CouponListVo> listVos = couponService.queryCouponList(uid, distributionMethod);
- return ResultUtil.success(listVos);
+ List<Vip> vips = vipClient.listAll();
+ Vip vip = vips.stream().filter(e -> e.getId().equals(vipId)).findFirst().orElse(null);
+ if (vip!=null){
+ List<CouponVipResp> couponVipResps = new ArrayList<>();
+ List<TicketVipResp> ticketVipResps = new ArrayList<>();
+ List<CouponVipResp> couponList = vip.getCouponList();
+ for (CouponVipResp couponVipResp : couponList) {
+ for (Integer i = 0; i < couponVipResp.getCount(); i++) {
+ couponVipResps.add(couponVipResp);
+ }
+ }
+ List<TicketVipResp> ticketList = vip.getTicketList();
+ for (TicketVipResp ticketVipResp : ticketList) {
+ for (Integer i = 0; i < ticketVipResp.getCount(); i++) {
+ ticketVipResps.add(ticketVipResp);
+ }
+ }
+ vipCouponTicketListResp.setCouponVipRespList(couponVipResps);
+ vipCouponTicketListResp.setTicketVipRespList(ticketVipResps);
+ return ResultUtil.success(vipCouponTicketListResp);
+ }
} catch (Exception e) {
e.printStackTrace();
return ResultUtil.success();
}
+ return ResultUtil.success();
}
@@ -884,7 +919,12 @@
List<CouponCity> list = cityService.list(new LambdaQueryWrapper<CouponCity>());
return list;
}
-
+ @ResponseBody
+ @PostMapping("/base/coupon/queryAllPointGoods")
+ public List<PointsMerchandise> queryAllPointGoods(){
+ List<PointsMerchandise> pointsMerchandiseList = pointsMerchandiseService.list();
+ return pointsMerchandiseList;
+ }
@ResponseBody
@PostMapping("/base/coupon/queryStore")
public List<Integer> queryStore(@RequestBody Integer id) {
--
Gitblit v1.7.1