From fd9b2972cec4bfe91b442761a412dde7048d65ed Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 30 Oct 2019 16:39:43 +0800
Subject: [PATCH] =?UTF-8?q?GetOrderSkuInfo=E4=B8=AD=E8=BF=94=E5=9B=9EnameI?=
 =?UTF-8?q?D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 25 ++++++++++----------
 business/model/api.go                        |  1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index ad5aca131..cc7eb3abf 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -96,7 +96,7 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 	IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price,
 	t1.sale_price,
 	t1.earning_price,
-	CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t5.pay_percentage > 0, t5.pay_percentage, %d) / 100) AS SIGNED) real_earning_price,
+	CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t5.pay_percentage > 0, t5.pay_percentage, ?) / 100) AS SIGNED) real_earning_price,
 	t1.weight,
 	t1.sku_type,
 	t1.promotion_type,
@@ -105,18 +105,17 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 	t1.store_sub_name,
 	t1.vendor_price,
 	%s full_sku_name,
-	`, model.DefaultEarningPricePercentage, fullSkuNameSQL)
-	db := dao.GetDB()
-	err = dao.GetRows(db, &skus, sql+`
-		t3.img image
-		FROM order_sku t1
-		LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id
-		LEFT JOIN store t5 ON t5.id = IF(t6.jx_store_id <> 0, t6.jx_store_id, t6.store_id)
-		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)
+	t2.name_id,
+	t3.img image
+	FROM order_sku t1
+	LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id
+	LEFT JOIN store t5 ON t5.id = IF(t6.jx_store_id <> 0, t6.jx_store_id, t6.store_id)
+	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
+	`, fullSkuNameSQL)
+	err = dao.GetRows(dao.GetDB(), &skus, sql /*, utils.DefaultTimeValue, utils.DefaultTimeValue*/, model.DefaultEarningPricePercentage, vendorOrderID, vendorID)
 	if err != nil {
 		globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
 		return nil, err
diff --git a/business/model/api.go b/business/model/api.go
index 1a3396774..e6c6a6796 100644
--- a/business/model/api.go
+++ b/business/model/api.go
@@ -36,6 +36,7 @@ type GoodsOrderExt struct {
 
 type OrderSkuExt struct {
 	OrderSku
+	NameID           int    `orm:"column(name_id)" json:"nameID"`
 	FullSkuName      string `json:"fullSkuName"`
 	Image            string `json:"image"`
 	RealEarningPrice int64  `json:"realEarningPrice"` // 实际单品结算给门店老板钱