商城订单制单查询优化 商城配置获取优化

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

@@ -101,7 +101,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Autowired
     private ConfigUtil configUtil;
-    
+
     @Autowired
     private com.fs.system.service.ISysConfigService configService;
 
@@ -1036,22 +1036,6 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     public List<FsStoreProductListQueryVO> selectFsStoreProductListQuery(FsStoreProductQueryParam param) {
         boolean stores = medicalMallConfig.isStores();
         param.setIsStores(stores?1:0);
-        // 蒙一堂特殊产品展示
-        List<Long>  cateIds;
-        if("1".equals(param.getProductFlag())){// 家庭应急
-            // fs_store_product_category_scrm
-            FsStoreProductCategoryScrm fsStoreProductCategoryScrm = new FsStoreProductCategoryScrm();
-            fsStoreProductCategoryScrm.setPid(0L);
-            fsStoreProductCategoryScrm.setCateName("家庭应急");
-            cateIds =fsStoreProductCategoryScrmMapper.selectCateIdsByName(fsStoreProductCategoryScrm);
-            if(cateIds!= null && !cateIds.isEmpty()){
-                param.setCateIds(cateIds);
-            }else {
-                // 不让查询出来
-                return new ArrayList<>();
-            }
-        }
-
         return fsStoreProductMapper.selectFsStoreProductListQuery(param);
     }
 
@@ -1071,7 +1055,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
             String productName = product != null ? product.getProductName() : "商品";
             throw new CustomException(productName + "库存不足，当前库存：" + (productStock != null ? productStock : 0) + "，需要数量：" + cartNum);
         }
-        
+
         // 如果有规格，检查规格库存
         if (productAttrValueId != null) {
             Integer attrStock = fsStoreProductAttrValueMapper.selectProductAttrStockForUpdate(productAttrValueId);
@@ -1082,7 +1066,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
             }
         }
     }
-    
+
     @Override
     public void decProductStock(Long productId, Long productAttrValueId, Integer cartNum) {
         // 检查配置是否开启库存检查
@@ -1098,7 +1082,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         } catch (Exception e) {
             log.error("检查库存配置失败", e);
         }
-        
+
         //处理属性sku
         fsStoreProductAttrValueMapper.decProductAttrStock(productAttrValueId,cartNum);
         fsStoreProductMapper.decProductAttrStock(productId,cartNum);

fs-user-app/src/main/java/com/fs/app/controller/store/CommonScrmController.java

@@ -403,7 +403,8 @@ public class CommonScrmController extends AppBaseController {
         String config = configService.selectConfigByKey("store.config");
         StoreConfig storeConfig = JSONUtil.toBean(config, StoreConfig.class);
         //资质证书
-        String certs = configUtil.generateConfigByKey(SysConfigEnum.HIS_CERTS.getKey()).getString("certs");
+        JSONObject certsConfig = configUtil.generateConfigByKey(SysConfigEnum.HIS_CERTS.getKey());
+        String certs = certsConfig != null ? certsConfig.getString("certs") : null;
         storeConfig.setCerts(certs);
         //退款商家
         configUtil.generateConfigByKey(SysConfigEnum.HIS_CONFIG.getKey());