Merge pull request #12 from FJ-OMS/feature-wusc-20230224-structural

修改仓库变更逻辑，优化代码结构

front-end/babel.config.js

@@ -11,6 +11,7 @@ module.exports = {
       plugins: ['dynamic-import-node'],
     },
   },
+
   plugins: [
     [
       'import',

front-end/src/api/authApi/index.js

@@ -11,6 +11,7 @@ const config = {
      * 字段权限 - 分页查询接口列表
      *  @organizationId : 0
      */
+
     {
       key: 'xxx',
       url: '/v1/{organizationId}/apis',

front-end/src/api/stockApi/abnormalApi.js

@@ -8,10 +8,8 @@
  */
 /* jshint esversion: 9 */
 /**
- *
  *  adjust record : 库存管理->异常库存管理
  *
- *
  */
 
 import { generate } from '@/utils/request';

front-end/src/api/stockApi/index.js

@@ -20,6 +20,7 @@ import warehouseRelationApi from './warehouseRelationApi';
 import reserveRecordsApi from './reserveRecordsApi';
 import distributeSpaceApi from './distributeSpaceApi';
 /** 出入库通知/结果单 */
+
 import noticeAndResultApi from './noticeAndResultApi';
 import changeRecordApi from './changeRecordApi';
 import initializeApi from './initializeApi';

skyer-after-sales/src/main/java/org/skyer/autoconfigure/afterSales/AfterSalesAutoConfiguration.java

@@ -19,6 +19,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
+ * @description 售后服务自动配置
  * @author bojiangzhou 2018/10/25
  */
 @ComponentScan(value = {"org.hippius.wd", "org.skyer.afterSales.api", "org.skyer.afterSales.app",

skyer-channel/src/main/java/org/skyer/channel/config/ChannelExtraDataManager.java

@@ -12,7 +12,6 @@ import org.skyer.swagger.swagger.extra.ExtraDataManager;
 
 /**
  * 服务基本信息
- *
  * @author
  */
 @SkyerExtraData

skyer-channel/src/main/java/org/skyer/channel/domain/repository/GroupRepository.java

@@ -5,7 +5,6 @@ import org.skyer.channel.domain.entity.Group;
 
 /**
  * 资源库
- *
  * @author linzhuanghuang@ebc.com 2021-09-03 16:54:36
  */
 public interface GroupRepository extends BaseRepository<Group> {

skyer-channel/src/main/java/org/skyer/channel/domain/service/GroupService.java

@@ -4,7 +4,6 @@ import org.skyer.channel.domain.entity.Group;
 
 /**
  * 应用服务
- *
  * @author linzhuanghuang@ebc.com 2021-09-03 16:54:36
  */
 public interface GroupService {

skyer-channel/src/main/java/org/skyer/channel/domain/service/impl/DealerServiceImpl.java

@@ -26,6 +26,7 @@ import org.skyer.core.oauth.DetailsHelper;
 import org.skyer.mybatis.pagehelper.domain.PageRequest;
 
 /**
+ *
  * @author: lzh
  * @date: 2021-06-17
  * @description:
@@ -44,8 +45,6 @@ public class DealerServiceImpl implements DealerService {
 			dealer.setDealerCode(UUID.randomUUID().toString().replace("-", ""));
 		}
 		CustomUserDetails userDetails = DetailsHelper.getUserDetails();
-		logger.info("获取当前用户==============》" + userDetails);
-		logger.info("获取当前用户租户ID==============》" + userDetails.getTenantId());
 		Long tenantId = userDetails.getTenantId();
 		dealer.setTenantId(tenantId);
 		return dealerRepository.insert(dealer) > 0;

skyer-channel/src/main/java/org/skyer/channel/domain/service/saga/impl/ShopServiceImpl.java

@@ -135,6 +135,9 @@ public class ShopServiceImpl implements ShopService {
     @Override
     @ProcessLovValue
     public List<ChannelSaleOrderVO> queryChannelOrderSaleReport(ChannelSaleOrderDTO dto) {
+        if (dto == null) {
+            log.info("ChannelSaleOrderDTO 为空");
+        }
         List<ChannelSaleOrderVO> channelSaleOrderVOS = shopRepository.queryChannelOrderSaleReport(dto);
         //调用订单中心获取订单金额等数据
         if (CollectionUtils.isEmpty(channelSaleOrderVOS)) {

skyer-channel/src/main/java/org/skyer/channel/domain/vo/DealerVO.java

@@ -12,6 +12,7 @@ import org.skyer.core.cache.Cacheable;
 import org.skyer.starter.keyencrypt.core.Encrypt;
 
 /**
+ *
  * @author: lzh
  * @date: 2021-06-18
  * @description:

skyer-gateway/src/main/java/org/skyer/gateway/common/SetRepository.java

@@ -4,7 +4,6 @@ import java.util.Set;
 
 /**
  * 只读列表
- * 
  * @author XCXCXCXCX
  * @version 1.2.0
  * @date 2019/12/5 7:41 下午

skyer-gateway/src/main/java/org/skyer/gateway/config/MaintainProperties.java

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+ *
  * @author XCXCXCXCX
  * @since 1.0
  */

skyer-gateway/src/main/java/org/skyer/gateway/endpoint/MaintainEndpoint.java

@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.UUID;
 
 /**
+ *
  * @author XCXCXCXCX
  * @date 2019/7/26
  * @project skyer-org.skyer.gateway

skyer-gateway/src/main/java/org/skyer/gateway/filter/AvailableServiceFilter.java

@@ -21,7 +21,6 @@ import java.util.Collections;
 
 /**
  * 整体运维，判断服务是否可用
- *
  * @author XCXCXCXCX
  * @since 1.0
  */

skyer-gateway/src/main/java/org/skyer/gateway/ratelimit/dimension/CombinedKeyResolver.java

@@ -10,6 +10,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
+ *
  * 仅允许动态构造（必须由多个KeyResolver构成），无需注入spring容器
  */
 public class CombinedKeyResolver implements KeyResolver {

skyer-gateway/src/main/java/org/skyer/gateway/route/entity/ServiceRoute.java

@@ -8,7 +8,6 @@ import javax.validation.constraints.NotNull;
 
 /**
  * 服务路由配置
- *
  * @author zhiying.dong@hand-china.com 2018-12-07 14:45:53
  */
 public class ServiceRoute extends AuditDomain {

skyer-gateway/src/main/java/org/skyer/gateway/util/KeyGenerator.java

@@ -3,6 +3,7 @@ package org.skyer.gateway.util;
 import java.util.Random;
 
 /**
+ *
  * @author XCXCXCXCX
  * @date 2019/10/17
  * @project skyer-gateway

skyer-goods/src/main/java/org/skyer/goods/api/controller/v1/CategoryController.java

@@ -50,13 +50,13 @@ public class CategoryController extends BaseController {
         return Results.success();
     }
 
-//    @ApiOperation(value = "修改商品分类表")
-//    @Permission(level = ResourceLevel.ORGANIZATION)
-//    @PostMapping("/update")
-//    public ResponseEntity<Category> update(@RequestBody Category category) {
-//        categoryRepository.updateByPrimaryKeySelective(category);
-//        return Results.success(category);
-//    }
+    @ApiOperation(value = "修改商品分类表")
+    @Permission(level = ResourceLevel.ORGANIZATION)
+    @PostMapping("/update")
+    public ResponseEntity<Category> update(@RequestBody Category category) {
+        categoryRepository.updateByPrimaryKeySelective(category);
+        return Results.success(category);
+    }
     @ApiOperation(value = "修改商品状态")
     @Permission(level = ResourceLevel.ORGANIZATION, permissionLogin = true)
     @PostMapping("/update/status")

skyer-goods/src/main/java/org/skyer/goods/app/service/CategoryAttributeService.java

@@ -2,7 +2,6 @@ package org.skyer.goods.app.service;
 
 /**
  * 商品分类属性表应用服务
- *
  * @author xurongfa 2021-12-24 09:12:57
  */
 public interface CategoryAttributeService {

skyer-goods/src/main/java/org/skyer/goods/app/service/MyEncryptionService.java

@@ -2,7 +2,6 @@ package org.skyer.goods.app.service;
 
 /**
  * 加密工具(针对字符串,id等进行加密)
- *
  * @author chenzz
  */
 public interface MyEncryptionService {

skyer-goods/src/main/java/org/skyer/goods/app/service/SkuPackageService.java

@@ -2,7 +2,6 @@ package org.skyer.goods.app.service;
 
 /**
  * 应用服务
- *
  * @author zhanglongbing@ebc.com 2022-03-03 10:45:30
  */
 public interface SkuPackageService {

skyer-goods/src/main/java/org/skyer/goods/app/service/SpuAttributeValueService.java

@@ -2,7 +2,6 @@ package org.skyer.goods.app.service;
 
 /**
  * 属性值表应用服务
- *
  * @author linzhuanghuang@ebc.com 2021-12-28 16:40:03
  */
 public interface SpuAttributeValueService {

skyer-goods/src/main/java/org/skyer/goods/app/service/impl/SpuInstallServiceServiceImpl.java

@@ -277,6 +277,9 @@ public class SpuInstallServiceServiceImpl implements SpuInstallServiceService {
 
     @Override
     public Boolean update(SpuInstallServiceDTO spuInstallServiceDTO) {
+        if (spuInstallServiceDTO == null) {
+            throw new CommonException("spu为null请重新设置!");
+        }
         if (!spuInstallServiceDTO.getIsAllStore() && CollUtil.isEmpty(spuInstallServiceDTO.getSpuStoreIds())) {
             // 如果不是适用于所有店铺且店铺没有设置值，返回错误
             throw new CommonException("没有设置店铺!");

skyer-order/src/main/java/org/skyer/order/app/service/AfterSaleItemService.java

@@ -2,7 +2,6 @@ package org.skyer.order.app.service;
 
 /**
  * 售后单商品应用服务
- *
  * @author lzh 2022-03-16 10:55:40
  */
 public interface AfterSaleItemService {

skyer-order/src/main/java/org/skyer/order/app/service/ItemPriceService.java

@@ -8,7 +8,6 @@ import java.util.Map;
 
 /**
  * 内部订单明细价格（聚合）应用服务
- *
  * @author wushaochuan 2022-01-18 14:34:54
  */
 public interface ItemPriceService {

skyer-order/src/main/java/org/skyer/order/app/service/PriceService.java

@@ -5,7 +5,6 @@ import org.skyer.order.domain.entity.Header;
 
 /**
  * 内部订单价格（聚合）应用服务
- *
  * @author wushaochuan 2022-01-18 14:34:54
  */
 public interface PriceService {

skyer-order/src/main/java/org/skyer/order/app/service/ThirdPartyOrderService.java

@@ -2,7 +2,6 @@ package org.skyer.order.app.service;
 
 /**
  * 第三方平台订单应用服务
- *
  * @author wushaochuan 2022-01-18 14:34:55
  */
 public interface ThirdPartyOrderService {

skyer-stock/src/main/java/org/skyer/stock/config/StockSwaggerApiConfig.java

@@ -6,10 +6,7 @@ import springfox.documentation.service.Tag;
 import springfox.documentation.spring.web.plugins.Docket;
 
 /**
- * <p>
  * Swagger Api 描述配置
- * </p>
- *
  * @author qingsheng.chen 2018/7/30 星期一 14:26
  */
 @Configuration

skyer-tags/src/main/java/org/skyer/autoconfigure/tags/TagsAutoConfiguration.java

@@ -21,6 +21,7 @@ import org.skyer.core.jackson.annotation.EnableObjectMapper;
 import org.skyer.core.util.CommonExecutor;
 
 /**
+ *
  * @author bojiangzhou 2018/10/25
  */
 @ComponentScan(value = {"org.hippius.wd", "org.skyer.tags.api", "org.skyer.tags.app",

skyer-tags/src/main/java/org/skyer/tags/app/service/impl/LabelServiceImpl.java

@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
 
 /**
  * 应用服务默认实现
- *
  * @author xurongfa 2022-01-22 11:33:07
  */
 @Service