|
@@ -733,7 +733,7 @@ public class QujingOrderServiceImpl implements IQujingOrderService {
|
|
|
List<Product> products = baseMapper.queryIntegralProduct(dbName,operatorId,supplierId);
|
|
List<Product> products = baseMapper.queryIntegralProduct(dbName,operatorId,supplierId);
|
|
|
|
|
|
|
|
List<StationMerchant> stationMerchantList = baseMapper.getStationMerchantList(dbName,supplierId);
|
|
List<StationMerchant> stationMerchantList = baseMapper.getStationMerchantList(dbName,supplierId);
|
|
|
- List<IntegralProduct> productList = baseMapper.integralProductList(dbName,supplierId);
|
|
|
|
|
|
|
+ List<IntegralProduct> productList = baseMapper.integralProductList(dbName,operatorId,supplierId);
|
|
|
List<StationMerchant> stationList = stationMerchantList.stream().filter(s->s.getStatus().equals(1) && !s.getType().equals(18) && s.getStreet() != null && s.getCountry() != null && s.getCity() != null).collect(Collectors.toList());
|
|
List<StationMerchant> stationList = stationMerchantList.stream().filter(s->s.getStatus().equals(1) && !s.getType().equals(18) && s.getStreet() != null && s.getCountry() != null && s.getCity() != null).collect(Collectors.toList());
|
|
|
List<ListParams> categoryFilterList = categoryList.stream().filter(c->c.getKey().equals(1)).collect(Collectors.toList());
|
|
List<ListParams> categoryFilterList = categoryList.stream().filter(c->c.getKey().equals(1)).collect(Collectors.toList());
|
|
|
|
|
|