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-11-17 10:44:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e63c3acbe19c53f28379a47aabad994482e2eef0
e63c3acb
1 parent
32dce8b4
fix(order): optimize dish replacement logic and update payment transaction ID
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletions
src/main/java/com/infoloop/tianting/model/dto/PaymentCallbackResult.java
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/model/dto/PaymentCallbackResult.java
View file @
e63c3ac
...
...
@@ -18,6 +18,9 @@ public class PaymentCallbackResult {
@JacksonXmlProperty
(
localName
=
"TransSN"
)
private
String
transSN
;
@JacksonXmlProperty
(
localName
=
"TradeReferenceNo"
)
private
String
tradeReferenceNo
;
@JacksonXmlProperty
(
localName
=
"TransType"
)
private
String
transType
;
...
...
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @
e63c3ac
...
...
@@ -396,6 +396,9 @@ public class OrderServiceRpcClient {
// 替换菜品的操作记录
List
<
SingleOperationDto
>
operations
=
new
ArrayList
<>();
for
(
OrderDetailDto
originalDetail
:
originalOrderDetails
)
{
if
(!
idsOfNeedUpdateMenuDetails
.
contains
(
originalDetail
.
getId
())
&&
!
idsOfAddCount
.
contains
(
originalDetail
.
getId
()))
{
continue
;
}
OrderOperationType
orderOperationType
=
OrderOperationType
.
UNKNOWN_OPERATION_TYPE
;
if
(
idsOfNeedUpdateMenuDetails
.
contains
(
originalDetail
.
getId
()))
{
orderOperationType
=
OrderOperationType
.
REPLACE_DISHES
;
...
...
src/main/java/com/infoloop/tianting/service/client/PayServiceClient.java
View file @
e63c3ac
...
...
@@ -201,7 +201,7 @@ public class PayServiceClient {
.
setShouldUpdateStatus
(
true
)
.
setStatus
(
OrderStatusEnum
.
PREPARING
)
.
setShouldUpdateTransactionId
(
true
)
.
setTransactionId
(
paymentCallbackResult
.
getTra
nsSN
())
.
setTransactionId
(
paymentCallbackResult
.
getTra
deReferenceNo
())
.
build
();
final
var
updateResponse
=
orderServiceRpcClient
.
updateClientCustomerOrderPaymentResult
(
orderById
,
build
);
...
...
Please
register
or
login
to post a comment