增加订单详情积分的计算

yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java

@@ -755,18 +755,10 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     public IPage<Product> listProdByCategoryIdAndShopId(ProdByCategoryIdAndShopIdDTO prodByCategoryIdAndShopIdDTO) {
         IPage<Product> productIPage = productMapper.listProdByCIdAndSId(new Page<>(prodByCategoryIdAndShopIdDTO.getCurrent(), prodByCategoryIdAndShopIdDTO.getSize()),
                 prodByCategoryIdAndShopIdDTO);
-//        if (productIPage.getRecords().isEmpty()) {
-//            productIPage = productMapper.listProdByCategoryIdAndShopId2(new Page<>(prodByCategoryIdAndShopIdDTO.getCurrent(), prodByCategoryIdAndShopIdDTO.getSize()),
-//                    prodByCategoryIdAndShopIdDTO);
-//        }
         productIPage.getRecords().forEach(product -> {
-//            List<Sku> skus = skuMapper.selectList(Wrappers.<Sku>lambdaQuery().eq(Sku::getProdId, product.getProdId()));
-            //TODO wangjian 查询具体的价格
-//            product.setSkuList(skus);
             List<Sku> skuList = skuMapper.listByProdId(product.getProdId());
             product.setSkuList(skuList);
         });
-
         return productIPage;
     }
 

yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopCategoryServiceImpl.java

@@ -159,8 +159,7 @@ public class ShopCategoryServiceImpl extends ServiceImpl<ShopCategoryMapper, Sho
                 .eq(ShopCategory::getShopId, shopId)
                 .eq(ShopCategory::getPid, parentId)
                 .eq(ShopCategory::getIsDelete, 0)
-                .orderByDesc(ShopCategory::getNum)
-                .orderByDesc(ShopCategory::getId));
+                .orderByAsc(ShopCategory::getNum));
         Page res = new Page();
         BeanUtils.copyProperties(page, res);
         List<Category> categories = page.getRecords().stream().map((sc) -> {