diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 81b9e1a7d..b2a989196 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -193,7 +193,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O } var sql string - if globals.OrderUseNewTable { + if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID { skuIDs := make([]int64, len(orderSkus)) for k, v := range orderSkus { skuIDs[k] = utils.Str2Int64(v.VendorSkuID) @@ -333,7 +333,7 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db orm.Orme globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) var sql string - if globals.OrderUseNewTable { + if globals.OrderUseNewTable || order.VendorStoreID == globals.DebugJdStoreID { storeMap := &model.StoreMap{ VendorID: order.VendorID, VendorStoreID: order.VendorStoreID, diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index dfdcd713d..975be95fb 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -72,7 +72,7 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo func getStoreDeliveryType(order *model.GoodsOrder) (deliveryType int) { jxStoreID := jxutils.GetJxStoreIDFromOrder(order) - if globals.OrderUseNewTable { + if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID { deliveryType = scheduler.StoreDeliveryTypeByPlatform // 缺省值 if storeMap, _ := dao.GetStoreMapByStoreID(nil, jxStoreID, order.VendorID); storeMap != nil { deliveryType = int(storeMap.DeliveryType) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 501b5a73c..ad91fb7ca 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -102,7 +102,7 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) { globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s", order.VendorOrderID) jxStoreID := jxutils.GetJxStoreIDFromOrder(order) - if globals.OrderUseNewTable { + if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID { if jxStoreID > 0 { db := dao.GetDB() storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index be38e0afd..51132253c 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -167,7 +167,7 @@ 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 { + if globals.OrderUseNewTable || jxutils.GetJxStoreIDFromOrder(order) == globals.DebugStoreID { jxStoreID := jxutils.GetJxStoreIDFromOrder(order) sql = ` SELECT t2.tel_code diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index b7f2b53b5..8daa3206d 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -114,9 +114,9 @@ func (c *DeliveryHandler) calculateOrderDeliveryFee(order *model.GoodsOrder, bil if db == nil { db = orm.NewOrm() } - JxStoreID := jxutils.GetJxStoreIDFromOrder(order) + jxStoreID := jxutils.GetJxStoreIDFromOrder(order) var lng, lat float64 - if globals.OrderUseNewTable { + if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID { priceInfo := &struct { Price int Lng int @@ -128,7 +128,7 @@ func (c *DeliveryHandler) calculateOrderDeliveryFee(order *model.GoodsOrder, bil FROM store t1 JOIN place t2 ON t1.city_code = t2.code WHERE t1.id = ? AND t1.deleted_at = ? - `, JxStoreID, utils.DefaultTimeValue); err != nil { + `, jxStoreID, utils.DefaultTimeValue); err != nil { return 0, 0, err } lng = jxutils.IntCoordinate2Standard(priceInfo.Lng) @@ -141,7 +141,7 @@ func (c *DeliveryHandler) calculateOrderDeliveryFee(order *model.GoodsOrder, bil FROM jxstore t1 JOIN mtpsdeliveryprice t2 ON t2.citycode = t1.area WHERE t1.storeid = ? - `, JxStoreID).ValuesList(&lists) + `, jxStoreID).ValuesList(&lists) if err != nil || num == 0 { globals.SugarLogger.Warnf("calculateDeliveryFee can not calculate delivery fee for orderID:%s, num:%d, error:%v", order.VendorOrderID, num, err) if err != nil { @@ -293,7 +293,7 @@ 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 { + if globals.OrderUseNewTable || jxutils.GetJxStoreIDFromOrder(order) == globals.DebugStoreID { db2 := dao.WrapDB(db) storeCourierList, err2 := dao.GetStoreCouriersByStoreID(db2, jxutils.GetJxStoreIDFromOrder(order), model.VendorIDMTPS) if err = err2; err != nil { diff --git a/globals/globals.go b/globals/globals.go index 0661dfe80..59feffd2b 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -12,6 +12,8 @@ import ( const ( ErrStrAccessDB = "Error when access DB" + DebugStoreID = 100119 + DebugJdStoreID = "11738122" ) var (