backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Jack 2025-10-25 16:18:23 +08:00
commit 955fe3a3ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java
View File

@ -2792,7 +2792,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
Integer category_id = Convert.toInt(getParameter("category_id")); Integer category_id = Convert.toInt(getParameter("category_id"));
QueryWrapper<ShopProductIndex> cond_row = new QueryWrapper<>(); QueryWrapper<ShopProductIndex> cond_row = new QueryWrapper<>();
cond_row.orderByDesc("product_id"); cond_row.orderByDesc("product_sale_time");
List<Integer> category_ids = new ArrayList<>(); List<Integer> category_ids = new ArrayList<>();
if (CheckUtil.isNotEmpty(category_id)) { if (CheckUtil.isNotEmpty(category_id)) {
List<Map> categoryList = shopBaseProductCategoryService.getCategoryByParentId(category_id, true, true); List<Map> categoryList = shopBaseProductCategoryService.getCategoryByParentId(category_id, true, true);

4
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncShopImageServiceImpl.java
View File

@ -223,14 +223,14 @@ public class SyncShopImageServiceImpl implements SyncShopImageService {
shopProductImageList.add(shopProductImage); shopProductImageList.add(shopProductImage);
shopProductBase.setProduct_id(imageMappingDto.getProductId()); shopProductBase.setProduct_id(imageMappingDto.getProductId());
shopProductBase.setProduct_image(thumb); shopProductBase.setProduct_image(thumb);
shopProductBase.setProduct_state_id(StateCode.PRODUCT_STATE_NORMAL); shopProductBase.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF);
shopProductBaseList.add(shopProductBase); shopProductBaseList.add(shopProductBase);
shopProductItem.setProduct_id(imageMappingDto.getProductId()); shopProductItem.setProduct_id(imageMappingDto.getProductId());
shopProductItem.setItem_enable(StateCode.PRODUCT_STATE_NORMAL); shopProductItem.setItem_enable(StateCode.PRODUCT_STATE_NORMAL);
shopProductItemList.add(shopProductItem); shopProductItemList.add(shopProductItem);
ShopProductIndex shopProductIndex=new ShopProductIndex(); ShopProductIndex shopProductIndex=new ShopProductIndex();
shopProductIndex.setProduct_id(imageMappingDto.getProductId()); shopProductIndex.setProduct_id(imageMappingDto.getProductId());
shopProductIndex.setProduct_state_id(StateCode.PRODUCT_STATE_NORMAL); shopProductIndex.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF);
shopProductIndexList.add(shopProductIndex); shopProductIndexList.add(shopProductIndex);
} }
synchronized (this){ synchronized (this){