Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
8d1747d5
Commit
8d1747d5
authored
Jul 22, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
维护基础服务新增字段
parent
c726832c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+3
-0
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
+3
-0
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
+2
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
8d1747d5
...
@@ -1149,6 +1149,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -1149,6 +1149,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setAfterSalesCode
(
cancelOrderRequest
.
getAfterSalesCode
());
request
.
setAfterSalesCode
(
cancelOrderRequest
.
getAfterSalesCode
());
request
.
setAdultRemark
(
cancelOrderRequest
.
getReason
());
request
.
setAdultRemark
(
cancelOrderRequest
.
getReason
());
request
.
setOperator
(
cancelOrderRequest
.
getOperator
());
request
.
setOperator
(
cancelOrderRequest
.
getOperator
());
request
.
setOperationClient
(
cancelOrderRequest
.
getOperationClient
());
if
(
Objects
.
equals
(
NewOrderStatus
.
ACCEPTED
.
getIndex
(),
cancelOrderRequest
.
getStatusV2
())){
if
(
Objects
.
equals
(
NewOrderStatus
.
ACCEPTED
.
getIndex
(),
cancelOrderRequest
.
getStatusV2
())){
StoreResponse
.
Configuration
configuration
=
getStoreAutoConfiguration
(
cancelOrderRequest
.
getPartnerId
(),
cancelOrderRequest
.
getStoreId
(),
cancelOrderRequest
.
getTrackingNo
());
StoreResponse
.
Configuration
configuration
=
getStoreAutoConfiguration
(
cancelOrderRequest
.
getPartnerId
(),
cancelOrderRequest
.
getStoreId
(),
cancelOrderRequest
.
getTrackingNo
());
if
(
configuration
!=
null
)
{
if
(
configuration
!=
null
)
{
...
@@ -2311,6 +2312,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -2311,6 +2312,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setAfterSerialNo
(
baseQueryOrderRequest
.
getRefundSerialNo
());
request
.
setAfterSerialNo
(
baseQueryOrderRequest
.
getRefundSerialNo
());
request
.
setAdultRemark
(
baseQueryOrderRequest
.
getReason
());
request
.
setAdultRemark
(
baseQueryOrderRequest
.
getReason
());
request
.
setOperator
(
baseQueryOrderRequest
.
getOperator
());
request
.
setOperator
(
baseQueryOrderRequest
.
getOperator
());
request
.
setOperationClient
(
baseQueryOrderRequest
.
getOperationClient
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
OrderBaseResp
response
=
orderSdkService
.
adultApproveAgreeApply
(
request
,
baseQueryOrderRequest
.
getTrackingNo
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
OrderBaseResp
response
=
orderSdkService
.
adultApproveAgreeApply
(
request
,
baseQueryOrderRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
...
@@ -2341,6 +2343,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -2341,6 +2343,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setAfterSalesCode
(
cancelOrderRequest
.
getAfterSalesCode
());
request
.
setAfterSalesCode
(
cancelOrderRequest
.
getAfterSalesCode
());
request
.
setAdultRemark
(
cancelOrderRequest
.
getReason
());
request
.
setAdultRemark
(
cancelOrderRequest
.
getReason
());
request
.
setOperator
(
cancelOrderRequest
.
getOperator
());
request
.
setOperator
(
cancelOrderRequest
.
getOperator
());
request
.
setOperationClient
(
cancelOrderRequest
.
getOperationClient
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
OrderBaseResp
response
=
orderSdkService
.
adultReject
(
request
,
cancelOrderRequest
.
getTrackingNo
());
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
OrderBaseResp
response
=
orderSdkService
.
adultReject
(
request
,
cancelOrderRequest
.
getTrackingNo
());
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
return
orderSdkAdapter
.
convent2BaseOrderResponse
(
response
);
}
}
...
...
order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java
View file @
8d1747d5
...
@@ -74,6 +74,7 @@ public class MallOrderHandle {
...
@@ -74,6 +74,7 @@ public class MallOrderHandle {
*/
*/
public
BaseResponse
refundReject
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
public
BaseResponse
refundReject
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
rejectRefundRequest
.
setOperationClient
(
request
.
getOperationClient
());
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
...
@@ -90,6 +91,7 @@ public class MallOrderHandle {
...
@@ -90,6 +91,7 @@ public class MallOrderHandle {
*/
*/
public
BaseResponse
mallOrderAgreeApply
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
public
BaseResponse
mallOrderAgreeApply
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
BaseQueryOrderRequest
refundAgreeRequest
=
orderSdkAdapter
.
getRefundAgreeRequest
(
""
,
request
.
getReason
(),
request
.
getOperator
(),
orderBean
);
BaseQueryOrderRequest
refundAgreeRequest
=
orderSdkAdapter
.
getRefundAgreeRequest
(
""
,
request
.
getReason
(),
request
.
getOperator
(),
orderBean
);
refundAgreeRequest
.
setOperationClient
(
request
.
getOperationClient
());
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallOrderAgreeApply
(
refundAgreeRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallOrderAgreeApply
(
refundAgreeRequest
);
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
AGREE_REFUND_APPLY_ORDER_FAIL
);
return
ResponseUtil
.
error
(
ResponseResult
.
AGREE_REFUND_APPLY_ORDER_FAIL
);
...
@@ -105,6 +107,7 @@ public class MallOrderHandle {
...
@@ -105,6 +107,7 @@ public class MallOrderHandle {
*/
*/
public
BaseResponse
mallRefundReject
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
public
BaseResponse
mallRefundReject
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
rejectRefundRequest
.
setOperationClient
(
request
.
getOperationClient
());
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallOrderRefundReject
(
rejectRefundRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
mallOrderRefundReject
(
rejectRefundRequest
);
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
...
...
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
View file @
8d1747d5
...
@@ -293,6 +293,7 @@ public class SaasOrderHandle {
...
@@ -293,6 +293,7 @@ public class SaasOrderHandle {
*/
*/
public
BaseResponse
refundReject
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
public
BaseResponse
refundReject
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
CancelOrderRequest
rejectRefundRequest
=
orderSdkAdapter
.
getRejectRefundRequest
(
request
.
getOperator
(),
request
.
getReason
(),
orderBean
);
rejectRefundRequest
.
setOperationClient
(
request
.
getOperationClient
());
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_REFUND_ORDER_FAIL
);
...
@@ -313,6 +314,7 @@ public class SaasOrderHandle {
...
@@ -313,6 +314,7 @@ public class SaasOrderHandle {
if
(
RefundStatusV1
.
APPLY_REFUND
.
getCodeV1
().
equals
(
orderBean
.
getRefundList
().
get
(
i
).
getStatus
()))
{
if
(
RefundStatusV1
.
APPLY_REFUND
.
getCodeV1
().
equals
(
orderBean
.
getRefundList
().
get
(
i
).
getStatus
()))
{
rejectRefundRequest
.
setAfterSalesCode
(
orderBean
.
getRefundList
().
get
(
i
).
getRid
());
rejectRefundRequest
.
setAfterSalesCode
(
orderBean
.
getRefundList
().
get
(
i
).
getRid
());
rejectRefundRequest
.
setOperationClient
(
request
.
getOperationClient
());
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
baseOrderResponse
=
orderCenterSdkService
.
orderRefundReject
(
rejectRefundRequest
);
}
}
if
(
RefundStatusV1
.
COMPLETE_REFUND
.
getCodeV1
().
equals
(
orderBean
.
getRefundList
().
get
(
i
).
getStatus
()))
{
if
(
RefundStatusV1
.
COMPLETE_REFUND
.
getCodeV1
().
equals
(
orderBean
.
getRefundList
().
get
(
i
).
getStatus
()))
{
...
...
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