2 Revize 7973e1dd12 ... 11ef69feba

Autor SHA1 Zpráva Datum
  jinshihui 11ef69feba Merge remote-tracking branch 'origin/point_dev' into point_dev před 3 dny
  jinshihui 53d01dc9e6 优化代码 před 3 dny

+ 1 - 1
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/AfterSaleOrderController.java

@@ -49,7 +49,7 @@ public class AfterSaleOrderController {
             return R.ok();
             return R.ok();
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("发起售后失败", e);
             log.error("发起售后失败", e);
-            return R.fail("发起售后失败");
+            return R.fail("发起售后失败:" + e.getMessage());
         }
         }
     }
     }
 
 

+ 1 - 1
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductServiceImpl.java

@@ -339,7 +339,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
 
         // 3. 为了支持分页+排序,先查询所有匹配商品(不分页,按综合得分排序后取分页数据)
         // 3. 为了支持分页+排序,先查询所有匹配商品(不分页,按综合得分排序后取分页数据)
         Page<H5ProductVo> allDataPage = new Page<>(1, Integer.MAX_VALUE);
         Page<H5ProductVo> allDataPage = new Page<>(1, Integer.MAX_VALUE);
-        Page<H5ProductVo> allProductsPage = productMapper.selectH5Page(allDataPage, product, null, null, null);
+        Page<H5ProductVo> allProductsPage = productMapper.selectH5Page(allDataPage, product, name, null, null);
 
 
         List<H5ProductVo> allProducts = allProductsPage.getRecords();
         List<H5ProductVo> allProducts = allProductsPage.getRecords();
         if (allProducts.isEmpty()) {
         if (allProducts.isEmpty()) {