- fixed a bug in defsch.init, replace LoadOrder with GetOrder.

- dynamic table name for legacy order related table.

business/controller/controller.go

@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"fmt"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -49,38 +48,6 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplica
 	return isDuplicated, err
 }
 
-func GetDataCityCodeFromOrder(order *model.GoodsOrder) (retVal string, err error) {
-	var sql string
-	if order.VendorID == model.VendorIDJD {
-		sql = `
-		SELECT t2.tel_code
-		FROM jxstoremap t0
-		JOIN jxstore t1 ON t0.jxstoreid = t1.storeid
-		JOIN city t2 ON t1.area = t2.citycode
-		WHERE t0.jdstoreid = ?
-		`
-	} else if order.VendorID == model.VendorIDELM {
-		sql = `
-		SELECT t2.tel_code
-		FROM jx_to_elm_store_map t0
-		JOIN jxstore t1 ON t0.jx_store_id = t1.storeid
-		JOIN city t2 ON t1.area = t2.citycode
-		WHERE t0.elm_store_id = ?
-		`
-	} else {
-		panic(fmt.Sprintf("wrong vendorid:%d", order.VendorID))
-	}
-	db := orm.NewOrm()
-	var lists []orm.ParamsList
-	num, err := db.Raw(sql, utils.Str2Int64(order.VendorStoreID)).ValuesList(&lists)
-	if err != nil && num == 1 {
-		retVal = lists[0][0].(string)
-	} else {
-		globals.SugarLogger.Errorf("GetDataCityCodeFromOrder can not find store info for vendorID:%d, store:%s", order.VendorID, order.VendorStoreID)
-	}
-	return retVal, err
-}
-
 // todo 可以考虑改成完全按StatusTime来发送事件
 func LoadPendingOrders() {
 	orders := OrderManager.LoadPendingOrders()