- fix weixin push msg bug.

- handle jd out-of-order msg.

business/model/const.go

@@ -24,8 +24,8 @@ var (
 		VendorIDMTPS: "MTPS",
 	}
 	VendorChineseNames = map[int]string{
-		VendorIDJD:   "京东",
-		VendorIDMTWM: "美团",
+		VendorIDJD:   "京东到家",
+		VendorIDMTWM: "美团外卖",
 		VendorIDELM:  "饿了么",
 		VendorIDDada: "达达众包",
 		VendorIDMTPS: "美团配送",

business/model/model.go

@@ -0,0 +1,29 @@
+package model
+
+func Order2Status(order *GoodsOrder) (retVal *OrderStatus) {
+	retVal = &OrderStatus{
+		VendorOrderID:    order.VendorOrderID,
+		VendorID:         order.VendorID,
+		OrderType:        OrderTypeOrder,
+		RefVendorOrderID: order.VendorOrderID,
+		RefVendorID:      order.VendorID,
+		Status:           order.Status,
+		VendorStatus:     order.VendorStatus,
+		StatusTime:       order.StatusTime,
+	}
+	return retVal
+}
+
+func Waybill2Status(bill *Waybill) (retVal *OrderStatus) {
+	retVal = &OrderStatus{
+		VendorOrderID:    bill.VendorWaybillID,
+		VendorID:         bill.WaybillVendorID,
+		OrderType:        OrderTypeWaybill,
+		RefVendorOrderID: bill.VendorOrderID,
+		RefVendorID:      bill.OrderVendorID,
+		Status:           bill.Status,
+		VendorStatus:     bill.VendorStatus,
+		StatusTime:       bill.WaybillCreatedAt,
+	}
+	return retVal
+}