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

- 去掉两个没有用的状态OrderStatusFailed，OrderStatusRefund

Browse Source 
- 准备将OrderStatusDelivered合并至OrderStatusFinished
This commit is contained in:
gazebo
2019-04-19 15:02:38 +08:00
parent 893434e01e
commit 9f01129374
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -58,7 +58,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
err = c.Swtich2SelfDelivered(order, userName) err = c.Swtich2SelfDelivered(order, userName)
} }
if err == nil { if err == nil {
order.Status = model.OrderStatusDelivered order.Status = model.OrderStatusFinished
if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil { if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil {
globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName) globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName)
return err return err

3
business/model/const.go
View File

@@ -86,7 +86,6 @@ var (
OrderStatusDelivered: "送达", OrderStatusDelivered: "送达",
OrderStatusFinished: "完成", OrderStatusFinished: "完成",
OrderStatusCanceled: "取消", OrderStatusCanceled: "取消",
OrderStatusFailed: "失败",
} }
WaybillStatusName = map[int]string{ WaybillStatusName = map[int]string{
WaybillStatusUnknown: "一般事件", WaybillStatusUnknown: "一般事件",
@@ -180,8 +179,6 @@ const (
OrderStatusDelivered = 105 // 妥投 OrderStatusDelivered = 105 // 妥投
OrderStatusFinished = 110 // 订单已完成 OrderStatusFinished = 110 // 订单已完成
OrderStatusCanceled = 115 // 订单已取消 OrderStatusCanceled = 115 // 订单已取消
OrderStatusFailed = 120 // 订单已失败
OrderStatusRefund = 125 // 订单全额退款
) )
const ( const (

6
business/partner/purchase/jd/order.go
View File

@@ -23,9 +23,9 @@ var (
jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted, jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted,
jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup, jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
jdapi.OrderStatusDelivering: model.OrderStatusDelivering, jdapi.OrderStatusDelivering: model.OrderStatusDelivering,
jdapi.OrderStatusDelivered: model.OrderStatusDelivered, jdapi.OrderStatusDelivered: model.OrderStatusFinished,
jdapi.OrderStatusFinished: model.OrderStatusFinished, // jdapi.OrderStatusFinished: model.OrderStatusFinished, // todo 这个状态不是真正都完成的意思
jdapi.OrderStatusCanceled: model.OrderStatusCanceled, jdapi.OrderStatusCanceled: model.OrderStatusCanceled,
jdapi.OrderStatusAdjust: model.OrderStatusAdjust, jdapi.OrderStatusAdjust: model.OrderStatusAdjust,
jdapi.OrderStatusUserApplyCancel: model.OrderStatusApplyCancel, jdapi.OrderStatusUserApplyCancel: model.OrderStatusApplyCancel,

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

@@ -43,7 +43,7 @@ var (
mtwmapi.OrderStatusReceived: model.OrderStatusAccepted, mtwmapi.OrderStatusReceived: model.OrderStatusAccepted,
mtwmapi.OrderStatusAccepted: model.OrderStatusFinishedPickup, mtwmapi.OrderStatusAccepted: model.OrderStatusFinishedPickup,
mtwmapi.OrderStatusDelivering: model.OrderStatusDelivering, mtwmapi.OrderStatusDelivering: model.OrderStatusDelivering,
mtwmapi.OrderStatusDelivered: model.OrderStatusDelivered, mtwmapi.OrderStatusDelivered: model.OrderStatusUnknown, // 以mtwmapi.OrderStatusFinished为结束状态，这个当成一个中间状态（且很少看到这个状态）
mtwmapi.OrderStatusFinished: model.OrderStatusFinished, mtwmapi.OrderStatusFinished: model.OrderStatusFinished,
mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled, mtwmapi.OrderStatusCanceled: model.OrderStatusCanceled,