|
|
@@ -14,9 +14,9 @@ import cn.cslg.pas.domain.ProductCategory;
|
|
|
import cn.cslg.pas.domain.ProductMarketData;
|
|
|
import cn.cslg.pas.domain.asso.AssoProductCategoryPicture;
|
|
|
import cn.cslg.pas.exception.XiaoShiException;
|
|
|
-import cn.cslg.pas.mapper.AssoProductCategoryPictureMapper;
|
|
|
import cn.cslg.pas.mapper.ProductCategoryMapper;
|
|
|
import cn.cslg.pas.mapper.ProductMapper;
|
|
|
+import cn.cslg.pas.mapper.asso.AssoProductCategoryPictureMapper;
|
|
|
import cn.cslg.pas.service.IProductCategoryService;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
@@ -309,7 +309,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
|
|
|
List<ProductCategoryTrendVO.saleVO> saleVOS = new ArrayList<>();
|
|
|
for (Object key : keyset) {
|
|
|
ProductCategoryTrendVO.saleVO saleVO = new ProductCategoryTrendVO.saleVO();
|
|
|
- saleVO.setMarketData(key.toString());
|
|
|
+ saleVO.setMarketDate(key.toString());
|
|
|
saleVO.setSaleTotalMoney(Double.parseDouble(marketDataMap.get(key).toString()));
|
|
|
saleVOS.add(saleVO);
|
|
|
}
|
|
|
@@ -321,6 +321,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
|
|
|
|
|
|
@Override
|
|
|
public List<String> getAreaList(GetAreaListDTO dto) {
|
|
|
+
|
|
|
List<String> areaList = new ArrayList<>();
|
|
|
areaList = productCategoryMapper.getAreaList(dto);
|
|
|
return areaList;
|
|
|
@@ -334,8 +335,8 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
|
|
|
LambdaQueryWrapper<Product> productWrapper = new LambdaQueryWrapper<>();
|
|
|
productWrapper.eq(Product::getProductCategoryId, id);
|
|
|
List<Product> products = productService.list(productWrapper);
|
|
|
- products.forEach(item->{
|
|
|
- if(!areaList.contains(item.getCompanyName())){
|
|
|
+ products.forEach(item -> {
|
|
|
+ if (!areaList.contains(item.getCompanyName())) {
|
|
|
areaList.add(item.getCompanyName());
|
|
|
}
|
|
|
});
|
chendayu