- orderUseNewTable except store feature related.

business/partner/delivery/dada/waybill.go

@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -167,6 +168,27 @@ 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 {
+		jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
+		sql = `
+		SELECT t2.tel_code
+		FROM store t1
+		JOIN place t2 on t1.city_code = t2.code
+		WHERE t1.id = ?
+		`
+		db2 := dao.WrapDB(db)
+		codeInfo := &struct {
+			TelCode string
+		}{}
+		if err = dao.GetRow(db2, codeInfo, sql, jxStoreID); err != nil {
+			globals.SugarLogger.Errorf("GetDataCityCodeFromOrder can not find store info for vendorID:%d, store:%s, error:%v", order.VendorID, order.VendorStoreID, err)
+			if err == nil {
+				err = ErrCanNotFindDadaCityCode
+			}
+			return "", err
+		}
+		return codeInfo.TelCode, nil
+	}
 	storeID := utils.Str2Int64(order.VendorStoreID)
 	if order.VendorID == model.VendorIDJD {
 		sql = `