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

- add OrderStatusFinishedPickup in legacyMapOrderStatus.

Browse Source
This commit is contained in:
gazebo
2018-07-26 11:16:25 +08:00
parent 6e0d896d24
commit 1e3cbbec50
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/controller/order_legacy.go
View File

@@ -94,6 +94,8 @@ func legacyMapOrderStatus(orderStatus int) (retVal int8) {
retVal = JX_ORDER_STATUS_EXCEPTION_APPLY retVal = JX_ORDER_STATUS_EXCEPTION_APPLY
case model.OrderStatusCanceled: case model.OrderStatusCanceled:
retVal = JX_ORDER_STATUS_CANCEL retVal = JX_ORDER_STATUS_CANCEL
case model.OrderStatusFinishedPickup:
retVal = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
default: default:
retVal = JX_STATUS_UNKNOWN retVal = JX_STATUS_UNKNOWN
} }
@@ -166,7 +168,9 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
OrderDiscountMoney: int(order.SalePrice - order.ActualPayPrice), OrderDiscountMoney: int(order.SalePrice - order.ActualPayPrice),
// DeliveryPackageWeight: float64(order.Weight) / 1000, // DeliveryPackageWeight: float64(order.Weight) / 1000,
} }
if order.VendorID == model.VendorIDELM {
order.Status = model.OrderStatusFinishedPickup
}
if order.ExpectedDeliveredTime.Sub(utils.DefaultTimeValue) > 0 { if order.ExpectedDeliveredTime.Sub(utils.DefaultTimeValue) > 0 {
jxorder.OrderPreEndDelivTime = utils.Time2Str(order.ExpectedDeliveredTime) jxorder.OrderPreEndDelivTime = utils.Time2Str(order.ExpectedDeliveredTime)
} }
@@ -218,6 +222,11 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
func (c *OrderController) legacyJxOrderStatusChanged(status *model.OrderStatus, db orm.Ormer) (err error) { func (c *OrderController) legacyJxOrderStatusChanged(status *model.OrderStatus, db orm.Ormer) (err error) {
orderStatus := legacyMapOrderStatus(status.Status) orderStatus := legacyMapOrderStatus(status.Status)
if orderStatus != JX_STATUS_UNKNOWN { if orderStatus != JX_STATUS_UNKNOWN {
if status.VendorID == model.VendorIDELM {
if orderStatus < JX_ORDER_STATUS_WAIT_FOR_DELIVERY {
orderStatus = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
}
}
if db == nil { if db == nil {
db = orm.NewOrm() db = orm.NewOrm()
} }

8
business/scheduler/defsch/defsch.go
View File

@@ -187,10 +187,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.removeWaybillFromMap(savedOrderInfo, bill) s.removeWaybillFromMap(savedOrderInfo, bill)
if order.WaybillVendorID == bill.WaybillVendorID && order.VendorWaybillID == bill.VendorWaybillID { if order.WaybillVendorID == bill.WaybillVendorID && order.VendorWaybillID == bill.VendorWaybillID {
globals.SugarLogger.Infof("OnWaybillStatusChanged WaybillStatusFailed, bill:%v", bill) globals.SugarLogger.Infof("OnWaybillStatusChanged WaybillStatusFailed, bill:%v", bill)
if order.WaybillVendorID == bill.WaybillVendorID { bill.WaybillVendorID = model.VendorIDUnknown
bill.WaybillVendorID = model.VendorIDUnknown s.updateOrderByBill(order, bill, true)
s.updateOrderByBill(order, bill, true)
}
s.resetTimer(savedOrderInfo, scheduler.TimerStatusTypeWaybill, bill.Status, false) s.resetTimer(savedOrderInfo, scheduler.TimerStatusTypeWaybill, bill.Status, false)
} else { } else {
globals.SugarLogger.Warnf("OnWaybillStatusChanged Failed bill:%v shouldn't got here", bill) globals.SugarLogger.Warnf("OnWaybillStatusChanged Failed bill:%v shouldn't got here", bill)
@@ -339,6 +338,7 @@ func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
globals.SugarLogger.Debugf("stopTimer orderID:%s", savedOrderInfo.order.VendorOrderID) globals.SugarLogger.Debugf("stopTimer orderID:%s", savedOrderInfo.order.VendorOrderID)
savedOrderInfo.timer.Stop() savedOrderInfo.timer.Stop()
savedOrderInfo.timerStatus = 0 savedOrderInfo.timerStatus = 0
savedOrderInfo.timerStatusType = scheduler.TimerStatusTypeUnknown
savedOrderInfo.timer = nil savedOrderInfo.timer = nil
} }
} }