Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
6fa1d9e8
Commit
6fa1d9e8
authored
Sep 14, 2024
by
shiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
平台换藏订单审核
parent
33f896ba
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
0 deletions
+49
-0
ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysExchangeApplyOrderController.java
.../ch/admin/controller/SysExchangeApplyOrderController.java
+15
-0
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysExchangeApplyOrderServiceImpl.java
.../wwdz/ch/admin/impl/SysExchangeApplyOrderServiceImpl.java
+17
-0
ch-admin-api/src/main/java/com/wwdz/ch/admin/service/SysExchangeApplyOrderService.java
...m/wwdz/ch/admin/service/SysExchangeApplyOrderService.java
+10
-0
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java
...dto/request/distribution/DistributionOrderRequestDto.java
+7
-0
No files found.
ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysExchangeApplyOrderController.java
View file @
6fa1d9e8
...
@@ -4,6 +4,7 @@ package com.wwdz.ch.admin.controller;
...
@@ -4,6 +4,7 @@ package com.wwdz.ch.admin.controller;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.wwdz.ch.admin.service.SysExchangeApplyOrderService
;
import
com.wwdz.ch.admin.service.SysExchangeApplyOrderService
;
import
com.wwdz.ch.core.type.Result
;
import
com.wwdz.ch.core.type.Result
;
import
com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto
;
import
com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto
;
import
com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto
;
import
com.xxdxxs.service.FormHandler
;
import
com.xxdxxs.service.FormHandler
;
import
com.xxdxxs.validation.Validator
;
import
com.xxdxxs.validation.Validator
;
...
@@ -27,6 +28,20 @@ public class SysExchangeApplyOrderController {
...
@@ -27,6 +28,20 @@ public class SysExchangeApplyOrderController {
SysExchangeApplyOrderService
sysExchangeApplyOrderService
;
SysExchangeApplyOrderService
sysExchangeApplyOrderService
;
@ApiOperation
(
value
=
"用户交换平台商品的换藏订单审核"
)
@PostMapping
(
"/handleExchangeOrderOfOfficialItem"
)
public
Result
handleExchangeOrderOfOfficialItem
(
@RequestBody
DistributionOrderRequestDto
dto
)
{
logger
.
info
(
"用户交换平台商品的换藏订单审核,请求参数:{}"
,
JSON
.
toJSONString
(
dto
));
Validator
validator
=
new
Validator
(
FormHandler
.
ofEntity
(
dto
));
validator
.
set
(
"distributionOrderId"
,
"换藏订单号"
).
must
().
string
()
.
set
(
"approved"
,
"是否通过标识"
).
must
().
number
()
.
end
();
if
(!
validator
.
isValid
())
{
return
Result
.
failed
(
validator
.
getErrorInfo
());
}
return
sysExchangeApplyOrderService
.
handleExchangeOrderOfOfficialItem
(
dto
);
}
@ApiOperation
(
value
=
"平台审核申请单"
)
@ApiOperation
(
value
=
"平台审核申请单"
)
@PostMapping
(
"/handleApplyOrder"
)
@PostMapping
(
"/handleApplyOrder"
)
...
...
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysExchangeApplyOrderServiceImpl.java
View file @
6fa1d9e8
...
@@ -21,6 +21,7 @@ import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
...
@@ -21,6 +21,7 @@ import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
import
com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao
;
import
com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao
;
import
com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDetailDao
;
import
com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDetailDao
;
import
com.wwdz.ch.db.domain.distribution.*
;
import
com.wwdz.ch.db.domain.distribution.*
;
import
com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto
;
import
com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto
;
import
com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto
;
import
com.xxdxxs.utils.EntityMapper
;
import
com.xxdxxs.utils.EntityMapper
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -67,6 +68,22 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
...
@@ -67,6 +68,22 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
WxAppletApi
wxAppletApi
;
WxAppletApi
wxAppletApi
;
@Override
public
Result
handleExchangeOrderOfOfficialItem
(
DistributionOrderRequestDto
dto
)
{
try
{
if
(
dto
.
getApproved
()
==
1
)
{
//通过
distributionOrderDao
.
updateState
(
dto
.
getDistributionOrderId
(),
DistributionEnum
.
DistributionOrderStateEnum
.
PRE_SEND
.
getCode
());
}
else
{
distributionOrderDao
.
updateState
(
dto
.
getDistributionOrderId
(),
DistributionEnum
.
DistributionOrderStateEnum
.
CANCEL
.
getCode
());
}
return
Result
.
success
();
}
catch
(
Exception
e
)
{
logger
.
error
(
"审核平台换藏订单 error:{}"
,
e
);
}
return
Result
.
failed
();
}
@Transactional
@Transactional
@Override
@Override
public
Result
handleApplyOrder
(
ExchangeApplyOrderRequestDto
dto
)
{
public
Result
handleApplyOrder
(
ExchangeApplyOrderRequestDto
dto
)
{
...
...
ch-admin-api/src/main/java/com/wwdz/ch/admin/service/SysExchangeApplyOrderService.java
View file @
6fa1d9e8
package
com.wwdz.ch.admin.service
;
package
com.wwdz.ch.admin.service
;
import
com.wwdz.ch.core.type.Result
;
import
com.wwdz.ch.core.type.Result
;
import
com.wwdz.ch.db.domain.distribution.DistributionOrder
;
import
com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto
;
import
com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto
;
import
com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto
;
public
interface
SysExchangeApplyOrderService
{
public
interface
SysExchangeApplyOrderService
{
/**
* 用户交换平台商品的换藏订单审核
* @param dto
* @return
*/
Result
handleExchangeOrderOfOfficialItem
(
DistributionOrderRequestDto
dto
);
/**
/**
* 处理申请单
* 处理申请单
...
...
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java
View file @
6fa1d9e8
...
@@ -59,6 +59,13 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
...
@@ -59,6 +59,13 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
*/
*/
private
String
identifyOrderId
;
private
String
identifyOrderId
;
/**
* 审核结果
* 0不通过
* 1通过
*/
private
Integer
approved
;
/**
/**
* 买方id
* 买方id
*/
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment