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