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
jenkins
order-group
Commits
35c319b8
Commit
35c319b8
authored
Dec 26, 2019
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
扫脸支付修改
parent
09d25a80
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-3
order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
35c319b8
...
@@ -2173,7 +2173,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2173,7 +2173,6 @@ public class OrderServiceImpl implements Orderservice {
long
totalAmount
=
0
;
long
totalAmount
=
0
;
int
cardAmount
=
0
;
int
cardAmount
=
0
;
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
=
new
QueryOrdersResponse
.
DataBean
.
OrderBean
();
QueryOrdersResponse
.
DataBean
.
OrderBean
fatherBeanListOne
=
new
QueryOrdersResponse
.
DataBean
.
OrderBean
();
QueryOrdersResponse
.
DataBean
.
OrderBean
fatherBeanListOne
=
new
QueryOrdersResponse
.
DataBean
.
OrderBean
();
QueryOrdersResponse
.
DataBean
.
OrderBean
productBeanListOne
=
new
QueryOrdersResponse
.
DataBean
.
OrderBean
();
QueryOrdersResponse
.
DataBean
.
OrderBean
productBeanListOne
=
new
QueryOrdersResponse
.
DataBean
.
OrderBean
();
if
(
createOrderVo
.
getBuyMemberCard
()
!=
null
&&
StringUtils
.
isNotEmpty
(
createOrderVo
.
getBuyMemberCard
().
getRuleId
())
&&
StringUtils
.
isNotEmpty
(
createOrderVo
.
getBuyMemberCard
().
getPaidId
()))
{
if
(
createOrderVo
.
getBuyMemberCard
()
!=
null
&&
StringUtils
.
isNotEmpty
(
createOrderVo
.
getBuyMemberCard
().
getRuleId
())
&&
StringUtils
.
isNotEmpty
(
createOrderVo
.
getBuyMemberCard
().
getPaidId
()))
{
...
@@ -2201,7 +2200,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2201,7 +2200,7 @@ public class OrderServiceImpl implements Orderservice {
}
}
fatherBeanListOne
=
createOrderFlowResponse
.
getData
();
fatherBeanListOne
=
createOrderFlowResponse
.
getData
();
productBeanListOne
=
createOrderFlowResponse
.
getData
();
productBeanListOne
=
createOrderFlowResponse
.
getData
();
totalAmount
=
orderBean
.
getAmount
();
totalAmount
=
productBeanListOne
.
getAmount
();
}
}
response
.
setTotalAmount
(
totalAmount
);
response
.
setTotalAmount
(
totalAmount
);
response
.
setCardAmount
(
cardAmount
);
response
.
setCardAmount
(
cardAmount
);
...
@@ -2224,7 +2223,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2224,7 +2223,7 @@ public class OrderServiceImpl implements Orderservice {
throw
new
ServiceException
(
ResponseResult
.
PAY_AMOUNT_ERROR
);
throw
new
ServiceException
(
ResponseResult
.
PAY_AMOUNT_ERROR
);
}
}
//唤起微信支付
//唤起微信支付
if
(
totalAmount
>
0
&&
StringUtils
.
isBlank
(
createOrderVo
.
getCardCode
())
&&
StringUtils
.
is
Not
Blank
(
createOrderVo
.
getFaceCode
()))
{
if
(
totalAmount
>
0
&&
StringUtils
.
isBlank
(
createOrderVo
.
getCardCode
())
&&
StringUtils
.
isBlank
(
createOrderVo
.
getFaceCode
()))
{
orderPayResponse
=
getPreOrderPay
(
fatherBeanListOne
,
paymentRequest
,
LogThreadLocal
.
getTrackingNo
(),
cardAmount
);
orderPayResponse
=
getPreOrderPay
(
fatherBeanListOne
,
paymentRequest
,
LogThreadLocal
.
getTrackingNo
(),
cardAmount
);
return
orderPayResponse
;
return
orderPayResponse
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
View file @
35c319b8
...
@@ -26,7 +26,7 @@ public interface PaymentNewClient {
...
@@ -26,7 +26,7 @@ public interface PaymentNewClient {
/**
/**
* 扫脸支付
* 扫脸支付
*/
*/
@PostMapping
(
"
/paymentcenter/face
"
)
@PostMapping
(
"
paymentcenter/facePay
"
)
com
.
freemud
.
application
.
sdk
.
api
.
base
.
BaseResponse
<
FacePayResponseDto
>
facePay
(
@RequestBody
FacePayRequestDto
orderPayDto
);
com
.
freemud
.
application
.
sdk
.
api
.
base
.
BaseResponse
<
FacePayResponseDto
>
facePay
(
@RequestBody
FacePayRequestDto
orderPayDto
);
}
}
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