From 73c5656be21828be2fea8070de2d31ef5d7b0218 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 3 Sep 2019 14:45:07 +0800
Subject: [PATCH] =?UTF-8?q?-=20ActStoreSku2=E6=B7=BB=E5=8A=A0Type=EF=BC=8C?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/act.go     | 2 ++
 business/model/dao/act.go | 1 +
 2 files changed, 3 insertions(+)

diff --git a/business/model/act.go b/business/model/act.go
index 64021fb9d..3250d94aa 100644
--- a/business/model/act.go
+++ b/business/model/act.go
@@ -179,6 +179,8 @@ func (*ActStoreSkuMap) TableIndex() [][]string {
 type ActStoreSku2 struct {
 	MapID int `orm:"column(map_id)"`
 
+	Type int `json:"type"`
+
 	ActStoreSku
 	VendorID int `orm:"column(vendor_id)" json:"vendorID"`
 
diff --git a/business/model/dao/act.go b/business/model/dao/act.go
index 359a02ae3..1ca1fe5cd 100644
--- a/business/model/dao/act.go
+++ b/business/model/dao/act.go
@@ -358,6 +358,7 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs
 	}
 	sql := `
 	SELECT
+	t1.type,
 	t2.*,
 	t3.actual_act_price, t3.sync_status, t3.vendor_price, t3.vendor_id
 	FROM act t1