修改bug

puzhibing

2024-03-21 03bc927fdb8469c1417f75c2a25a06a0d6b1ae61

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

@@ -326,7 +326,8 @@
        QueryWrapper<PointsMerchandise> wrapper = new QueryWrapper<PointsMerchandise>()
                .eq("state", 1)
                .eq("shelves", 1)
                .gt("endTime", new Date());
                .gt("endTime", new Date())
                .eq("status", 1);
        if(cIds.size() > 0){
            wrapper.in("id", cIds);
        }
@@ -337,7 +338,17 @@
                integralCommodity.setCommodityId(merchandise.getId());
                integralCommodity.setCommodityImg(merchandise.getCover());
                integralCommodity.setCommodityName(merchandise.getName());
                if(merchandise.getRedemptionMethod() == 1){
                    integralCommodity.setIntegral(merchandise.getIntegral());
                }
                if(merchandise.getRedemptionMethod() == 2){
                integralCommodity.setCommodityPrice(merchandise.getPrice());
                    integralCommodity.setIntegral(merchandise.getIntegral());
                }
                if(merchandise.getRedemptionMethod() == 3){
                    integralCommodity.setCommodityPrice(merchandise.getPrice());
                }
                integralCommodity.setRedemptionMethod(merchandise.getRedemptionMethod());
                integralCommodity.setGoodsType(merchandise.getType());
                integralCommodity.setSort(merchandise.getSort());
                commodity.add(integralCommodity);
@@ -350,7 +361,8 @@
            storeCoupons.add(couponStore.getCouponId());
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        QueryWrapper<Coupon> queryWrapper = new QueryWrapper<Coupon>().eq("state", 1).gt("endTime", sdf.format(new Date()));
        QueryWrapper<Coupon> queryWrapper = new QueryWrapper<Coupon>()
                .eq("state", 1).gt("endTime", sdf.format(new Date()));
        if(storeCoupons.size() > 0){
            queryWrapper.in("id", storeCoupons);
        }
@@ -361,16 +373,18 @@
            integralCommodity.setCommodityId(coupon.getId());
            integralCommodity.setCommodityImg(coupon.getCover());
            integralCommodity.setCommodityName(coupon.getName());
            integralCommodity.setCommodityPrice(coupon.getIntegral());
            integralCommodity.setGoodsType(coupon.getType());
//            integralCommodity.setSort(coupon.getSort());
                if(coupon.getRedemptionMethod() == 1){
                    integralCommodity.setIntegral(coupon.getIntegral().intValue());
                }
                if(coupon.getRedemptionMethod() == 2){
                    integralCommodity.setCommodityPrice(coupon.getCash());
                    integralCommodity.setIntegral(coupon.getIntegral().intValue());
                }
                integralCommodity.setRedemptionMethod(coupon.getRedemptionMethod());
                integralCommodity.setGoodsType(4);
            commodity.add(integralCommodity);
            }

        }


        System.out.println(commodity);
        return commodity;
    }

@@ -396,7 +410,11 @@

        list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
                .eq("state", 1)
                .eq("shelves", 1).le("startTime", new Date()).ge("endTime", new Date()));
                .eq("shelves", 1)
                .le("startTime", new Date())
                .ge("endTime", new Date())
                .eq("status", 1)
        );
        if (list.size() > 0) {
            Iterator<PointsMerchandise> iterator = list.iterator();
            while (iterator.hasNext()) {