会员支付相关

无关风月

11 小时以前 28a60b0977d66b75fb9a2c3306840bc18ec271f6

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -100,6 +100,8 @@

    @Resource
    private StudentClient studentClient;
    @Resource
    private PointsMerchandiseService pointsMerchandiseService;



@@ -107,11 +109,12 @@
    @PostMapping("/base/coupon/vipDetail")
    @ResponseBody
    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())
@@ -133,7 +136,16 @@
                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;