合并提交,框架、admin-api修改配置文件获取

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/DistributorController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor;
+package com.yc.ship.module.ota.controller.admin.distributor;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
@@ -6,8 +6,7 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.distributor.vo.*;
-import com.yc.ship.module.ota.admin.distributor.vo.LoginTypeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.*;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.service.distributor.DistributorService;
 import io.swagger.v3.oas.annotations.Operation;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorImportExcelVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.AllArgsConstructor;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorImportRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorListReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorSimpleRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/DistributorUpdatePasswordReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributor/vo/LoginTypeRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributor.vo;
+package com.yc.ship.module.ota.controller.admin.distributor.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributoraudit/DistributorAuditController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributoraudit;
+package com.yc.ship.module.ota.controller.admin.distributoraudit;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
@@ -7,9 +7,9 @@ import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditPageReqVO;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditRespVO;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditRespVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditSaveReqVO;
 import com.yc.ship.module.ota.convert.distrbutor.DistributorConvert;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.distributoraudit.DistributorAuditDO;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributoraudit/vo/DistributorAuditPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributoraudit.vo;
+package com.yc.ship.module.ota.controller.admin.distributoraudit.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributoraudit/vo/DistributorAuditRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributoraudit.vo;
+package com.yc.ship.module.ota.controller.admin.distributoraudit.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributoraudit/vo/DistributorAuditSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributoraudit.vo;
+package com.yc.ship.module.ota.controller.admin.distributoraudit.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorauditlog/DistributorAuditLogController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorauditlog;
+package com.yc.ship.module.ota.controller.admin.distributorauditlog;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
@@ -7,9 +7,9 @@ import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogRespVO;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
 import com.yc.ship.module.ota.convert.distrbutor.DistributorConvert;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.distributorauditlog.DistributorAuditLogDO;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorauditlog/vo/DistributorAuditLogPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorauditlog.vo;
+package com.yc.ship.module.ota.controller.admin.distributorauditlog.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorauditlog/vo/DistributorAuditLogRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorauditlog.vo;
+package com.yc.ship.module.ota.controller.admin.distributorauditlog.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorauditlog/vo/DistributorAuditLogSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorauditlog.vo;
+package com.yc.ship.module.ota.controller.admin.distributorauditlog.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorcategory/DistributorCategoryController.java

@@ -1,10 +1,8 @@
-package com.yc.ship.module.ota.admin.distributorcategory;
+package com.yc.ship.module.ota.controller.admin.distributorcategory;
 
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategoryRespVO;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategorySaveReqVO;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategoryRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategorySaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorcategory.DistributorCategoryDO;
 import com.yc.ship.module.ota.service.distributorcategory.DistributorCategoryService;
 import org.springframework.web.bind.annotation.*;
@@ -15,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorcategory/vo/DistributorCategoryPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorcategory.vo;
+package com.yc.ship.module.ota.controller.admin.distributorcategory.vo;
 
 import lombok.*;
 import java.util.*;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorcategory/vo/DistributorCategoryRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorcategory.vo;
+package com.yc.ship.module.ota.controller.admin.distributorcategory.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorcategory/vo/DistributorCategorySaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorcategory.vo;
+package com.yc.ship.module.ota.controller.admin.distributorcategory.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/DistributorProductController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct;
+package com.yc.ship.module.ota.controller.admin.distributorproduct;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.common.pojo.CommonResult;
@@ -6,12 +6,12 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.*;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.InitializeDistributorProductReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.*;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.InitializeDistributorProductReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorAgencyPriceDO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorProductDO;
 import com.yc.ship.module.ota.dal.mysql.distributor.DistributorMapper;
@@ -28,7 +28,6 @@ import javax.validation.Valid;
 import java.util.List;
 
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
-import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.OTHER;
 
 @Tag(name = "管理后台 - 平台产品与分销商关系")

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/DistributorAgencyPriceRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/DistributorProductPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/DistributorProductRespVO.java

@@ -1,8 +1,8 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/DistributorProductSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/DistributorProjectSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/product/InitializeDistributorProductReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo.product;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/product/ProductGroupRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo.product;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/product/ProductPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo.product;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorproduct/vo/product/ProductRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorproduct.vo.product;
+package com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorrecharge/DistributorRechargeController.java

