diff --git a/business/controller/elm/order.go b/business/controller/elm/order.go index f51662031..46a751555 100644 --- a/business/controller/elm/order.go +++ b/business/controller/elm/order.go @@ -115,6 +115,7 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder, order = &model.GoodsOrder{ VendorOrderID: orderID, VendorID: model.VendorIDELM, + WaybillVendorID: model.VendorIDELM, VendorStoreID: utils.Int64ToStr(utils.MustInterface2Int64(result["shopId"])), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["openId"]), 0)), StoreName: result["shopName"].(string), diff --git a/business/controller/jd/order.go b/business/controller/jd/order.go index f30d65b7a..a4ef3583d 100644 --- a/business/controller/jd/order.go +++ b/business/controller/jd/order.go @@ -65,6 +65,7 @@ func (c *OrderController) getOrderInfo(msg *jdapi.CallbackOrderMsg) (order *mode order = &model.GoodsOrder{ VendorOrderID: msg.BillID, VendorID: model.VendorIDJD, + WaybillVendorID: model.VendorIDJD, VendorStoreID: result["produceStationNo"].(string), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["produceStationNoIsv"]), 0)), StoreName: result["produceStationName"].(string), diff --git a/business/controller/mtps/waybill.go b/business/controller/mtps/waybill.go index cc8bb8ebd..bb787bfd4 100644 --- a/business/controller/mtps/waybill.go +++ b/business/controller/mtps/waybill.go @@ -133,7 +133,7 @@ func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) { return nil } -// 生成mtps deliveryid,为了兼容,现在取jxorder中的id +// todo 生成mtps deliveryid,为了兼容,现在取jxorder中的id func (c *WaybillController) getDeliveryID(order *model.GoodsOrder, db orm.Ormer) (retVal int64, err error) { jxorder := &legacyorder.Jxorder2{ OrderId: utils.Str2Int64(order.VendorOrderID), diff --git a/business/controller/order.go b/business/controller/order.go index 4c3672efa..3de166390 100644 --- a/business/controller/order.go +++ b/business/controller/order.go @@ -74,7 +74,7 @@ func (c *OrderController) saveOrder(order *model.GoodsOrder, isAdjust bool, db o c.updateOrderOtherInfo(order, db) db.Begin() // globals.SugarLogger.Debugf("new order:%v", order) - order.WaybillVendorID = model.VendorIDUnknown + // order.WaybillVendorID = model.VendorIDUnknown order.OrderFinishedAt = utils.DefaultTimeValue order.ID = 0 created, _, err2 := db.ReadOrCreate(order, "VendorOrderID", "VendorID")