添加分销商财务分组

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

@@ -49,6 +49,10 @@ public class DistributorRespVO {
     @ExcelProperty("分销商分组")
     private Long otaCategoryId;
 
+    @Schema(description = "财务分组", example = "23448")
+    @ExcelProperty("财务分组")
+    private Long financeCategoryId;
+
     @Schema(description = "全称", example = "王五")
     @ExcelProperty("全称")
     private String name;

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

@@ -25,8 +25,10 @@ public class DistributorSaveReqVO {
 
     @Schema(description = "分销商类型", example = "23448")
     private Long otaTypeId;
-    @Schema(description = "分销商分组", example = "23448")
+    @Schema(description = "销售分组", example = "23448")
     private Long otaCategoryId;
+    @Schema(description = "财务分组", example = "23448")
+    private Long financeCategoryId;
     @Schema(description = "分销商等级", example = "23448")
     private Long otcLevelId;
 

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

@@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.Operation;
 
 import javax.validation.*;
 import javax.servlet.http.*;
+import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.io.IOException;
 
@@ -105,8 +106,8 @@ public class DistributorCategoryController {
 
     @GetMapping({"/list-otc-category"})
     @Operation(summary = "获取分销商类型列表", description = "只包含被开启的类型，主要用于前端的下拉选项")
-    public CommonResult<List<DistributorCategoryDO>> getCategoryList() {
-        List<DistributorCategoryDO> list= distributorCategoryService.getCategoryList();
+    public CommonResult<List<DistributorCategoryDO>> getCategoryList( @NotNull(message = "分组类型不能为空") Integer groupType) {
+        List<DistributorCategoryDO> list= distributorCategoryService.getCategoryList(groupType);
         return success(list);
     }
 }

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

@@ -29,6 +29,14 @@ public class DistributorCategoryRespVO {
     @ExcelProperty("排序号")
     private Integer sortNum;
 
+    @Schema(description = "区域")
+    @ExcelProperty("区域")
+    private Integer marketArea;
+
+    @Schema(description = "分组类型")
+    @ExcelProperty("分组类型")
+    private Integer groupType;
+
     @Schema(description = "状态", example = "2")
     @ExcelProperty("状态")
     private Integer useStatus;
@@ -39,4 +47,6 @@ public class DistributorCategoryRespVO {
     @Schema(description = "所属销售id")
     private Integer userId;
 
+
+
 }

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

@@ -27,4 +27,10 @@ public class DistributorCategorySaveReqVO {
     @Schema(description = "所属销售id")
     private Integer userId;
 
+    @Schema(description = "区域")
+    private Integer marketArea;
+
+    @Schema(description = "分组类型")
+    private Integer groupType;
+
 }

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/dataobject/distributor/DistributorDO.java

@@ -55,6 +55,10 @@ public class DistributorDO extends TenantBaseDO {
      * 分销商分组ID
      */
     private Long otaCategoryId;
+    /**
+     * 财务分组ID
+     */
+    private Long financeCategoryId;
     /**
      * 全称
      */

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/dataobject/distributorcategory/DistributorCategoryDO.java

@@ -49,4 +49,14 @@ public class DistributorCategoryDO extends BaseDO {
      */
     private Integer userId;
 
+    /**
+     * 区域
+     */
+    private Integer marketArea;
+
+    /**
+     * 分组类型
+     */
+    private Integer groupType;
+
 }

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

@@ -24,7 +24,7 @@ public interface DistributorCategoryMapper extends BaseMapperX<DistributorCatego
                 .eqIfPresent(DistributorCategoryDO::getSortNum, reqVO.getSortNum())
                 .eqIfPresent(DistributorCategoryDO::getUseStatus, reqVO.getUseStatus())
                 .betweenIfPresent(DistributorCategoryDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DistributorCategoryDO::getId));
+                .orderByDesc(DistributorCategoryDO::getSortNum));
     }
 
 }

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

@@ -55,5 +55,5 @@ public interface DistributorCategoryService {
 
     void updateStatus(Long id, Integer status);
 
-    List<DistributorCategoryDO> getCategoryList();
+    List<DistributorCategoryDO> getCategoryList(Integer groupType);
 }

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

@@ -87,8 +87,9 @@ public class DistributorCategoryServiceImpl implements DistributorCategoryServic
     }
 
     @Override
-    public List<DistributorCategoryDO> getCategoryList() {
+    public List<DistributorCategoryDO> getCategoryList(Integer groupType) {
         return  distributorCategoryMapper.selectList(new LambdaQueryWrapperX<DistributorCategoryDO>()
+                .eq(DistributorCategoryDO::getGroupType, groupType)
                 .eq(DistributorCategoryDO::getUseStatus, 1)
                 .eq(DistributorCategoryDO::getDeleted, 0));
     }