@@ -1,14 +1,14 @@
-package com.yc.ship.module.ota.admin.distributorrecharge;
+package com.yc.ship.module.ota.controller.admin.distributorrecharge;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeAuditReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeRespVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeAuditReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeSaveReqVO;
 import com.yc.ship.module.ota.service.distributorrecharge.DistributorRechargeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorrecharge/vo/DistributorRechargeAuditReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorrecharge.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorrecharge/vo/DistributorRechargePageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorrecharge.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorrecharge/vo/DistributorRechargeRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorrecharge.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorrecharge/vo/DistributorRechargeSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorrecharge.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorselfrecharge/DistributorSelfRechargeController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorselfrecharge;
+package com.yc.ship.module.ota.controller.admin.distributorselfrecharge;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
@@ -6,10 +6,10 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeRespVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorselfrecharge.DistributorSelfRechargeDO;
 import com.yc.ship.module.ota.service.distributorselfrecharge.DistributorSelfRechargeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -24,7 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorselfrecharge/vo/DistributorSelfRechargePageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorselfrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yc.ship.framework.common.pojo.PageParam;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorselfrecharge/vo/DistributorSelfRechargeRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorselfrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorselfrecharge/vo/DistributorSelfRechargeSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorselfrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributorselfrecharge/vo/DistributorSelfRechargeSimpleRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributorselfrecharge.vo;
+package com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributortype/DistributorTypeController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributortype;
+package com.yc.ship.module.ota.controller.admin.distributortype;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
@@ -6,9 +6,9 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypePageReqVO;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypeRespVO;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypeSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributortype.DistributorTypeDO;
 import com.yc.ship.module.ota.service.distributortype.DistributorTypeService;
 import io.swagger.v3.oas.annotations.Operation;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributortype/vo/DistributorTypePageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributortype.vo;
+package com.yc.ship.module.ota.controller.admin.distributortype.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributortype/vo/DistributorTypeRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributortype.vo;
+package com.yc.ship.module.ota.controller.admin.distributortype.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/distributortype/vo/DistributorTypeSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.distributortype.vo;
+package com.yc.ship.module.ota.controller.admin.distributortype.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/tradelog/TradeLogController.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.tradelog;
+package com.yc.ship.module.ota.controller.admin.tradelog;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageParam;
@@ -7,9 +7,9 @@ import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogPageReqVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogRespVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogRespVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogSaveReqVO;
 import com.yc.ship.module.ota.convert.distrbutor.DistributorConvert;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.tradelog.TradeLogDO;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/tradelog/vo/TradeLogPageReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.tradelog.vo;
+package com.yc.ship.module.ota.controller.admin.tradelog.vo;
 
 import com.yc.ship.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/tradelog/vo/TradeLogRespVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.tradelog.vo;
+package com.yc.ship.module.ota.controller.admin.tradelog.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/admin/tradelog/vo/TradeLogSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.ota.admin.tradelog.vo;
+package com.yc.ship.module.ota.controller.admin.tradelog.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributor/DistributorMapper.java

@@ -5,10 +5,10 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorListReqVO;
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorPageReqVO;
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO;
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorListReqVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributoraudit/DistributorAuditMapper.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.ota.dal.mysql.distributoraudit;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditPageReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributoraudit.DistributorAuditDO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributorauditlog/DistributorAuditLogMapper.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.ota.dal.mysql.distributorauditlog;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorauditlog.DistributorAuditLogDO;
 import org.apache.ibatis.annotations.Mapper;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributorcategory/DistributorCategoryMapper.java

@@ -1,12 +1,10 @@
 package com.yc.ship.module.ota.dal.mysql.distributorcategory;
 
-import java.util.*;
-
 
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorcategory.DistributorCategoryDO;
 import org.apache.ibatis.annotations.Mapper;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributorproduct/DistributorProductMapper.java

@@ -2,12 +2,11 @@ package com.yc.ship.module.ota.dal.mysql.distributorproduct;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorProductDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributorproduct/DistributorProjectMapper.java

