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
88107041
Commit
88107041
authored
May 14, 2020
by
shuhu.hou@freemud.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付回调存储endTransId到extInfo字段
parent
0715140c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
+10
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
View file @
88107041
...
@@ -49,12 +49,20 @@ public class ConfirmOrderRequest extends BaseConfig {
...
@@ -49,12 +49,20 @@ public class ConfirmOrderRequest extends BaseConfig {
* 自定义字段
* 自定义字段
*/
*/
private
String
extInfo
;
private
String
extInfo
;
//操作人
/**
* 操作人
*/
private
String
operator
;
private
String
operator
;
private
List
<
OrderSettlement
>
orderSettlements
;
private
List
<
OrderSettlement
>
orderSettlements
;
//用户预约时间,仅为预约单时存放
/**
* 用户预约时间,仅为预约单时存放
*/
private
String
expectTime
;
private
String
expectTime
;
/**
* 渠道方流水号 (比如扫呗,易宝等) 新支付服务做中转使用
*/
private
String
endTransId
;
@Data
@Data
public
static
class
OrderSettlement
{
public
static
class
OrderSettlement
{
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
88107041
...
@@ -275,6 +275,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -275,6 +275,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
extInfoDTO
.
setPaidMember
(
CollectionUtils
.
isNotEmpty
(
extendInfo
.
getData
().
getMemberPaids
()));
extInfoDTO
.
setPaidMember
(
CollectionUtils
.
isNotEmpty
(
extendInfo
.
getData
().
getMemberPaids
()));
extInfoDTO
.
setPayTransId
(
confirmOrderRequest
.
getPayTransId
());
extInfoDTO
.
setPayTransId
(
confirmOrderRequest
.
getPayTransId
());
extInfoDTO
.
setPayDate
(
confirmOrderRequest
.
getPayDate
());
extInfoDTO
.
setPayDate
(
confirmOrderRequest
.
getPayDate
());
extInfoDTO
.
setEndTransId
(
confirmOrderRequest
.
getEndTransId
());
request
.
setExtInfo
(
JSON
.
toJSONString
(
extInfoDTO
));
request
.
setExtInfo
(
JSON
.
toJSONString
(
extInfoDTO
));
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
ErrorLog
.
printErrorLog
(
"getMemberExtendInfoError"
,
MEMBER_EXTEND_INFO
,
confirmOrderRequest
,
e
);
ErrorLog
.
printErrorLog
(
"getMemberExtendInfoError"
,
MEMBER_EXTEND_INFO
,
confirmOrderRequest
,
e
);
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
88107041
...
@@ -398,6 +398,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -398,6 +398,7 @@ public class OrderServiceImpl implements Orderservice {
var1
.
setPayDate
(
DateUtil
.
convert2String
(
new
Date
(),
"yyyy-MM-dd HH:mm:ss"
));
var1
.
setPayDate
(
DateUtil
.
convert2String
(
new
Date
(),
"yyyy-MM-dd HH:mm:ss"
));
var1
.
setPayTransId
(
message
.
getOut_trade_no
());
var1
.
setPayTransId
(
message
.
getOut_trade_no
());
var1
.
setOperator
(
orderBean
.
getUserName
());
var1
.
setOperator
(
orderBean
.
getUserName
());
var1
.
setEndTransId
(
message
.
getEndTransId
());
if
(
orderBean
.
getGmtExpect
()
!=
null
&&
orderBean
.
getGmtExpect
()
!=
0
){
if
(
orderBean
.
getGmtExpect
()
!=
null
&&
orderBean
.
getGmtExpect
()
!=
0
){
var1
.
setExpectTime
(
DateUtil
.
convert2String
(
new
Date
(
orderBean
.
getGmtExpect
()),
DateUtil
.
FORMAT_YYYY_MM_DD_HHMMSS
));
var1
.
setExpectTime
(
DateUtil
.
convert2String
(
new
Date
(
orderBean
.
getGmtExpect
()),
DateUtil
.
FORMAT_YYYY_MM_DD_HHMMSS
));
}
}
...
...
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