liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove enableStore and orderUseNewTable related stuff

Browse Source
This commit is contained in:
gazebo
2019-02-12 15:11:30 +08:00
parent ced25499c4
commit 65000be3d0
11 changed files with 104 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
business/jxcallback/orderman/orderman_ext.go
View File

@@ -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) {