Authored by TANLING

fix

... ... @@ -62,8 +62,8 @@
SELECT COUNT(*) cnt FROM coupon cpn
LEFT JOIN `coupon_display` cdp ON cpn.`id` = cdp.coupon_id
WHERE cpn.status = 1
AND cpn.id IN
(<include refid="query_prd_limit"/> )
<!--AND cpn.id IN-->
<!--(<include refid="query_prd_limit"/> )-->
AND cpn.`coupon_num` > cpn.`send_num`
AND cdp.position_type= #{positionType} AND cdp.`visibility`=1
AND (#{currentTime} <![CDATA[ < ]]> `end_time` OR #{currentTime} <![CDATA[ < ]]> `receive_end_time`)
... ...
... ... @@ -203,6 +203,7 @@ public class CollectiveCouponService {
condition.setUseLimitType(Byte.valueOf(couponUseLimitTypeEnum.getLimitType()));
List<Coupon> top = couponViewMapper.selectByAssociatedPrdNCouponType(condition);
logger.info("getCouponTopListOfPrdDetail condition {} top {}",condition, top);
datas = productLimitValueFilter.filter(datas, req.getProductId());
if (CollectionUtils.isNotEmpty(top)){
datas.add(top.get(0));
}
... ... @@ -217,6 +218,7 @@ public class CollectiveCouponService {
}
condition.setCouponType(couponTypeEnum.getCode());
List<Coupon> shippingTop = couponViewMapper.selectByAssociatedPrdNCouponType(condition);
datas = productLimitValueFilter.filter(datas, req.getProductId());
logger.info("getCouponTopListOfPrdDetail condition {} top {}",condition, shippingTop);
if (CollectionUtils.isNotEmpty(shippingTop)){
datas.add(shippingTop.get(0));
... ... @@ -225,7 +227,7 @@ public class CollectiveCouponService {
}
}
return productLimitValueFilter.filter(datas, req.getProductId());
return datas;
}
... ...