Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhuyifan
2025-03-06 14:41:54 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4e1da304e16dc31d4b330f5898ad00f6d43d1dbe
4e1da304
1 parent
dd2ff426
fix
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/client/PayServiceClient.java
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @
4e1da30
...
...
@@ -600,7 +600,7 @@ public class OrderServiceRpcClient {
.
build
());
if
(
orderResponse
.
getIsCreated
())
{
// 用餐时间为当天,并且非在线支付餐单,发送消息给客户端
if
(
createOrderDto
.
getMealTime
().
toLocalDate
().
equals
(
LocalDate
.
now
())
&&
menuById
.
getResponse
().
getOrderRuleJson
().
getModeOfPayment
()
=
=
ModeOfPaymentEnum
.
ONLINE
)
{
if
(
createOrderDto
.
getMealTime
().
toLocalDate
().
equals
(
LocalDate
.
now
())
&&
menuById
.
getResponse
().
getOrderRuleJson
().
getModeOfPayment
()
!
=
ModeOfPaymentEnum
.
ONLINE
)
{
final
var
orderCreateSuccessData
=
OrderCreateSuccessData
.
builder
()
.
orderId
(
orderResponse
.
getId
())
.
build
();
...
...
src/main/java/com/infoloop/tianting/service/client/PayServiceClient.java
View file @
4e1da30
...
...
@@ -120,7 +120,7 @@ public class PayServiceClient {
}
}
public
boolean
callback
(
PaymentCallbackDTO
paymentCallbackDTO
)
{
public
boolean
callback
(
PaymentCallbackDTO
paymentCallbackDTO
)
{
log
.
info
(
"callback request received: {}"
,
paymentCallbackDTO
);
try
{
final
var
paymentCallbackResult
=
xmlMapper
.
readValue
(
paymentCallbackDTO
.
getPayResult
(),
PaymentCallbackResult
.
class
);
...
...
@@ -157,6 +157,7 @@ public class PayServiceClient {
.
setShouldUpdatePayTime
(
true
).
setPayTime
(
payTime
)
.
setShouldUpdatePayPrice
(
true
).
setPayPrice
(
realAmount
.
multiply
(
new
BigDecimal
(
"100"
)).
intValue
())
.
setShouldUpdatePayStatus
(
true
).
setPayStatus
(
PayStatusEnum
.
SUCCEED
)
.
setShouldUpdateStatus
(
true
).
setStatus
(
OrderStatusEnum
.
PREPARING
)
.
setShouldUpdateTransactionId
(
true
).
setTransactionId
(
paymentCallbackResult
.
getTransSN
())
.
build
();
final
var
updateResponse
=
orderServiceRpcClient
.
updateClientCustomerOrderPaymentResult
(
orderById
,
build
);
...
...
Please
register
or
login
to post a comment