update 经销商

@@ -14,7 +14,6 @@ import java.time.LocalDate;
 public class DealerAddReq {
 public class DealerAddReq {
 
 
     @NotBlank(message = "经销商编码不能为空")
     @NotBlank(message = "经销商编码不能为空")
-    @Pattern(regexp = "^[A-Z0-9]{6,20}$", message = "经销商编码格式不正确，应为6-20位大写字母和数字")
     @Schema(description = "经销商编码", required = true)
     @Schema(description = "经销商编码", required = true)
     private String dealerCode;
     private String dealerCode;
 
 

@@ -18,7 +18,6 @@ public class DealerUpdateReq {
     private Long dealerId;
     private Long dealerId;
 
 
     @NotBlank(message = "经销商编码不能为空")
     @NotBlank(message = "经销商编码不能为空")
-    @Pattern(regexp = "^[A-Z0-9]{6,20}$", message = "经销商编码格式不正确，应为6-20位大写字母和数字")
     @Schema(description = "经销商编码", required = true)
     @Schema(description = "经销商编码", required = true)
     private String dealerCode;
     private String dealerCode;
 
 

@@ -42,7 +42,7 @@
         <if test="params.rebateEndDate != null and params.rebateEndDate != ''">
         <if test="params.rebateEndDate != null and params.rebateEndDate != ''">
             AND rebate_date &lt;= #{params.rebateEndDate}
             AND rebate_date &lt;= #{params.rebateEndDate}
         </if>
         </if>
-        ORDER BY create_time DESC
+        ORDER BY rebate_date DESC
     </select>
     </select>
 
 
     <!-- 根据经销商编码统计返利总金额 -->
     <!-- 根据经销商编码统计返利总金额 -->

@@ -127,49 +127,49 @@ export interface ApiResponse<T = any> {
 // 经销商管理API
 // 经销商管理API
 export const dealerApi = {
 export const dealerApi = {
   // 分页查询经销商列表
   // 分页查询经销商列表
-  getDealerList: (params: DealerQueryReq) => {
+  getDealerList: (params: DealerQueryReq): Promise<ApiResponse<PageData<DealerInfo>>> => {
     return api.get<ApiResponse<PageData<DealerInfo>>>('/dealer/list', { params })
     return api.get<ApiResponse<PageData<DealerInfo>>>('/dealer/list', { params })
   },
   },
 
 
   // 获取经销商详情
   // 获取经销商详情
-  getDealerDetail: (dealerId: number) => {
+  getDealerDetail: (dealerId: number): Promise<ApiResponse<DealerInfo>> => {
     return api.get<ApiResponse<DealerInfo>>(`/dealer/${dealerId}`)
     return api.get<ApiResponse<DealerInfo>>(`/dealer/${dealerId}`)
   },
   },
 
 
   // 新增经销商
   // 新增经销商
-  addDealer: (data: DealerAddReq) => {
+  addDealer: (data: DealerAddReq): Promise<ApiResponse> => {
     return api.post<ApiResponse>('/dealer', data)
     return api.post<ApiResponse>('/dealer', data)
   },
   },
 
 
   // 修改经销商
   // 修改经销商
-  updateDealer: (data: DealerUpdateReq) => {
+  updateDealer: (data: DealerUpdateReq): Promise<ApiResponse> => {
     return api.post<ApiResponse>('/dealer/update', data)
     return api.post<ApiResponse>('/dealer/update', data)
   },
   },
 
 
   // 删除经销商
   // 删除经销商
-  deleteDealer: (dealerId: number) => {
+  deleteDealer: (dealerId: number): Promise<ApiResponse> => {
     return api.delete<ApiResponse>(`/dealer/${dealerId}`)
     return api.delete<ApiResponse>(`/dealer/${dealerId}`)
   },
   },
 
 
   // 批量删除经销商
   // 批量删除经销商
-  batchDeleteDealer: (dealerIds: number[]) => {
+  batchDeleteDealer: (dealerIds: number[]): Promise<ApiResponse> => {
     return api.delete<ApiResponse>('/dealer/batch', { data: dealerIds })
     return api.delete<ApiResponse>('/dealer/batch', { data: dealerIds })
   },
   },
 
 
   // 修改经销商合作状态
   // 修改经销商合作状态
-  updateCooperateStatus: (dealerId: number, cooperateStatus: number) => {
+  updateCooperateStatus: (dealerId: number, cooperateStatus: number): Promise<ApiResponse> => {
     return api.post<ApiResponse>(`/dealer/${dealerId}/cooperateStatus/${cooperateStatus}`)
     return api.post<ApiResponse>(`/dealer/${dealerId}/cooperateStatus/${cooperateStatus}`)
   },
   },
 
 
   // 修改经销商资质审核状态
   // 修改经销商资质审核状态
-  updateAuditStatus: (dealerId: number, qualificationAuditStatus: number, auditOpinion?: string) => {
+  updateAuditStatus: (dealerId: number, qualificationAuditStatus: number, auditOpinion?: string): Promise<ApiResponse> => {
     return api.post<ApiResponse>(`/dealer/${dealerId}/auditStatus`, null, {
     return api.post<ApiResponse>(`/dealer/${dealerId}/auditStatus`, null, {
       params: { qualificationAuditStatus, auditOpinion }
       params: { qualificationAuditStatus, auditOpinion }
     })
     })
   },
   },
 
 
   // 获取所有经销商（用于下拉选择）
   // 获取所有经销商（用于下拉选择）
-  getAllDealers: () => {
+  getAllDealers: (): Promise<ApiResponse<DealerInfo[]>> => {
     return api.get<ApiResponse<DealerInfo[]>>('/dealer/all')
     return api.get<ApiResponse<DealerInfo[]>>('/dealer/all')
   }
   }
 }
 }

 import request from '@/utils/request'
 import request from '@/utils/request'
 
 
+// API响应接口
+export interface ApiResponse<T = any> {
+  code: number
+  message: string
+  data: T
+}
+
+// 分页数据接口
+export interface PageData<T> {
+  records: T[]
+  total: number
+  pageNum: number
+  pageSize: number
+}
+
 // 返利台账明细类型定义
 // 返利台账明细类型定义
 export interface Rebate {
 export interface Rebate {
   rebateId?: number
   rebateId?: number
@@ -57,7 +72,7 @@ export interface RebateUpdateParams extends RebateAddParams {
 }
 }
 
 
 // 分页查询返利列表
 // 分页查询返利列表
-export const getRebatePage = (params: RebateSearchParams) => {
+export const getRebatePage = (params: RebateSearchParams): Promise<ApiResponse<PageData<Rebate>>> => {
   return request({
   return request({
     url: '/api/rebate/page',
     url: '/api/rebate/page',
     method: 'post',
     method: 'post',