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

- OrderSkuExt.FullSkuName

Browse Source
This commit is contained in:
gazebo
2019-01-10 10:52:48 +08:00
parent 78c83090a7
commit d0e6de4e12
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package orderman package orderman
import ( import (
"fmt"
"strconv" "strconv"
"time" "time"
@@ -88,37 +89,41 @@ 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) { func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID int) (skus []*model.OrderSkuExt, err error) {
globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID) globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID)
if globals.OrderUseNewTable { if globals.OrderUseNewTable {
fullSkuNameSQL := "t1.sku_name"
if vendorID == model.VendorIDJD {
fullSkuNameSQL = "CONCAT(t1.sku_name, IF(t3.is_spu = 1, CONCAT('约', t2.spec_quality, t2.spec_unit, '/', t3.unit, ';'), ''))"
}
db := dao.GetDB() db := dao.GetDB()
if vendorID == model.VendorIDELM { if vendorID == model.VendorIDELM {
err = dao.GetRows(db, &skus, ` err = dao.GetRows(db, &skus, fmt.Sprintf(`
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.col_imageUrl, t3.img) image SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.col_imageUrl, t3.img) image, %s full_sku_name
FROM order_sku t1 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 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 sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
LEFT JOIN ede_skus t4 ON t1.vendor_sku_id = t4.col_id LEFT JOIN ede_skus t4 ON t1.vendor_sku_id = t4.col_id
WHERE vendor_order_id = ? AND vendor_id = ? WHERE vendor_order_id = ? AND vendor_id = ?
ORDER BY t1.sku_name ORDER BY t1.sku_name
`, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID) `, fullSkuNameSQL), utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
} else if vendorID == model.VendorIDJD { } else if vendorID == model.VendorIDJD {
err = dao.GetRows(db, &skus, ` err = dao.GetRows(db, &skus, fmt.Sprintf(`
SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.image, t3.img) image SELECT t1.*, IF(t3.img IS NULL OR t3.img = '', t4.image, t3.img) image, %s full_sku_name
FROM order_sku t1 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 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 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 LEFT JOIN jde_sku_infos t4 ON t1.vendor_sku_id = t4.skuId
WHERE vendor_order_id = ? AND vendor_id = ? WHERE vendor_order_id = ? AND vendor_id = ?
ORDER BY t1.sku_name ORDER BY t1.sku_name
`, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID) `, fullSkuNameSQL), utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
} }
if err != nil || len(skus) == 0 { if err != nil || len(skus) == 0 {
err = dao.GetRows(db, &skus, ` err = dao.GetRows(db, &skus, fmt.Sprintf(`
SELECT t1.*, t3.img image SELECT t1.*, t3.img image, %s full_sku_name
FROM order_sku t1 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 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 sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
WHERE t1.vendor_order_id = ? AND t1.vendor_id = ? WHERE t1.vendor_order_id = ? AND t1.vendor_id = ?
ORDER BY t1.sku_name ORDER BY t1.sku_name
`, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID) `, fullSkuNameSQL), utils.DefaultTimeValue, utils.DefaultTimeValue, vendorOrderID, vendorID)
if err != nil { if err != nil {
globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err) globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
return nil, err return nil, err

3
business/model/api.go
View File

@@ -25,7 +25,8 @@ type GoodsOrderExt struct {
type OrderSkuExt struct { type OrderSkuExt struct {
OrderSku OrderSku
Image string `json:"image"` FullSkuName string `json:"fullSkuName"`
Image string `json:"image"`
} }
type GoodsOrderCountInfo struct { type GoodsOrderCountInfo struct {