bug修改

liujie

2 天以前 ea1868377e45a89c552021944fd42ed24ad45ae1

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

@@ -852,7 +852,8 @@
        }
        List<UserCoupon> userCoupons = new ArrayList<>();
        if (ids.size() > 0) {
            userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
            userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids)
                    .ne("status",3));
        }
        if (pointsMerchandises.size() > 0) {
            for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
@@ -1110,7 +1111,7 @@
        PointDetailsVo detailsVo = new PointDetailsVo();

        if (speMercharsId.toString().contains("-1")){
            // 会员门票
            // 会员优惠券
            VipDetail vipDetail = vipDetailService.getById(Math.abs(speMercharsId));
            if (vipDetail.getType()==1){
                Coupon coupon = iCouponService.getById(vipDetail.getCouponId());