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
947344c3
Commit
947344c3
authored
Aug 17, 2023
by
rui.zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
a42067fd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
+2
-0
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
+3
-0
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+4
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
View file @
947344c3
...
@@ -17,6 +17,7 @@ import cn.freemud.management.thirdparty.OMSPaymentClient;
...
@@ -17,6 +17,7 @@ import cn.freemud.management.thirdparty.OMSPaymentClient;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.freemud.application.sdk.api.base.BaseResponse
;
import
com.freemud.application.sdk.api.base.BaseResponse
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.CashTypeEnum
;
import
com.freemud.application.sdk.api.ordercenter.enums.CashTypeEnum
;
...
@@ -87,6 +88,7 @@ public class PaymentHandle {
...
@@ -87,6 +88,7 @@ public class PaymentHandle {
PayRefundResponse
multiRefundResponse
=
multiRefundService
.
multiRefund
(
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
(),
orderBean
.
getOid
(),
refundAmount
,
orderBean
.
getOrderPayItem
());
PayRefundResponse
multiRefundResponse
=
multiRefundService
.
multiRefund
(
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
(),
orderBean
.
getOid
(),
refundAmount
,
orderBean
.
getOrderPayItem
());
if
(
multiRefundResponse
!=
null
)
{
if
(
multiRefundResponse
!=
null
)
{
refundResponse
=
multiRefundResponse
;
refundResponse
=
multiRefundResponse
;
ApiLog
.
infoMessage
(
"getCommonPayRefundResponse---1, 返回json:{}"
,
JSONObject
.
toJSONString
(
refundResponse
));
}
else
{
}
else
{
OrderExtendedReq
extended
=
orderBean
.
getOrderExtended
();
OrderExtendedReq
extended
=
orderBean
.
getOrderExtended
();
if
(
StringUtils
.
isNotBlank
(
extended
.
getAgentPayerId
())
&&
!
Objects
.
equals
(
extended
.
getAgentPayerId
(),
orderBean
.
getUserId
()))
{
if
(
StringUtils
.
isNotBlank
(
extended
.
getAgentPayerId
())
&&
!
Objects
.
equals
(
extended
.
getAgentPayerId
(),
orderBean
.
getUserId
()))
{
...
...
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
View file @
947344c3
...
@@ -10,6 +10,8 @@ import cn.freemud.management.enums.ResponseResult;
...
@@ -10,6 +10,8 @@ import cn.freemud.management.enums.ResponseResult;
import
cn.freemud.management.intercept.OrderServiceException
;
import
cn.freemud.management.intercept.OrderServiceException
;
import
cn.freemud.management.util.ResponseUtil
;
import
cn.freemud.management.util.ResponseUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.freemud.application.sdk.api.log.ApiLog
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1
;
import
com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo
;
import
com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo
;
...
@@ -218,6 +220,7 @@ public class SaasOrderHandle {
...
@@ -218,6 +220,7 @@ public class SaasOrderHandle {
});
});
}
}
cancelOrderRequest
.
setPayRefundItemList
(
refundItemList
);
cancelOrderRequest
.
setPayRefundItemList
(
refundItemList
);
ApiLog
.
infoMessage
(
"orderReject---2, 返回json:{}"
,
JSONObject
.
toJSONString
(
cancelOrderRequest
));
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
orderReject
(
cancelOrderRequest
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
orderReject
(
cancelOrderRequest
);
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
baseOrderResponse
==
null
||
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
...
...
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
947344c3
...
@@ -222,6 +222,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -222,6 +222,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
}
}
//订单拒单
//订单拒单
ApiLog
.
infoMessage
(
"orderReject---1, 返回json:{}"
,
JSONObject
.
toJSONString
(
refundResponse
));
saasOrderHandle
.
orderReject
(
request
,
refundResponse
,
orderBean
);
saasOrderHandle
.
orderReject
(
request
,
refundResponse
,
orderBean
);
// 推送pos、微信消息中心
// 推送pos、微信消息中心
orderBaseService
.
sendMessage
(
orderBean
,
OperateType
.
ORDER_REJECT
,
request
.
getReason
());
orderBaseService
.
sendMessage
(
orderBean
,
OperateType
.
ORDER_REJECT
,
request
.
getReason
());
...
@@ -395,6 +397,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -395,6 +397,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
if
(
PAY_RETURN_FILTER_CODES
.
contains
(
baseResponse
.
getCode
()))
{
if
(
PAY_RETURN_FILTER_CODES
.
contains
(
baseResponse
.
getCode
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
getResponseResult
(
baseResponse
.
getCode
()));
return
ResponseUtil
.
error
(
ResponseResult
.
getResponseResult
(
baseResponse
.
getCode
()));
}
}
ApiLog
.
infoMessage
(
"商家取消订单失败, 请求json:{} 返回msg:{}"
,
JSONObject
.
toJSONString
(
orderBean
),
baseResponse
.
getMessage
());
emailAlertService
.
sendEmailAlert
(
"商家取消订单失败"
,
"请求json:"
+
JSONObject
.
toJSONString
(
orderBean
)
+
"返回msg:"
+
baseResponse
.
getMessage
());
emailAlertService
.
sendEmailAlert
(
"商家取消订单失败"
,
"请求json:"
+
JSONObject
.
toJSONString
(
orderBean
)
+
"返回msg:"
+
baseResponse
.
getMessage
());
return
ResponseUtil
.
error
(
ResponseResult
.
PARTNER_ORDER_CANCEL_ERROR
);
return
ResponseUtil
.
error
(
ResponseResult
.
PARTNER_ORDER_CANCEL_ERROR
);
}
}
...
...
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