- fix weixin push msg bug.

- handle jd out-of-order msg.

business/controller/waybill.go

@@ -19,7 +19,7 @@ func NewWaybillManager() *WaybillController {
 
 func (w *WaybillController) onWaybillNew(bill *model.Waybill) (err error) {
 	db := orm.NewOrm()
-	isDuplicated, err := addOrderOrWaybillStatus(w.waybill2Status(bill), db)
+	isDuplicated, err := addOrderOrWaybillStatus(model.Waybill2Status(bill), db)
 	if !isDuplicated {
 		bill.WaybillFinishedAt = utils.DefaultTimeValue
 		bill.ID = 0
@@ -89,7 +89,7 @@ func (w *WaybillController) addWaybillStatus(bill *model.Waybill, db orm.Ormer)
 	if db == nil {
 		db = orm.NewOrm()
 	}
-	waybillStatus := w.waybill2Status(bill)
+	waybillStatus := model.Waybill2Status(bill)
 	isDuplicated, err = addOrderOrWaybillStatus(waybillStatus, db)
 	if !isDuplicated && waybillStatus.Status > model.WaybillStatusNew {
 		params := orm.Params{
@@ -106,17 +106,3 @@ func (w *WaybillController) addWaybillStatus(bill *model.Waybill, db orm.Ormer)
 	}
 	return isDuplicated, err
 }
-
-func (w *WaybillController) waybill2Status(bill *model.Waybill) (retVal *model.OrderStatus) {
-	retVal = &model.OrderStatus{
-		VendorOrderID:    bill.VendorWaybillID,
-		VendorID:         bill.WaybillVendorID,
-		OrderType:        model.OrderTypeWaybill,
-		RefVendorOrderID: bill.VendorOrderID,
-		RefVendorID:      bill.OrderVendorID,
-		Status:           bill.Status,
-		VendorStatus:     bill.VendorStatus,
-		StatusTime:       bill.WaybillCreatedAt,
-	}
-	return retVal
-}