liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jdsku冲突解决

Browse Source
This commit is contained in:
苏尹岚
2019-12-18 09:17:43 +08:00
parent 3feff96127 fc039600d5
commit 404a7b9040
15 changed files with 723 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/purchase/mtwm/order.go
View File

@@ -65,7 +65,7 @@ var (
fakeFinishedPickup: model.OrderStatusFinishedPickup,
fakeOrderAdjustFinished: model.OrderStatusAdjust,
fakeRefuseUserApplyCancel: model.OrderStatusUnlocked,
fakeRefuseUserApplyCancel: model.OrderStatusVendorRejectCancel,
fakeUserApplyCancel: model.OrderStatusApplyCancel,
fakeUserUndoApplyCancel: model.OrderStatusUndoApplyCancel,
fakeMerchantAgreeApplyCancel: model.OrderStatusCanceled,