@@ -4,9 +4,7 @@ import java.util.*;
 
 
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO;
-import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorProductDO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorProjectDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributorrecharge/DistributorRechargeMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorrecharge.DistributorRechargeDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributorselfrecharge/DistributorSelfRechargeMapper.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.ota.dal.mysql.distributorselfrecharge;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorselfrecharge.DistributorSelfRechargeDO;
 import org.apache.ibatis.annotations.Mapper;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributortype/DistributorTypeMapper.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.ota.dal.mysql.distributortype;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypePageReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributortype.DistributorTypeDO;
 import org.apache.ibatis.annotations.Mapper;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/tradelog/TradeLogMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogPageReqVO;
 import com.yc.ship.module.ota.dal.dataobject.tradelog.TradeLogDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/distrbutor/DistributorConvert.java

@@ -3,9 +3,9 @@ package com.yc.ship.module.ota.convert.distrbutor;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditRespVO;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogRespVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogRespVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogRespVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.distributoraudit.DistributorAuditDO;
 import com.yc.ship.module.ota.dal.dataobject.distributorauditlog.DistributorAuditLogDO;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorService.java

@@ -3,8 +3,7 @@ package com.yc.ship.module.ota.service.distributor;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
-import com.yc.ship.module.ota.admin.distributor.vo.*;
-import com.yc.ship.module.ota.admin.distributor.vo.LoginTypeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.*;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorServiceImpl.java

@@ -20,8 +20,8 @@ import com.yc.ship.framework.security.core.util.SecurityFrameworkUtils;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
-import com.yc.ship.module.ota.admin.distributor.vo.*;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.*;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
 import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.distributortype.DistributorTypeDO;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributoraudit/DistributorAuditService.java

@@ -1,8 +1,8 @@
 package com.yc.ship.module.ota.service.distributoraudit;
 
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditPageReqVO;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributoraudit.DistributorAuditDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributoraudit/DistributorAuditServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.lang.Asserts;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditPageReqVO;
-import com.yc.ship.module.ota.admin.distributoraudit.vo.DistributorAuditSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributoraudit.vo.DistributorAuditSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributoraudit.DistributorAuditDO;
 import com.yc.ship.module.ota.dal.mysql.distributoraudit.DistributorAuditMapper;
 import com.yc.ship.module.ota.service.distributor.DistributorService;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorauditlog/DistributorAuditLogService.java

@@ -1,8 +1,8 @@
 package com.yc.ship.module.ota.service.distributorauditlog;
 
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorauditlog.DistributorAuditLogDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorauditlog/DistributorAuditLogServiceImpl.java

@@ -3,8 +3,8 @@ package com.yc.ship.module.ota.service.distributorauditlog;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
-import com.yc.ship.module.ota.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorauditlog.vo.DistributorAuditLogSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorauditlog.DistributorAuditLogDO;
 import com.yc.ship.module.ota.dal.mysql.distributorauditlog.DistributorAuditLogMapper;
 import org.springframework.stereotype.Service;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorcategory/DistributorCategoryService.java

