|
|
|
@@ -1159,9 +1159,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
//取交集 |
|
|
|
merchantProductIds.retainAll(couponIds); |
|
|
|
} |
|
|
|
if(merchantProductIds.size() > 0){ |
|
|
|
wxCouponOrder.setCouponIds(merchantProductIds); |
|
|
|
if(merchantProductIds.size() <= 0){ |
|
|
|
wxCouponOrder.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
wxCouponOrder.setCouponIds(merchantProductIds); |
|
|
|
}else { |
|
|
|
if (null != couponIds) { |
|
|
|
wxCouponOrder.setCouponIds(couponIds); |
|
|
|
|