diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index c48f05175..017377986 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -333,17 +333,16 @@ public class ShopCouponServiceImpl extends ServiceImpl list = productService.list(new QueryWrapper() .in(Product::getId, couponFoodIds).eq(Product::getIsDel, 0)); - log.info("优惠券商品列表:{}", list); +// log.info("优惠券商品列表:{}", list); if (CollUtil.isEmpty(list)) { continue; } - if (tbUserCouponVo.getType() == 2) { - tbUserCouponVo.setUseFoods(JSON.parseObject(JSON.toJSONString(list), new TypeReference<>() { - })); - - } else { + if (tbUserCouponVo.getType() == 1 || tbUserCouponVo.getType() == 3) { tbUserCouponVo.setThresholdFoods(JSON.parseObject(JSON.toJSONString(list), new TypeReference<>() { })); + } else { + tbUserCouponVo.setUseFoods(JSON.parseObject(JSON.toJSONString(list), new TypeReference<>() { + })); } String foods = list.stream().map(Product::getName).collect(Collectors.joining(",")); tbUserCouponVo.setFoods(foods);