@@ -4,9 +4,8 @@ import java.util.*;
 import javax.validation.*;
 
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.framework.common.pojo.PageParam;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategorySaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategorySaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorcategory.DistributorCategoryDO;
 
 /**

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorcategory/DistributorCategoryServiceImpl.java

@@ -3,22 +3,19 @@ package com.yc.ship.module.ota.service.distributorcategory;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
-import com.yc.ship.module.ota.admin.distributorcategory.vo.DistributorCategorySaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategoryPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorcategory.vo.DistributorCategorySaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorcategory.DistributorCategoryDO;
-import com.yc.ship.module.ota.dal.dataobject.distributortype.DistributorTypeDO;
 import com.yc.ship.module.ota.dal.mysql.distributorcategory.DistributorCategoryMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 
 import com.yc.ship.framework.common.util.object.BeanUtils;
 
 
 import java.util.List;
-import java.util.Map;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.yc.ship.module.ota.enums.ErrorCodeConstants.DISTRIBUTOR_CATEGORY_NOT_EXISTS;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorproduct/DistributorProductService.java

@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.ota.api.dto.DistributorProductRespDTO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProjectSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.InitializeDistributorProductReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProjectSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.InitializeDistributorProductReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorAgencyPriceDO;
 import com.yc.ship.module.ota.dal.dataobject.distributorproduct.DistributorProductDO;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorproduct/DistributorProductServiceImpl.java

@@ -18,15 +18,15 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.util.MyBatisUtils;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
-import com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProjectSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.InitializeDistributorProductReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductPageReqVO;
-import com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProjectSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.InitializeDistributorProductReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductPageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductRespVO;
 import com.yc.ship.module.ota.api.dto.DistributorAgencyPriceDTO;
 import com.yc.ship.module.ota.api.dto.DistributorProductRespDTO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorrecharge/DistributorRechargeService.java

@@ -4,10 +4,10 @@ import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.module.ota.api.dto.DistributorRechargeReqDTO;
 import com.yc.ship.module.ota.api.dto.DistributorRechargeRespDTO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeAuditReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeRespVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeAuditReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorrecharge.DistributorRechargeDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorrecharge/DistributorRechargeServiceImpl.java

@@ -10,11 +10,11 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.util.MyBatisUtils;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeAuditReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeRespVO;
-import com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeSaveReqVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeAuditReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogSaveReqVO;
 import com.yc.ship.module.ota.api.dto.DistributorRechargeReqDTO;
 import com.yc.ship.module.ota.api.dto.DistributorRechargeRespDTO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
@@ -40,7 +40,6 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeService.java

@@ -1,9 +1,9 @@
 package com.yc.ship.module.ota.service.distributorselfrecharge;
 
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorselfrecharge.DistributorSelfRechargeDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeServiceImpl.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
-import com.yc.ship.module.ota.admin.distributor.vo.LoginTypeRespVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
-import com.yc.ship.module.ota.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.LoginTypeRespVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributorselfrecharge.vo.DistributorSelfRechargeSimpleRespVO;
 import com.yc.ship.module.ota.dal.dataobject.distributorselfrecharge.DistributorSelfRechargeDO;
 import com.yc.ship.module.ota.dal.mysql.distributorselfrecharge.DistributorSelfRechargeMapper;
 import com.yc.ship.module.ota.service.distributor.DistributorService;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributortype/DistributorTypeService.java

@@ -2,8 +2,8 @@ package com.yc.ship.module.ota.service.distributortype;
 
 
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypePageReqVO;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypeSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributortype.DistributorTypeDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributortype/DistributorTypeServiceImpl.java

@@ -3,8 +3,8 @@ package com.yc.ship.module.ota.service.distributortype;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypePageReqVO;
-import com.yc.ship.module.ota.admin.distributortype.vo.DistributorTypeSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypePageReqVO;
+import com.yc.ship.module.ota.controller.admin.distributortype.vo.DistributorTypeSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributortype.DistributorTypeDO;
 import com.yc.ship.module.ota.dal.mysql.distributortype.DistributorTypeMapper;
 import org.springframework.stereotype.Service;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/tradelog/TradeLogService.java

@@ -1,8 +1,8 @@
 package com.yc.ship.module.ota.service.tradelog;
 
 import com.yc.ship.framework.common.pojo.PageResult;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogPageReqVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.tradelog.TradeLogDO;
 
 import javax.validation.Valid;

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/tradelog/TradeLogServiceImpl.java

@@ -8,9 +8,9 @@ import com.yc.ship.framework.common.exception.ServiceException;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
-import com.yc.ship.module.ota.admin.distributor.vo.LoginTypeRespVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogPageReqVO;
-import com.yc.ship.module.ota.admin.tradelog.vo.TradeLogSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.distributor.vo.LoginTypeRespVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogPageReqVO;
+import com.yc.ship.module.ota.controller.admin.tradelog.vo.TradeLogSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.dataobject.tradelog.TradeLogDO;
 import com.yc.ship.module.ota.dal.mysql.tradelog.TradeLogMapper;

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributor/DistributorMapper.xml

@@ -19,14 +19,14 @@
         </if>
     </select>
 
-    <select id="getOtcDistributor" resultType="com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO">
+    <select id="getOtcDistributor" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         select * from ota_distributor
         where deleted = 0 and is_use=1
         <if test="type != null">
           and type = #{type}
         </if>
     </select>
-    <select id="getOtcDistributorWithId" resultType="com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO">
+    <select id="getOtcDistributorWithId" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         select d.*, dp.id distributorProductId
         from ota_distributor d
             inner join ota_distributor_product dp on dp.distributor_id = d.id and dp.deleted=0
@@ -36,15 +36,15 @@
         </if>
     </select>
 
-    <select id="getDistributorById" resultType="com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO">
+    <select id="getDistributorById" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         select * from ota_distributor where deleted = 0 and id = #{id}
     </select>
-    <select id="getById" resultType="com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO">
+    <select id="getById" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         select * from ota_distributor
         where id = #{id}
     </select>
 
-    <select id="getByTenantId" resultType="com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO">
+    <select id="getByTenantId" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         select * from ota_distributor
         where account_tenant_id = #{tenantId} and type = 2
     </select>
@@ -115,7 +115,7 @@
         where type = 2 and is_use = 1 and deleted=0
     </select>
 
-    <select id="queryDistributorMoneyTotal" resultType="com.yc.ship.module.ota.admin.distributor.vo.DistributorRespVO">
+    <select id="queryDistributorMoneyTotal" resultType="com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO">
         SELECT sum(IF(recharge_type = 1, money, 0.00)) balanceTotal, sum(IF(recharge_type = 2, money, 0.00)) payCreditTotal
         FROM ota_distributor_recharge
         WHERE `status` = 1 and deleted = 0 and distributor_id = #{distributorId}

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributorproduct/DistributorProductMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yc.ship.module.ota.dal.mysql.distributorproduct.DistributorProductMapper">
 
     <select id="getPage"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO">
         select t1.id,t4.id distributorId,t4.name distributorName,t2.id productId,t2.product_name productName,t2.category_id categoryId,t3.spec_type
         specType,t1.product_sku_id,t1.sale_price salePrice,t1.sale_price_raw salePriceRaw,ifnull(t1.is_use,0) isUse,t1.start_date startDate,t1.end_date endDate,
         t1.route_plan_id routePlanId,t5.name planName
@@ -42,7 +42,7 @@
     </select>
 
     <select id="getDistributorProductList"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO">
         select t1.* from ota_distributor_product t1
         where 1=1
         <if test="distributorId != null and distributorId !=''">
@@ -57,7 +57,7 @@
     </select>
 
     <select id="getProductPage"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductRespVO">
         <choose>
             <when test="params.channelType == 1">
                 <include refid="otaProductPage"/>
@@ -120,7 +120,7 @@
     </sql>
 
     <select id="getProductSku"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO">
         select t1.id         productSkuId,
                t1.product_id productId,
                t1.cost_price costPrice,
@@ -133,7 +133,7 @@
     </select>
 
     <select id="getProductSkuList"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO">
         select t1.id         productSkuId,
                t1.product_id productId,
                t1.cost_price costPrice,
@@ -146,7 +146,7 @@
     </select>
 
     <select id="getProductSpu"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO">
         select t1.id product_id, t1.sale_price salePrice, t1.cost_price costPrice
         from product_spu t1
         where t1.deleted = 0
@@ -168,7 +168,7 @@
     </select>
 
     <select id="selectProjectType"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO">
         SELECT
             pg.product_id,pg.product_base_id,pb.`name` productBaseName,pg.specification_id,pp.`name` specificationName,
             pg.cost_price,pg.sale_price,pg.spec_type,pg.need_choose
@@ -246,7 +246,7 @@
     </select>
 
     <select id="selectDistributorProductList"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.DistributorProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.DistributorProductRespVO">
         SELECT dp.id, spu.id productId, spu.category_id categoryId, spu.product_name productName,
         if(dp.id is null, spu.is_use, dp.is_use) isUse,
         sku.id productSkuId, sku.spec_type specType,
@@ -284,7 +284,7 @@
     </select>
 
     <select id="selectProductList"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductRespVO">
         SELECT spu.id productId, spu.category_id categoryId, spu.product_name productName, spu.is_use isUse,
                spu.sort_num sort, sku.id productSkuId, sku.spec_type specType, sku.sale_price salePrice,
                br.sale_start_date startDate, br.sale_end_date endDate

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributorproduct/DistributorProjectMapper.xml

@@ -31,7 +31,7 @@
     </select>
 
     <select id="getProductGroupList"
-            resultType="com.yc.ship.module.ota.admin.distributorproduct.vo.product.ProductGroupRespVO">
+            resultType="com.yc.ship.module.ota.controller.admin.distributorproduct.vo.product.ProductGroupRespVO">
         SELECT
         pd.product_id,pd.product_base_id, pd.spec_type specType, pd.cost_price costPrice, pd.sale_price salePrice,pd.is_use isUse,
         pd.specification_id, pb.`name` productBaseName, pp.`name` specificationName

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributorrecharge/DistributorRechargeMapper.xml

@@ -9,7 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-    <select id="queryPage" resultType="com.yc.ship.module.ota.admin.distributorrecharge.vo.DistributorRechargeRespVO">
+    <select id="queryPage" resultType="com.yc.ship.module.ota.controller.admin.distributorrecharge.vo.DistributorRechargeRespVO">
         SELECT
         dr.id,
         dr.distributor_id,

ship-server-web/src/main/java/com/yc/ship/framework/web/config/WebProperties.java

@@ -3,6 +3,7 @@ package com.yc.ship.framework.web.config;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
@@ -16,10 +17,17 @@ import javax.validation.constraints.NotNull;
 @Data
 public class WebProperties {
 
+
+//    @Value("${yudao.web.app-url:'app-api'}")
+    private String appUrl="app-api";
+
+    @Value("${yudao.web.admin-url:ship-api}")
+    private String adminUrl;
+
     @NotNull(message = "APP API 不能为空")
-    private Api appApi = new Api("/app-api", "**.controller.app.**");
+    private Api appApi = new Api(appUrl, "**.controller.app.**");
     @NotNull(message = "Admin API 不能为空")
-    private Api adminApi = new Api("/ship-ota-api", "**.controller.admin.**");
+    private Api adminApi = new Api(adminUrl, "**.controller.admin.**");
 
 
     @NotNull(message = "Admin UI 不能为空")

ship-server-web/src/main/java/com/yc/ship/framework/web/config/YudaoWebAutoConfiguration.java

@@ -40,10 +40,16 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer {
     @Value("${spring.application.name}")
     private String applicationName;
 
+    @Value("${yudao.web.admin-url:ship-api}")
+    private String adminApi;
+
+    @Value("${yudao.web.app-url:app-api}")
+    private String appApi;
+
     @Override
     public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurePathMatch(configurer, webProperties.getAdminApi());
-        configurePathMatch(configurer, webProperties.getAppApi());
+        configurePathMatch(configurer, new WebProperties.Api(adminApi, "**.controller.admin.**"));
+        configurePathMatch(configurer, new WebProperties.Api(appApi, "**.controller.app.**"));
     }
 
     /**

ship-server-web/src/main/resources/application-local.yaml

@@ -49,12 +49,12 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://10.3.10.50:43306/db_yc_ship_lfy?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://10.3.10.50:43306/db_yc_ship?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: W1ses0ft@zshl
         slave: # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://10.3.10.50:43306/db_yc_ship_lfy?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://10.3.10.50:43306/db_yc_ship?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
           username: root
           password: W1ses0ft@zshl
 

ship-server-web/src/main/resources/application.yaml

@@ -236,6 +236,8 @@ yudao:
   web:
     admin-ui:
       url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址
+    admin-url: ship-ota-api
+    app-url: app-api
   xss:
     enable: false
     exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
@@ -274,9 +276,26 @@ yudao:
     enable: true
     ignore-urls:
       - /jmreport/* # 积木报表，无法携带租户编号
+      - /ship-ota-api/system/tenant/get-id-by-name # 基于名字获取租户，不许带租户编号
     ignore-visit-urls:
       - /admin-api/system/user/profile/**
     ignore-tables:
+      - system_tenant
+      - system_tenant_package
+      - system_dict_data
+      - system_dict_type
+      - system_error_code
+      - system_menu
+      - system_sms_channel
+      - system_sms_template
+      - system_sms_log
+      - system_sensitive_word
+      - system_oauth2_client
+      - system_mail_account
+      - system_mail_template
+      - system_mail_log
+      - system_notify_template
+      - system_sequence_number
     ignore-caches:
       - user_role_ids
       - permission_menu_ids