- try exported table first in GetOrderSkuInfo
This commit is contained in:
@@ -87,17 +87,40 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
|
|||||||
globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID)
|
globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID)
|
||||||
if globals.OrderUseNewTable {
|
if globals.OrderUseNewTable {
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
err = dao.GetRows(db, &skus, `
|
if vendorID == model.VendorIDELM {
|
||||||
SELECT t1.*, t3.img image
|
err = dao.GetRows(db, &skus, `
|
||||||
FROM order_sku t1
|
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.col_imageUrl, t3.img) image
|
||||||
LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id AND t2.deleted_at = ?
|
FROM order_sku t1
|
||||||
LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
|
LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id AND t2.deleted_at = ?
|
||||||
WHERE t1.vendor_order_id = ? AND t1.vendor_id = ?
|
LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
|
||||||
ORDER BY t1.sku_name
|
LEFT JOIN ede_skus t4 ON t1.vendor_sku_id = t4.col_id
|
||||||
`, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
|
WHERE vendor_order_id = ? AND vendor_id = ?
|
||||||
if err != nil {
|
ORDER BY t1.sku_name
|
||||||
globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
|
`, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
|
||||||
return nil, err
|
} else if vendorID == model.VendorIDJD {
|
||||||
|
err = dao.GetRows(db, &skus, `
|
||||||
|
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.image, t3.img) image
|
||||||
|
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 = ?
|
||||||
|
LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
|
||||||
|
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
|
||||||
|
`, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
|
||||||
|
}
|
||||||
|
if err != nil || len(skus) == 0 {
|
||||||
|
err = dao.GetRows(db, &skus, `
|
||||||
|
SELECT t1.*, t3.img image
|
||||||
|
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 = ?
|
||||||
|
LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
|
||||||
|
WHERE t1.vendor_order_id = ? AND t1.vendor_id = ?
|
||||||
|
ORDER BY t1.sku_name
|
||||||
|
`, 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 len(skus) == 0 {
|
if len(skus) == 0 {
|
||||||
return nil, ErrCanNotFindOrder
|
return nil, ErrCanNotFindOrder
|
||||||
|
|||||||
Reference in New Issue
Block a user