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
8aa4929c
Commit
8aa4929c
authored
Dec 13, 2020
by
刘鹏飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加点日志
parent
bc12229c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+6
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-6
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
8aa4929c
...
...
@@ -323,12 +323,14 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
BaseResponse
<
GetMemberExtendInfoResponse
>
extendInfo
=
new
BaseResponse
();
try
{
QueryByCodeResponse
codeResponse
=
orderSdkService
.
getOrderInfo
(
confirmOrderRequest
.
getProductOrderCode
(),
0
,
confirmOrderRequest
.
getTrackingNo
());
ApiLog
.
info
(
"支付成功1"
,
confirmOrderRequest
.
getProductOrderCode
(),
codeResponse
);
orderByIdResponse
=
orderSdkAdapter
.
convent2QueryOrderByIdResponse
(
codeResponse
);
GetMemberExtendInfoRequest
extendInfoRequest
=
new
GetMemberExtendInfoRequest
();
extendInfoRequest
.
setMemberId
(
orderByIdResponse
.
getData
().
getUserId
());
extendInfoRequest
.
setPartnerId
(
orderByIdResponse
.
getData
().
getCompanyId
());
extendInfo
=
memberCenterService
.
getMemberExtendInfo
(
extendInfoRequest
,
confirmOrderRequest
.
getTrackingNo
());
ApiLog
.
info
(
"支付成功2"
,
extendInfoRequest
,
extendInfo
);
OrderExtInfoDto
extInfoDTO
=
JSONObject
.
parseObject
(
orderByIdResponse
.
getData
().
getExtInfo
(),
OrderExtInfoDto
.
class
);
extInfoDTO
.
setMemberLevel
(
extendInfo
.
getData
().
getMemberGrade
()!=
null
?
extendInfo
.
getData
().
getMemberGrade
().
getRuleName
():
""
);
extInfoDTO
.
setPaidMember
(
CollectionUtils
.
isNotEmpty
(
extendInfo
.
getData
().
getMemberPaids
()));
...
...
@@ -341,11 +343,14 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
ErrorLog
.
printErrorLog
(
"getMemberExtendInfoError"
,
MEMBER_EXTEND_INFO
,
confirmOrderRequest
,
e
);
}
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
<
PaySuccessResp
>
response
=
orderSdkService
.
paySuccess
(
request
,
confirmOrderRequest
.
getTrackingNo
());
ApiLog
.
info
(
"支付成功3"
,
request
,
response
);
//获取会员信息失败直接返回,非空判断
if
(
extendInfo
.
getData
()
==
null
){
ApiLog
.
info
(
"支付成功4"
,
response
,
""
);
return
orderSdkAdapter
.
convent2PayAccessResponse
(
response
);
}
ApiLog
.
info
(
"支付成功5"
,
response
,
""
);
return
orderSdkAdapter
.
convent2PayAccessResponse
(
response
);
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
8aa4929c
...
...
@@ -442,7 +442,6 @@ public class OrderServiceImpl implements Orderservice {
}
@Override
public
String
paySuccessCallback
(
PaysuccessNoticeMessage
message
,
ConfirmOrderDto
confirmOrderDto
,
Map
<
String
,
QueryOrdersResponseDto
.
DataBean
.
OrderBean
>
orderBeans
)
{
ApiLog
.
info
(
"支付成功清空购物车1,confirmOrderDto,orderBeans"
,
confirmOrderDto
,
orderBeans
);
OrderBean
orderBean
=
orderBeans
.
get
(
OrderBeanType
.
SAASORDER
.
getCode
());
String
oid
=
StringUtils
.
isNotEmpty
(
orderBean
.
getParentCode
())
&&
!
"0"
.
equals
(
orderBean
.
getParentCode
())
?
orderBean
.
getParentCode
()
:
orderBean
.
getOid
();
String
partnerId
=
orderBean
.
getCompanyId
();
...
...
@@ -506,17 +505,13 @@ public class OrderServiceImpl implements Orderservice {
JSONObject
jsonObject2
=
JSONObject
.
parseObject
(
string2
);
payAccessResponse
=
jsonObject2
.
toJavaObject
(
PayAccessResponse
.
class
);
// 添加幂等处理,若订单是已支付成功状态,直接返回成功
ApiLog
.
info
(
"支付成功清空购物车2"
,
var1
,
payAccessRes
);
if
(!
RESPONSE_SUCCESS_CODE
.
equals
(
payAccessResponse
.
getErrcode
()))
{
OrderBean
saasOrder
=
getOrderBeanByOrderId
(
confirmOrderDto
.
getOrderId
()).
get
(
OrderBeanType
.
SAASORDER
.
getCode
());
ApiLog
.
info
(
"支付成功清空购物车3"
,
confirmOrderDto
,
saasOrder
);
if
(
saasOrder
!=
null
&&
(!
PayStatus
.
NOT_PAY
.
getCode
().
equals
(
saasOrder
.
getPayStatus
())
||
!
OrderStatus
.
WAIT_PAY
.
getCode
().
equals
(
saasOrder
.
getStatus
())))
{
ApiLog
.
info
(
"支付成功清空购物车4"
);
return
sendPaySuccessNoticeMessage
();
}
LogUtil
.
error
(
"paySuccessCallback_payAccess_faild"
,
gson
.
toJson
(
confirmOrderDto
),
gson
.
toJson
(
payAccessResponse
));
//orderRefund(orderBean, "订单异常退款", openid, oid);
ApiLog
.
info
(
"支付成功清空购物车5"
,
message
,
""
);
return
gson
.
toJson
(
message
);
}
// TODO 订单序号替换取餐码显示
...
...
@@ -531,7 +526,6 @@ public class OrderServiceImpl implements Orderservice {
newShoppingCartClearDto
.
setAppId
(
wxappid
);
newShoppingCartClearDto
.
setSessionId
(
sessionId
);
newShoppingCartClearDto
.
setOperationType
(
1
);
ApiLog
.
info
(
"支付成功清空购物车6,newShoppingCartClearDto"
,
newShoppingCartClearDto
,
""
);
shoppingCartClient
.
clearShoppingCart
(
newShoppingCartClearDto
);
// 清空拼单购物车
...
...
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