11.7

nickchange

2023-11-17 a9564eae9f0169ca39329b2f14a8f13d13358a0a

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

@@ -294,6 +294,7 @@
            cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
        }

        if (cIds.size()>0) {

        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
                .eq("state",1)
@@ -310,6 +311,8 @@
                commodity.add(integralCommodity);
            }
        }
        }

        System.out.println(commodity);
        return commodity;
    }
@@ -786,7 +789,10 @@
                ids.add(coupon.getId());
            }
        }
        List<UserCoupon> userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId",ids));
        List<UserCoupon> userCoupons = new ArrayList<>();
        if (ids.size()>0) {
           userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
        }
        if (pointsMerchandises.size() > 0 ){
            for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
                PointsMerchandise merchandise = pmdsService.getById(pointsMerchandise.getPointsMerchandiseId());
@@ -985,6 +991,7 @@
            PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
            // 2.0
            detailsVo.setCardType(pmdsServiceById.getCardType());
            detailsVo.setExchangeAddrType(pmdsServiceById.getUseScope());
            detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());
            detailsVo.setGoodType(pmdsServiceById.getType());
            if (pmdsServiceById.getRedemptionMethod() == 1){
@@ -1162,8 +1169,9 @@
                    detailsVo.setBelongs(pmdsServiceById.getProvince()+pmdsServiceById.getCity());
                    break;
                case 3:
                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
                    detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
//                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
//                    detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
//                    detailsVo.setBelongs("---------------");
                    break;
                default:
                    break;