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

- order.WaybillVendorID default to order vendor.

Browse Source
This commit is contained in:
gazebo
2018-07-18 09:44:53 +08:00
parent 9ab535fa3b
commit 15439779b2
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/controller/elm/order.go
View File

@@ -115,6 +115,7 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder,
order = &model.GoodsOrder{ order = &model.GoodsOrder{
VendorOrderID: orderID, VendorOrderID: orderID,
VendorID: model.VendorIDELM, VendorID: model.VendorIDELM,
WaybillVendorID: model.VendorIDELM,
VendorStoreID: utils.Int64ToStr(utils.MustInterface2Int64(result["shopId"])), VendorStoreID: utils.Int64ToStr(utils.MustInterface2Int64(result["shopId"])),
StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["openId"]), 0)), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["openId"]), 0)),
StoreName: result["shopName"].(string), StoreName: result["shopName"].(string),

1
business/controller/jd/order.go
View File

@@ -65,6 +65,7 @@ func (c *OrderController) getOrderInfo(msg *jdapi.CallbackOrderMsg) (order *mode
order = &model.GoodsOrder{ order = &model.GoodsOrder{
VendorOrderID: msg.BillID, VendorOrderID: msg.BillID,
VendorID: model.VendorIDJD, VendorID: model.VendorIDJD,
WaybillVendorID: model.VendorIDJD,
VendorStoreID: result["produceStationNo"].(string), VendorStoreID: result["produceStationNo"].(string),
StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["produceStationNoIsv"]), 0)), StoreID: int(utils.Str2Int64WithDefault(utils.Interface2String(result["produceStationNoIsv"]), 0)),
StoreName: result["produceStationName"].(string), StoreName: result["produceStationName"].(string),

2
business/controller/mtps/waybill.go
View File

@@ -133,7 +133,7 @@ func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
return nil 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) { func (c *WaybillController) getDeliveryID(order *model.GoodsOrder, db orm.Ormer) (retVal int64, err error) {
jxorder := &legacyorder.Jxorder2{ jxorder := &legacyorder.Jxorder2{
OrderId: utils.Str2Int64(order.VendorOrderID), OrderId: utils.Str2Int64(order.VendorOrderID),

2
business/controller/order.go
View File

@@ -74,7 +74,7 @@ func (c *OrderController) saveOrder(order *model.GoodsOrder, isAdjust bool, db o
c.updateOrderOtherInfo(order, db) c.updateOrderOtherInfo(order, db)
db.Begin() db.Begin()
// globals.SugarLogger.Debugf("new order:%v", order) // globals.SugarLogger.Debugf("new order:%v", order)
order.WaybillVendorID = model.VendorIDUnknown // order.WaybillVendorID = model.VendorIDUnknown
order.OrderFinishedAt = utils.DefaultTimeValue order.OrderFinishedAt = utils.DefaultTimeValue
order.ID = 0 order.ID = 0
created, _, err2 := db.ReadOrCreate(order, "VendorOrderID", "VendorID") created, _, err2 := db.ReadOrCreate(order, "VendorOrderID", "VendorID")