|
|
|
@@ -1251,7 +1251,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
return; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
merchantIds.addAll(userMerchantIds); |
|
|
|
if (merchantIds.size() > 0) { |
|
|
|
merchantIds.retainAll(userMerchantIds); |
|
|
|
}else { |
|
|
|
merchantIds.addAll(userMerchantIds); |
|
|
|
} |
|
|
|
if (merchantIds.size() <= 0 ) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -1264,7 +1272,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
return; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
merchantIds.addAll(floorMerchantIds); |
|
|
|
if (merchantIds.size() > 0) { |
|
|
|
merchantIds.retainAll(floorMerchantIds); |
|
|
|
}else { |
|
|
|
merchantIds.addAll(floorMerchantIds); |
|
|
|
} |
|
|
|
if (merchantIds.size() <= 0 ) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -1278,7 +1294,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
}else { |
|
|
|
merchantIds.addAll(shopMerchantIds); |
|
|
|
if (merchantIds.size() > 0) { |
|
|
|
merchantIds.retainAll(shopMerchantIds); |
|
|
|
}else { |
|
|
|
merchantIds.addAll(shopMerchantIds); |
|
|
|
} |
|
|
|
if (merchantIds.size() <= 0 ) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|