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

- refactor GetJxStoreIDFromOrder

Browse Source 
- add IsOrderPlatformWaybill
This commit is contained in:
gazebo
2019-01-22 10:19:37 +08:00
parent d21bdd4aec
commit d0bed4f40a
9 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/delivery/dada/waybill.go
View File

@@ -167,8 +167,8 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
func (c *DeliveryHandler) getDataCityCodeFromOrder(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
var sql string
if globals.OrderUseNewTable || jxutils.GetJxStoreIDFromOrder(order) == globals.DebugStoreID {
jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
jxStoreID := jxutils.GetSaleStoreIDFromOrder(order)
if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
sql = `
SELECT t2.tel_code
FROM store t1
@@ -206,7 +206,7 @@ func (c *DeliveryHandler) getDataCityCodeFromOrder(order *model.GoodsOrder, db o
WHERE t0.elm_store_id = ?
`
} else { // todo 为什么不统一用jxstoreid来找？
storeID = int64(jxutils.GetJxStoreIDFromOrder(order))
storeID = int64(jxutils.GetSaleStoreIDFromOrder(order))
sql = `
SELECT t2.tel_code
FROM jxstore t1

14
business/partner/delivery/mtps/waybill.go
View File

@@ -114,7 +114,7 @@ func (c *DeliveryHandler) calculateOrderDeliveryFee(order *model.GoodsOrder, bil
if db == nil {
db = orm.NewOrm()
}
jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
jxStoreID := jxutils.GetSaleStoreIDFromOrder(order)
var lng, lat float64
if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
priceInfo := &struct {
@@ -294,9 +294,10 @@ func (c *DeliveryHandler) getDeliveryID(order *model.GoodsOrder, db orm.Ormer) (
}
func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
if globals.OrderUseNewTable || jxutils.GetJxStoreIDFromOrder(order) == globals.DebugStoreID {
saleStoreID := jxutils.GetSaleStoreIDFromOrder(order)
if globals.OrderUseNewTable || saleStoreID == globals.DebugStoreID {
db2 := dao.WrapDB(db)
storeCourierList, err2 := dao.GetStoreCouriersByStoreID(db2, jxutils.GetJxStoreIDFromOrder(order), model.VendorIDMTPS)
storeCourierList, err2 := dao.GetStoreCouriersByStoreID(db2, saleStoreID, model.VendorIDMTPS)
if err = err2; err != nil && err != orm.ErrNoRows {
return "", err
}
@@ -311,15 +312,14 @@ func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (
}
sql := "SELECT zs_store_id FROM jx_to_zs_store_map WHERE jx_store_id = ?"
var lists []orm.ParamsList
JxStoreID := jxutils.GetJxStoreIDFromOrder(order)
num, err := db.Raw(sql, JxStoreID).ValuesList(&lists)
num, err := db.Raw(sql, saleStoreID).ValuesList(&lists)
if err == nil && num == 1 {
retVal = lists[0][0].(string)
if beego.BConfig.RunMode == "dev" {
retVal = "test_0001"
}
} else {
globals.SugarLogger.Infof("getMTPSShopID can not find mtps store info for orderID:%s, store:%d, num:%d, error:%v", order.VendorOrderID, JxStoreID, num, err)
globals.SugarLogger.Infof("getMTPSShopID can not find mtps store info for orderID:%s, store:%d, num:%d, error:%v", order.VendorOrderID, saleStoreID, num, err)
if err == nil {
err = ErrCanNotFindMTPSStore
}
@@ -327,7 +327,7 @@ func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (
tmpLog := &legacymodel.TempLog{
VendorOrderID: order.VendorOrderID,
RefVendorOrderID: order.VendorOrderID,
Msg: fmt.Sprintf("getMTPSShopID can not find mtps store info for orderID:%s, store:%d, num:%d, error:%v", order.VendorOrderID, JxStoreID, num, err),
Msg: fmt.Sprintf("getMTPSShopID can not find mtps store info for orderID:%s, store:%d, num:%d, error:%v", order.VendorOrderID, saleStoreID, num, err),
}
db.Insert(tmpLog)
}

2
business/partner/purchase/jd/order_legacy_comment.go
View File

@@ -106,7 +106,7 @@ func (c *PurchaseHandler) onOrderComment(msg *jdapi.CallbackOrderMsg) (err error
order, err2 := partner.CurOrderManager.LoadOrder(msg.BillID, model.VendorIDJD)
if err = err2; err == nil {
comment.Jxstoreid = utils.Int2Str(jxutils.GetJxStoreIDFromOrder(order))
comment.Jxstoreid = utils.Int2Str(jxutils.GetSaleStoreIDFromOrder(order))
comment.Userphone = order.ConsigneeMobile
}
}