Toggle navigation
Toggle navigation
This project
Loading...
Sign in
zhouhui.jiang
/
test_cursor
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zhouhui.jiang
2025-10-13 14:49:07 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2bf069faa4bb8845c77c19cec6de44d66ede82ee
2bf069fa
1 parent
8c919b54
update 经销商
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
13 deletions
backend/src/main/java/com/apple/erp/dto/DealerAddReq.java
backend/src/main/java/com/apple/erp/dto/DealerUpdateReq.java
backend/src/main/resources/mapper/RebateMapper.xml
frontend/src/api/dealer.ts
frontend/src/api/rebate.ts
frontend/src/views/dealer/index.vue
backend/src/main/java/com/apple/erp/dto/DealerAddReq.java
View file @
2bf069f
...
...
@@ -14,7 +14,6 @@ import java.time.LocalDate;
public
class
DealerAddReq
{
@NotBlank
(
message
=
"经销商编码不能为空"
)
@Pattern
(
regexp
=
"^[A-Z0-9]{6,20}$"
,
message
=
"经销商编码格式不正确,应为6-20位大写字母和数字"
)
@Schema
(
description
=
"经销商编码"
,
required
=
true
)
private
String
dealerCode
;
...
...
backend/src/main/java/com/apple/erp/dto/DealerUpdateReq.java
View file @
2bf069f
...
...
@@ -18,7 +18,6 @@ public class DealerUpdateReq {
private
Long
dealerId
;
@NotBlank
(
message
=
"经销商编码不能为空"
)
@Pattern
(
regexp
=
"^[A-Z0-9]{6,20}$"
,
message
=
"经销商编码格式不正确,应为6-20位大写字母和数字"
)
@Schema
(
description
=
"经销商编码"
,
required
=
true
)
private
String
dealerCode
;
...
...
backend/src/main/resources/mapper/RebateMapper.xml
View file @
2bf069f
...
...
@@ -42,7 +42,7 @@
<if
test=
"params.rebateEndDate != null and params.rebateEndDate != ''"
>
AND rebate_date
<
= #{params.rebateEndDate}
</if>
ORDER BY
create_tim
e DESC
ORDER BY
rebate_dat
e DESC
</select>
<!-- 根据经销商编码统计返利总金额 -->
...
...
frontend/src/api/dealer.ts
View file @
2bf069f
...
...
@@ -127,49 +127,49 @@ export interface ApiResponse<T = any> {
// 经销商管理API
export
const
dealerApi
=
{
// 分页查询经销商列表
getDealerList
:
(
params
:
DealerQueryReq
)
=>
{
getDealerList
:
(
params
:
DealerQueryReq
)
:
Promise
<
ApiResponse
<
PageData
<
DealerInfo
>>>
=>
{
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
}
`
)
},
// 新增经销商
addDealer
:
(
data
:
DealerAddReq
)
=>
{
addDealer
:
(
data
:
DealerAddReq
)
:
Promise
<
ApiResponse
>
=>
{
return
api
.
post
<
ApiResponse
>
(
'/dealer'
,
data
)
},
// 修改经销商
updateDealer
:
(
data
:
DealerUpdateReq
)
=>
{
updateDealer
:
(
data
:
DealerUpdateReq
)
:
Promise
<
ApiResponse
>
=>
{
return
api
.
post
<
ApiResponse
>
(
'/dealer/update'
,
data
)
},
// 删除经销商
deleteDealer
:
(
dealerId
:
number
)
=>
{
deleteDealer
:
(
dealerId
:
number
)
:
Promise
<
ApiResponse
>
=>
{
return
api
.
delete
<
ApiResponse
>
(
`/dealer/
${
dealerId
}
`
)
},
// 批量删除经销商
batchDeleteDealer
:
(
dealerIds
:
number
[])
=>
{
batchDeleteDealer
:
(
dealerIds
:
number
[])
:
Promise
<
ApiResponse
>
=>
{
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
}
`
)
},
// 修改经销商资质审核状态
updateAuditStatus
:
(
dealerId
:
number
,
qualificationAuditStatus
:
number
,
auditOpinion
?:
string
)
=>
{
updateAuditStatus
:
(
dealerId
:
number
,
qualificationAuditStatus
:
number
,
auditOpinion
?:
string
)
:
Promise
<
ApiResponse
>
=>
{
return
api
.
post
<
ApiResponse
>
(
`/dealer/
${
dealerId
}
/auditStatus`
,
null
,
{
params
:
{
qualificationAuditStatus
,
auditOpinion
}
})
},
// 获取所有经销商(用于下拉选择)
getAllDealers
:
()
=>
{
getAllDealers
:
()
:
Promise
<
ApiResponse
<
DealerInfo
[]
>>
=>
{
return
api
.
get
<
ApiResponse
<
DealerInfo
[]
>>
(
'/dealer/all'
)
}
}
...
...
frontend/src/api/rebate.ts
View file @
2bf069f
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
{
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
({
url
:
'/api/rebate/page'
,
method
:
'post'
,
...
...
frontend/src/views/dealer/index.vue
View file @
2bf069f
This diff is collapsed. Click to expand it.
Please
register
or
login
to post a comment