代码异味修复

fs-admin/src/main/java/com/fs/store/controller/FsMaterialGroupController.java

@@ -3,7 +3,6 @@ package com.fs.store.controller;
 import java.util.List;
 
 import com.fs.common.core.domain.R;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +23,7 @@ import com.fs.common.core.page.TableDataInfo;
 
 /**
  * 素材分组Controller
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
@@ -54,7 +53,7 @@ public class FsMaterialGroupController extends BaseController
     public AjaxResult export(FsMaterialGroup fsMaterialGroup)
     {
         List<FsMaterialGroup> list = fsMaterialGroupService.selectFsMaterialGroupList(fsMaterialGroup);
-        ExcelUtil<FsMaterialGroup> util = new ExcelUtil<FsMaterialGroup>(FsMaterialGroup.class);
+        ExcelUtil<FsMaterialGroup> util = new ExcelUtil<>(FsMaterialGroup.class);
         return util.exportExcel(list, "materialGroup");
     }
 

fs-service-system/src/main/java/com/fs/store/cache/impl/IFsStoreProductCacheServiceImpl.java

@@ -45,14 +45,13 @@ public class IFsStoreProductCacheServiceImpl implements IFsStoreProductCacheServ
     public String getWarehouseCodeByProductId(Long productId) {
         return WAREHOUSE_CACHE.get(productId,e->{
             FsStoreProduct fsStoreProduct = selectFsStoreProductById(productId);
-            if(ObjectUtil.isNotNull(fsStoreProduct)){
-                if(ObjectUtil.isNotNull(fsStoreProduct.getWarehouseId())){
+            if(ObjectUtil.isNotNull(fsStoreProduct) && ObjectUtil.isNotNull(fsStoreProduct.getWarehouseId())){
                     FsWarehouses fsWarehouses = fsWarehouseCacheService.selectFsWarehousesById(fsStoreProduct.getWarehouseId());
                     if(ObjectUtil.isNotNull(fsWarehouses)){
                         return fsWarehouses.getWarehouseCode();
                     }
                 }
-            }
+
             return null;
         });
 

fs-user-app/src/main/java/com/fs/app/controller/CompanyOrderController.java

@@ -1,13 +1,9 @@
 package com.fs.app.controller;
 
-
-import cn.hutool.json.JSONUtil;
 import com.fs.app.annotation.Login;
 import com.fs.common.core.domain.R;
-import com.fs.common.core.redis.RedisCache;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
-import com.fs.store.config.StoreConfig;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.enums.OrderLogEnum;
 import com.fs.store.param.FsStoreProductQueryParam;