fix

mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

@@ -1084,7 +1084,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
 							.eq(WxCouponSend::getTenantId, mallTenantId)
 							.in(!CollectionUtils.isEmpty(couponIdList), WxCouponSend::getCouponId, couponIdList));
 					if (null != couponSends) {
-						List<Long> sendMerchantIds = couponSends.stream().filter(x -> StringUtils.isNotBlank(x.getConditions())).map(x -> {
+						List<Long> sendMerchantIds = couponSends.stream().filter(x -> null!= x && StringUtils.isNotBlank(x.getConditions())).map(x -> {
 							JSONObject jsonObject = new JSONObject();
 							try {
 								jsonObject = JSONObject.parseObject(x.getConditions());