- remove enableStore and orderUseNewTable related stuff
This commit is contained in:
@@ -216,193 +216,71 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O
|
||||
opNum = ""
|
||||
}
|
||||
|
||||
var sql string
|
||||
if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
|
||||
vendorSkuIDs := make([]int64, 0)
|
||||
for _, v := range orderSkus {
|
||||
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
||||
if intVendorSkuID != 0 {
|
||||
vendorSkuIDs = append(vendorSkuIDs, intVendorSkuID)
|
||||
}
|
||||
vendorSkuIDs := make([]int64, 0)
|
||||
for _, v := range orderSkus {
|
||||
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
||||
if intVendorSkuID != 0 {
|
||||
vendorSkuIDs = append(vendorSkuIDs, intVendorSkuID)
|
||||
}
|
||||
if len(vendorSkuIDs) > 0 {
|
||||
if order.VendorID == model.VendorIDELM { // todo 临时用
|
||||
sql = `
|
||||
SELECT t1.sku_id vendor_sku_id, IF(t1.custom_sku_id = -1, 0, t1.custom_sku_id) sku_id, t2.unit_price, t3.weight
|
||||
FROM eb_sku_id_map t1
|
||||
LEFT JOIN store_sku_bind t2 ON t1.custom_sku_id = t2.sku_id AND t2.deleted_at = ? AND t2.store_id = ?
|
||||
LEFT JOIN sku t3 ON t1.custom_sku_id = t3.id AND t3.deleted_at = ?
|
||||
WHERE t1.sku_id IN (-1,` + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
|
||||
} else {
|
||||
tableName := "t2"
|
||||
if model.MultiStoresVendorMap[order.VendorID] == 1 {
|
||||
tableName = "t1"
|
||||
}
|
||||
fieldPrefix := dao.ConvertDBFieldPrefix(model.VendorNames[order.VendorID])
|
||||
sql = `
|
||||
}
|
||||
if len(vendorSkuIDs) > 0 {
|
||||
tableName := "t2"
|
||||
if model.MultiStoresVendorMap[order.VendorID] == 1 {
|
||||
tableName = "t1"
|
||||
}
|
||||
fieldPrefix := dao.ConvertDBFieldPrefix(model.VendorNames[order.VendorID])
|
||||
sql := `
|
||||
SELECT %s.%s_id vendor_sku_id, t1.id sku_id, t2.unit_price, t1.weight
|
||||
FROM sku t1
|
||||
LEFT JOIN store_sku_bind t2 ON t1.id = t2.sku_id AND t2.deleted_at = ? AND t2.store_id = ?
|
||||
WHERE t1.deleted_at = ? AND %s.%s_id IN (-1, ` + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
|
||||
sql = fmt.Sprintf(sql, tableName, fieldPrefix, tableName, fieldPrefix)
|
||||
}
|
||||
var skuInfos []*tStoreSkuBindAndVendorSkuID
|
||||
db2 := dao.WrapDB(db)
|
||||
if err = dao.GetRows(db2, &skuInfos, sql, utils.DefaultTimeValue, jxStoreID, utils.DefaultTimeValue, vendorSkuIDs); err != nil {
|
||||
globals.SugarLogger.Errorf("updateOrderSkuOtherInfo can not get sku info for orderID:%s, error:%v", order.VendorOrderID, err)
|
||||
return err
|
||||
}
|
||||
skumapper := make(map[int64]*tStoreSkuBindAndVendorSkuID)
|
||||
for _, v := range skuInfos {
|
||||
skumapper[v.VendorSkuID] = v
|
||||
}
|
||||
|
||||
for _, v := range orderSkus {
|
||||
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
||||
if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
|
||||
skuBindInfo := skumapper[intVendorSkuID]
|
||||
if skuBindInfo == nil {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
|
||||
} else {
|
||||
v.JxSkuID = skuBindInfo.SkuID
|
||||
v.ShopPrice = int64(skuBindInfo.UnitPrice)
|
||||
v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
|
||||
order.ShopPrice += v.ShopPrice * int64(v.Count)
|
||||
if skuBindInfo.UnitPrice == 0 {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
sql = fmt.Sprintf(sql, tableName, fieldPrefix, tableName, fieldPrefix)
|
||||
var skuInfos []*tStoreSkuBindAndVendorSkuID
|
||||
db2 := dao.WrapDB(db)
|
||||
if err = dao.GetRows(db2, &skuInfos, sql, utils.DefaultTimeValue, jxStoreID, utils.DefaultTimeValue, vendorSkuIDs); err != nil {
|
||||
globals.SugarLogger.Errorf("updateOrderSkuOtherInfo can not get sku info for orderID:%s, error:%v", order.VendorOrderID, err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if order.VendorID == model.VendorIDJD { // todo 为什么要区分京东与其它?
|
||||
sql = `
|
||||
SELECT t1.jdskuid, t1.skuid, t2.price, t3.weight
|
||||
FROM skumapper t1
|
||||
LEFT JOIN jx_sku_store_bind t2 ON t1.skuid = t2.jxskuid AND t2.jxstoreid = ?
|
||||
LEFT JOIN jx_sku t3 ON t2.jxskuid = t3.id
|
||||
WHERE t1.jdskuid IN (-1,`
|
||||
} else if order.VendorID == model.VendorIDELM {
|
||||
sql = `
|
||||
SELECT t1.sku_id, t1.custom_sku_id, t2.price, t3.weight
|
||||
FROM eb_sku_id_map t1
|
||||
LEFT JOIN jx_sku_store_bind t2 ON t1.custom_sku_id = t2.jxskuid AND t2.jxstoreid = ?
|
||||
LEFT JOIN jx_sku t3 ON t2.jxskuid = t3.id
|
||||
WHERE t1.sku_id IN (-1,`
|
||||
} else {
|
||||
sql = `
|
||||
SELECT t2.jxskuid, t2.jxskuid, t2.price, t3.weight
|
||||
FROM jx_sku_store_bind t2
|
||||
LEFT JOIN jx_sku t3 ON t2.jxskuid = t3.id
|
||||
WHERE t2.jxstoreid = ? AND t2.jxskuid IN (-1,`
|
||||
}
|
||||
|
||||
sqlParams := []interface{}{jxStoreID}
|
||||
for _, v := range orderSkus {
|
||||
if order.VendorID == model.VendorIDJD || order.VendorID == model.VendorIDELM {
|
||||
sql += "?,"
|
||||
sqlParams = append(sqlParams, int(utils.Str2Int64(v.VendorSkuID)))
|
||||
} else if v.SkuID != 0 {
|
||||
sql += "?,"
|
||||
sqlParams = append(sqlParams, v.SkuID)
|
||||
skumapper := make(map[int64]*tStoreSkuBindAndVendorSkuID)
|
||||
for _, v := range skuInfos {
|
||||
skumapper[v.VendorSkuID] = v
|
||||
}
|
||||
}
|
||||
|
||||
sql = sql[:len(sql)-1] + ")"
|
||||
var lists []orm.ParamsList
|
||||
if num, err := db.Raw(sql, sqlParams...).ValuesList(&lists); err == nil {
|
||||
skumapper := make(map[string]orm.ParamsList)
|
||||
for _, v := range lists {
|
||||
skumapper[v[0].(string)] = v
|
||||
}
|
||||
// globals.SugarLogger.Debug(skumapper)
|
||||
for _, v := range orderSkus {
|
||||
if order.VendorID == model.VendorIDJD || order.VendorID == model.VendorIDELM {
|
||||
if v.VendorSkuID != "-70000" { // todo hard code
|
||||
if values, ok := skumapper[v.VendorSkuID]; ok {
|
||||
v.JxSkuID = int(utils.Str2Int64(utils.Interface2String(values[1])))
|
||||
v.ShopPrice = utils.Str2Int64WithDefault(utils.Interface2String(values[2]), 0)
|
||||
order.ShopPrice += v.ShopPrice * int64(v.Count)
|
||||
if v.ShopPrice == 0 {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v)
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if v.SkuID != 0 {
|
||||
if values, ok := skumapper[utils.Int2Str(v.SkuID)]; ok {
|
||||
if v.Weight == 0 {
|
||||
v.Weight = jxutils.FloatWeight2Int(float32(utils.Str2Float64WithDefault(utils.Interface2String(values[3]), 0.0)))
|
||||
}
|
||||
v.ShopPrice = utils.Str2Int64WithDefault(utils.Interface2String(values[2]), 0)
|
||||
order.ShopPrice += v.ShopPrice * int64(v.Count)
|
||||
if v.ShopPrice == 0 {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.SkuID, v)
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.SkuID, v)
|
||||
}
|
||||
intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
|
||||
if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
|
||||
skuBindInfo := skumapper[intVendorSkuID]
|
||||
if skuBindInfo == nil {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
|
||||
} else {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku没有京西ID信息,orderID:%s, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, v.VendorSkuID, v)
|
||||
v.JxSkuID = skuBindInfo.SkuID
|
||||
v.ShopPrice = int64(skuBindInfo.UnitPrice)
|
||||
v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
|
||||
order.ShopPrice += v.ShopPrice * int64(v.Count)
|
||||
if skuBindInfo.UnitPrice == 0 {
|
||||
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Errorf("updateOrderSkuOtherInfo can not get sku info for orderID:%s, num:%d, error:%v", order.VendorOrderID, num, err)
|
||||
}
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) {
|
||||
globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
|
||||
|
||||
var sql string
|
||||
if globals.OrderUseNewTable || order.VendorStoreID == globals.DebugJdStoreID {
|
||||
storeMap := &model.StoreMap{
|
||||
VendorID: order.VendorID,
|
||||
VendorStoreID: order.VendorStoreID,
|
||||
}
|
||||
storeMap.DeletedAt = utils.DefaultTimeValue
|
||||
db2 := dao.WrapDB(db)
|
||||
if err = dao.GetEntity(db2, storeMap, model.FieldVendorID, model.FieldVendorStoreID, model.FieldDeletedAt); err != nil && err != orm.ErrNoRows {
|
||||
globals.SugarLogger.Warnf("updateOrderOtherInfo GetEntity orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
|
||||
return err
|
||||
}
|
||||
order.JxStoreID = storeMap.StoreID
|
||||
} else {
|
||||
if order.VendorID == model.VendorIDJD {
|
||||
sql = `
|
||||
SELECT t1.jxstoreid
|
||||
FROM jxstoremap t1
|
||||
/* JOIN jxstore t2 ON t1.jxstoreid = t2.storeid */
|
||||
WHERE t1.jdstoreid = ?
|
||||
`
|
||||
} else if order.VendorID == model.VendorIDELM {
|
||||
sql = `
|
||||
SELECT t1.jx_store_id
|
||||
FROM jx_to_elm_store_map t1
|
||||
/* JOIN jxstore t2 ON t1.jx_store_id = t2.storeid */
|
||||
WHERE t1.elm_store_id = ?
|
||||
`
|
||||
} else if order.VendorID == model.VendorIDEBAI { // todo
|
||||
} else {
|
||||
panic(fmt.Sprintf("wrong vendorid:%d", order.VendorID))
|
||||
}
|
||||
if sql != "" {
|
||||
var lists []orm.ParamsList
|
||||
if num, err := db.Raw(sql, utils.Str2Int64(order.VendorStoreID)).ValuesList(&lists); err == nil && num == 1 {
|
||||
order.JxStoreID = int(utils.Str2Int64(lists[0][0].(string)))
|
||||
} else {
|
||||
if order.VendorID != model.VendorIDEBAI {
|
||||
globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单orderID:%s在京西找不到相应的京西门店信息,请处理, VendorStoreID:%s, num:%d, error:%v", order.VendorOrderID, order.VendorStoreID, num, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
storeMap := &model.StoreMap{
|
||||
VendorID: order.VendorID,
|
||||
VendorStoreID: order.VendorStoreID,
|
||||
}
|
||||
storeMap.DeletedAt = utils.DefaultTimeValue
|
||||
db2 := dao.WrapDB(db)
|
||||
if err = dao.GetEntity(db2, storeMap, model.FieldVendorID, model.FieldVendorStoreID, model.FieldDeletedAt); err != nil && err != orm.ErrNoRows {
|
||||
globals.SugarLogger.Warnf("updateOrderOtherInfo GetEntity orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
|
||||
return err
|
||||
}
|
||||
order.JxStoreID = storeMap.StoreID
|
||||
if err = c.updateOrderSkuOtherInfo(order, db); err == nil {
|
||||
if order.Weight == 0 {
|
||||
for _, v := range order.Skus {
|
||||
|
||||
@@ -89,14 +89,14 @@ func (c *OrderManager) GetStoreOrderCountInfo(ctx *jxcontext.Context, storeID st
|
||||
|
||||
func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (skus []*model.OrderSkuExt, err error) {
|
||||
globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID)
|
||||
if globals.OrderUseNewTable {
|
||||
fullSkuNameSQL := "t1.sku_name"
|
||||
if vendorID == model.VendorIDJD {
|
||||
fullSkuNameSQL = "CONCAT(t1.sku_name, IF(t3.is_spu = 1 AND LOCATE(';', t1.sku_name) = 0, CONCAT('[约', t2.spec_quality, t2.spec_unit, '/', t3.unit, ']'), ''))"
|
||||
}
|
||||
db := dao.GetDB()
|
||||
if vendorID == model.VendorIDELM {
|
||||
err = dao.GetRows(db, &skus, fmt.Sprintf(`
|
||||
|
||||
fullSkuNameSQL := "t1.sku_name"
|
||||
if vendorID == model.VendorIDJD {
|
||||
fullSkuNameSQL = "CONCAT(t1.sku_name, IF(t3.is_spu = 1 AND LOCATE(';', t1.sku_name) = 0, CONCAT('[约', t2.spec_quality, t2.spec_unit, '/', t3.unit, ']'), ''))"
|
||||
}
|
||||
db := dao.GetDB()
|
||||
if vendorID == model.VendorIDELM {
|
||||
err = dao.GetRows(db, &skus, fmt.Sprintf(`
|
||||
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.col_imageUrl, t3.img) image, %s full_sku_name
|
||||
FROM order_sku t1
|
||||
LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id AND t2.deleted_at = ?
|
||||
@@ -105,8 +105,8 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
|
||||
WHERE vendor_order_id = ? AND vendor_id = ?
|
||||
ORDER BY t1.sku_name
|
||||
`, fullSkuNameSQL), utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
|
||||
} else if vendorID == model.VendorIDJD {
|
||||
err = dao.GetRows(db, &skus, fmt.Sprintf(`
|
||||
} else if vendorID == model.VendorIDJD {
|
||||
err = dao.GetRows(db, &skus, fmt.Sprintf(`
|
||||
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.image, t3.img) image, %s full_sku_name
|
||||
FROM order_sku t1
|
||||
LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id AND t2.deleted_at = ?
|
||||
@@ -115,9 +115,9 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
|
||||
WHERE vendor_order_id = ? AND vendor_id = ?
|
||||
ORDER BY t1.sku_name
|
||||
`, fullSkuNameSQL), utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
|
||||
}
|
||||
if err != nil || len(skus) == 0 {
|
||||
err = dao.GetRows(db, &skus, fmt.Sprintf(`
|
||||
}
|
||||
if err != nil || len(skus) == 0 {
|
||||
err = dao.GetRows(db, &skus, fmt.Sprintf(`
|
||||
SELECT t1.*, t3.img image, %s full_sku_name
|
||||
FROM order_sku t1
|
||||
LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id AND t2.deleted_at = ?
|
||||
@@ -125,59 +125,15 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
|
||||
WHERE t1.vendor_order_id = ? AND t1.vendor_id = ?
|
||||
ORDER BY t1.sku_name
|
||||
`, fullSkuNameSQL), utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
|
||||
if err != nil {
|
||||
globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
|
||||
return nil, err
|
||||
}
|
||||
if err != nil {
|
||||
globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
|
||||
return nil, err
|
||||
}
|
||||
if len(skus) == 0 {
|
||||
return nil, ErrCanNotFindOrder
|
||||
}
|
||||
return skus, nil
|
||||
}
|
||||
db := orm.NewOrm()
|
||||
var num int64
|
||||
// 为了显示图片,非正规的使用导出表
|
||||
if vendorID == model.VendorIDELM {
|
||||
num, err = db.Raw(`
|
||||
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.col_imageUrl, t3.img) image
|
||||
FROM order_sku t1
|
||||
LEFT JOIN jx_sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id
|
||||
LEFT JOIN jx_sku_name t3 ON t2.nameid = t3.id
|
||||
LEFT JOIN ede_skus t4 ON t1.vendor_sku_id = t4.col_id
|
||||
WHERE vendor_order_id = ? AND vendor_id = ?
|
||||
ORDER BY t1.sku_name
|
||||
`, vendorOrderID, vendorID).QueryRows(&skus)
|
||||
} else if vendorID == model.VendorIDJD {
|
||||
num, err = db.Raw(`
|
||||
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.image, t3.img) image
|
||||
FROM order_sku t1
|
||||
LEFT JOIN jx_sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id
|
||||
LEFT JOIN jx_sku_name t3 ON t2.nameid = t3.id
|
||||
LEFT JOIN jde_sku_infos t4 ON t1.vendor_sku_id = t4.skuId
|
||||
WHERE vendor_order_id = ? AND vendor_id = ?
|
||||
ORDER BY t1.sku_name
|
||||
`, vendorOrderID, vendorID).QueryRows(&skus)
|
||||
if len(skus) == 0 {
|
||||
return nil, ErrCanNotFindOrder
|
||||
}
|
||||
|
||||
if err != nil || num == 0 {
|
||||
num, err = db.Raw(`
|
||||
SELECT t1.*, t3.img image
|
||||
FROM order_sku t1
|
||||
LEFT JOIN jx_sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id
|
||||
LEFT JOIN jx_sku_name t3 ON t2.nameid = t3.id
|
||||
WHERE vendor_order_id = ? AND vendor_id = ?
|
||||
ORDER BY t1.sku_name
|
||||
`, vendorOrderID, vendorID).QueryRows(&skus)
|
||||
}
|
||||
if err == nil && num > 0 {
|
||||
return skus, nil
|
||||
}
|
||||
if err == nil {
|
||||
err = ErrCanNotFindOrder
|
||||
}
|
||||
globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
|
||||
return nil, err
|
||||
return skus, nil
|
||||
}
|
||||
|
||||
func (c *OrderManager) GetOrderInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int, isRefresh bool) (order *model.GoodsOrderExt, err error) {
|
||||
|
||||
@@ -16,7 +16,6 @@ import (
|
||||
"git.rosy.net.cn/jx-callback/business/model"
|
||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||
"git.rosy.net.cn/jx-callback/business/model/legacymodel"
|
||||
"git.rosy.net.cn/jx-callback/business/model/legacymodel2"
|
||||
"git.rosy.net.cn/jx-callback/business/partner"
|
||||
"git.rosy.net.cn/jx-callback/globals"
|
||||
"github.com/astaxie/beego/orm"
|
||||
@@ -107,85 +106,37 @@ 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.GetSaleStoreIDFromOrder(order)
|
||||
if globals.OrderUseNewTable || jxStoreID == globals.DebugStoreID {
|
||||
if jxStoreID > 0 {
|
||||
db := dao.GetDB()
|
||||
storeMap, err2 := dao.FakeGetStoreMapByStoreID(db, jxStoreID, order.VendorID)
|
||||
if jxStoreID > 0 {
|
||||
db := dao.GetDB()
|
||||
storeMap, err2 := dao.FakeGetStoreMapByStoreID(db, jxStoreID, order.VendorID)
|
||||
if err = err2; err != nil {
|
||||
return err
|
||||
}
|
||||
s.autoPickupTimeoutMinute = int(storeMap.AutoPickup)
|
||||
s.storeDeliveryType = basesch.GetStoreDeliveryType(order, storeMap)
|
||||
if s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
|
||||
order.DeliveryFlag |= model.OrderDeliveryFlagMaskPurcahseDisabled
|
||||
}
|
||||
isNeedSchedule := s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore || storeMap.DeliveryCompetition != 0
|
||||
if isNeedSchedule {
|
||||
vendorList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, jxStoreID, -1)
|
||||
if err = err2; err != nil {
|
||||
return err
|
||||
}
|
||||
s.autoPickupTimeoutMinute = int(storeMap.AutoPickup)
|
||||
s.storeDeliveryType = basesch.GetStoreDeliveryType(order, storeMap)
|
||||
if s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
|
||||
order.DeliveryFlag |= model.OrderDeliveryFlagMaskPurcahseDisabled
|
||||
}
|
||||
isNeedSchedule := s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore || storeMap.DeliveryCompetition != 0
|
||||
if isNeedSchedule {
|
||||
vendorList, err2 := dao.GetOpenedStoreCouriersByStoreID(db, jxStoreID, -1)
|
||||
if err = err2; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, v := range vendorList {
|
||||
// 达达作为微商城的自有配送,不参与竞争配送
|
||||
if !(order.VendorID == model.VendorIDWSC && v.VendorID == model.VendorIDDada) {
|
||||
s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
|
||||
}
|
||||
}
|
||||
if len(s.supported3rdCarriers) == 0 {
|
||||
isNeedSchedule = false
|
||||
for _, v := range vendorList {
|
||||
// 达达作为微商城的自有配送,不参与竞争配送
|
||||
if !(order.VendorID == model.VendorIDWSC && v.VendorID == model.VendorIDDada) {
|
||||
s.supported3rdCarriers = append(s.supported3rdCarriers, v.VendorID)
|
||||
}
|
||||
}
|
||||
if !isNeedSchedule {
|
||||
order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
|
||||
if len(s.supported3rdCarriers) == 0 {
|
||||
isNeedSchedule = false
|
||||
}
|
||||
globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s, s.storeDeliveryType:%d, order.DeliveryFlag:%d", order.VendorOrderID, s.storeDeliveryType, order.DeliveryFlag)
|
||||
}
|
||||
return err
|
||||
}
|
||||
storefeature := &legacymodel2.Jxstorefeature{
|
||||
Id: jxStoreID,
|
||||
}
|
||||
if storefeature.Id > 0 {
|
||||
db := orm.NewOrm()
|
||||
utils.CallFuncLogError(func() error {
|
||||
err = db.Read(storefeature, "Id")
|
||||
if err == nil {
|
||||
s.autoPickupTimeoutMinute = int(storefeature.Autopickup)
|
||||
if order.VendorID == model.VendorIDELM || order.VendorID == model.VendorIDEBAI {
|
||||
s.storeDeliveryType = int(storefeature.ElmDeliveryType)
|
||||
} else if order.VendorID == model.VendorIDJD {
|
||||
s.storeDeliveryType = int(storefeature.JdDeliveryType)
|
||||
}
|
||||
if s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
|
||||
order.DeliveryFlag |= model.OrderDeliveryFlagMaskPurcahseDisabled
|
||||
}
|
||||
isNeedSchedule := false
|
||||
if (s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore) ||
|
||||
(order.VendorID == model.VendorIDJD && storefeature.JdCompetition != 0) ||
|
||||
((order.VendorID == model.VendorIDELM || order.VendorID == model.VendorIDEBAI) && storefeature.ElmCompetition != 0) {
|
||||
isNeedSchedule = true
|
||||
}
|
||||
if isNeedSchedule {
|
||||
if storefeature.SupportMtps != 0 {
|
||||
s.supported3rdCarriers = append(s.supported3rdCarriers, model.VendorIDMTPS)
|
||||
}
|
||||
if storefeature.SupportDada != 0 {
|
||||
s.supported3rdCarriers = append(s.supported3rdCarriers, model.VendorIDDada)
|
||||
}
|
||||
if storefeature.SupportFengNiao != 0 {
|
||||
s.supported3rdCarriers = append(s.supported3rdCarriers, model.VendorIDFengNiao)
|
||||
}
|
||||
if len(s.supported3rdCarriers) == 0 {
|
||||
isNeedSchedule = false
|
||||
globals.SugarLogger.Infof("updateOrderStoreFeature orderID:%s no at least one carrier supported", order.VendorOrderID)
|
||||
}
|
||||
}
|
||||
if !isNeedSchedule {
|
||||
order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
|
||||
}
|
||||
}
|
||||
return err
|
||||
}, "updateOrderStoreFeature")
|
||||
if !isNeedSchedule {
|
||||
order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
|
||||
}
|
||||
globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s, s.storeDeliveryType:%d, order.DeliveryFlag:%d", order.VendorOrderID, s.storeDeliveryType, order.DeliveryFlag)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user