Explorar el Código

//update merchantlist

release_toaliyun_real
xhxu hace 4 años
padre
commit
b086658873
Se han modificado 1 ficheros con 6 adiciones y 1 borrados
  1. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Ver fichero

@@ -1011,7 +1011,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
Long floor = record.getFloor();
List<Long> floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0);
if (null != floorMerchantIds) {
merchantIds.retainAll(floorMerchantIds);
if(merchantIds.size() > 0){
merchantIds.retainAll(floorMerchantIds);
}else{
merchantIds.addAll(floorMerchantIds);
}
}
if (merchantIds.size() > 0 ) {
record.setIds(merchantIds);
@@ -1065,6 +1069,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
floorMerchantIds.add(-999L);
return floorMerchantIds;
}
return floorMerchantIds;
}
return null;
}


Cargando…
Cancelar
Guardar