Parcourir la source

1.订单查询分页错误

Guos il y a 1 mois
Parent
commit
5f80b1ead1

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -169,6 +169,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
             if (originalKey == null && originalIngredient == null) {
                 continue;
             }
+            //TODO 成分不进入这个检查
             String processedKey = null;
             if (originalKey != null) {
                 processedKey = originalKey.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
@@ -179,6 +180,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
                 promptWordsMap.put(processedChange, medicine.getForbiddenKeywords());
             }
             String processedIngredient = null;
+            //TODO 如果是名称就需要跳过
             if (originalIngredient != null) {
                 processedIngredient = originalIngredient.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
             }
@@ -1503,6 +1505,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         //拿到分类名称,直接调用之前店铺编辑和新增接口中调用识别存到识别表的结果。
         //这里需要区别一下,什么情况下需要识别营业执照,什么情况下识别经营许可证,什么情况下两个都需要,甚至包含食品的证
         //新增分类校验就去 categoryVal 包下面去新加
+        log.info("当前分类:{}",cateName);
         try{
             AbstractHandler invokeStrategy = ProductCategoryCheckFactory.getInvokeStrategy(String.valueOf(cateId));
             return invokeStrategy.check(cateName, storeId, medicalDeviceCode, productType);

+ 4 - 2
fs-service/src/main/resources/application-common.yml

@@ -112,9 +112,11 @@ mybatis:
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
-  reasonable: false #超出后不显示
-  supportMethodsArguments: false
+  reasonable: false #分页参数合理化。启用合理化时,如果pageNum<1会查询第一页,如果pageNum>pages会查询最后一页; 禁用合理化时,如果pageNum<1或pageNum>pages会返回空数据。
+  supportMethodsArguments: true
   params: count=countSql
+  page-size-zero: true
+
 
 # Swagger配置
 swagger:

+ 0 - 1
fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreOrderScrmController.java

@@ -125,7 +125,6 @@ public class FsStoreOrderScrmController extends BaseController
     public TableDataInfo list(FsStoreOrderParam fsStoreOrder)
     {
         fsStoreOrder.setStoreId(UserUtil.getLoginUserStoreID());
-//        startPage();
         List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(fsStoreOrder);
         return getDataTable(list);
     }