|
|
|
@@ -1010,8 +1010,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
retMerchantIdList.add(-999L); |
|
|
|
return retMerchantIdList; |
|
|
|
} |
|
|
|
retMerchantIdList.retainAll(buildMerchantIdList); |
|
|
|
isConditiondQquery = true; |
|
|
|
if(isConditiondQquery){ |
|
|
|
retMerchantIdList.retainAll(buildMerchantIdList); |
|
|
|
}else{ |
|
|
|
retMerchantIdList.addAll(buildMerchantIdList); |
|
|
|
isConditiondQquery = true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (isConditiondQquery) { |
|
|
|
|