From 2c7adce96e334cb9b65b679e51807342ce1bd4d0 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sat, 15 Jun 2019 11:36:40 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=B8=B4=E6=97=B6=E5=B0=86=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E8=AE=A2=E5=8D=95SKU=E4=B8=AD=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84shop=5Fprice=E8=AE=BE=E7=BD=AE=E4=B8=BAsale=5Fprice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 60 +++++++++++++++++++-
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 39240f80a..064aa27e9 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -77,7 +77,25 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 	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
+			SELECT
+			t1.id,
+			t1.vendor_order_id,
+			t1.vendor_id,
+			t1.count,
+			t1.vendor_sku_id,
+			t1.sku_id,
+			t1.jx_sku_id,
+			t1.sku_name,
+			IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price,
+			t1.sale_price,
+			t1.weight,
+			t1.sku_type,
+			t1.promotion_type,
+			t1.order_created_at,
+			t1.store_sub_id,
+			t1.store_sub_name,
+			t1.vendor_price,
+			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 = ?*/
 			LEFT JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/
@@ -87,7 +105,25 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 			`, fullSkuNameSQL), /*, utils.DefaultTimeValue, utils.DefaultTimeValue*/ vendorOrderID, vendorID)
 	} 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
+			SELECT
+			t1.id,
+			t1.vendor_order_id,
+			t1.vendor_id,
+			t1.count,
+			t1.vendor_sku_id,
+			t1.sku_id,
+			t1.jx_sku_id,
+			t1.sku_name,
+			IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price,
+			t1.sale_price,
+			t1.weight,
+			t1.sku_type,
+			t1.promotion_type,
+			t1.order_created_at,
+			t1.store_sub_id,
+			t1.store_sub_name,
+			t1.vendor_price,
+			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 = ?*/
 			LEFT JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/
@@ -98,7 +134,25 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 	}
 	if err != nil || len(skus) == 0 {
 		err = dao.GetRows(db, &skus, fmt.Sprintf(`
-			SELECT t1.*, t3.img image, %s full_sku_name
+			SELECT
+			t1.id,
+			t1.vendor_order_id,
+			t1.vendor_id,
+			t1.count,
+			t1.vendor_sku_id,
+			t1.sku_id,
+			t1.jx_sku_id,
+			t1.sku_name,
+			IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price,
+			t1.sale_price,
+			t1.weight,
+			t1.sku_type,
+			t1.promotion_type,
+			t1.order_created_at,
+			t1.store_sub_id,
+			t1.store_sub_name,
+			t1.vendor_price,
+			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 = ?*/
 			LEFT JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/