- refactor

- load pending orders, fixed bug.

business/controller/elm/order.go

@@ -140,7 +140,7 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder,
 			ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue),
 			VendorStatus:          utils.Interface2String(result["status"]), // 取订单的原始status，不合并消息类型（因为当前消息类型没有意义）
 			OrderSeq:              int(utils.MustInterface2Int64(result["daySn"])),
-			OrderCreatedAt:        utils.Str2Time(result["createdAt"].(string)),
+			StatusTime:            utils.Str2Time(result["createdAt"].(string)),
 			OriginalData:          utils.FilterMb4(string(utils.MustMarshal(result))),
 			ActualPayPrice:        jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalPrice"])),
 			Skus:                  []*model.OrderSku{},
@@ -157,15 +157,14 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder,
 			for _, product2 := range group["items"].([]interface{}) {
 				product := product2.(map[string]interface{})
 				sku := &model.OrderSku{
-					VendorOrderID:  orderID,
-					VendorID:       model.VendorIDELM,
-					Count:          int(utils.MustInterface2Int64(product["quantity"])),
-					SkuID:          int(utils.Str2Int64WithDefault(utils.Interface2String(product["extendCode"]), 0)),
-					VendorSkuID:    utils.Int64ToStr(utils.MustInterface2Int64(product["skuId"])),
-					SkuName:        product["name"].(string),
-					SalePrice:      jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["userPrice"])),
-					Weight:         int(math.Round(utils.Interface2FloatWithDefault(product["weight"], 0.0))),
-					OrderCreatedAt: order.OrderCreatedAt,
+					VendorOrderID: orderID,
+					VendorID:      model.VendorIDELM,
+					Count:         int(utils.MustInterface2Int64(product["quantity"])),
+					SkuID:         int(utils.Str2Int64WithDefault(utils.Interface2String(product["extendCode"]), 0)),
+					VendorSkuID:   utils.Int64ToStr(utils.MustInterface2Int64(product["skuId"])),
+					SkuName:       product["name"].(string),
+					SalePrice:     jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["userPrice"])),
+					Weight:        int(math.Round(utils.Interface2FloatWithDefault(product["weight"], 0.0))),
 				}
 				order.Skus = append(order.Skus, sku)
 				order.SkuCount++

business/controller/elm/order_legacy.go

@@ -20,7 +20,7 @@ func (c *OrderController) legacyWriteElmOrder(order *model.GoodsOrder) (err erro
 		Type:           msgType,
 		Consignee:      order.ConsigneeName,
 		Mobile:         order.ConsigneeMobile,
-		OrderCreatedAt: utils.Time2Str(order.OrderCreatedAt),
+		OrderCreatedAt: utils.Time2Str(order.StatusTime),
 	}
 	_, err = db.Insert(legacyOrder)
 	if err != nil {

business/controller/elm/waybill.go

@@ -53,14 +53,14 @@ func (c *WaybillController) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatus
 
 func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatusMsg) (retVal *model.Waybill) {
 	retVal = &model.Waybill{
-		VendorOrderID:    msg.OrderID,
-		OrderVendorID:    model.VendorIDELM,
-		VendorWaybillID:  msg.OrderID,
-		WaybillVendorID:  model.VendorIDELM,
-		CourierName:      msg.Name,
-		CourierMobile:    msg.Phone,
-		VendorStatus:     c.composeState(msg.State, msg.SubState, msg.MsgType),
-		WaybillCreatedAt: utils.Timestamp2Time(msg.UpdateAt / 1000),
+		VendorOrderID:   msg.OrderID,
+		OrderVendorID:   model.VendorIDELM,
+		VendorWaybillID: msg.OrderID,
+		WaybillVendorID: model.VendorIDELM,
+		CourierName:     msg.Name,
+		CourierMobile:   msg.Phone,
+		VendorStatus:    c.composeState(msg.State, msg.SubState, msg.MsgType),
+		StatusTime:      utils.Timestamp2Time(msg.UpdateAt / 1000),
 	}
 	return retVal
 }