From 5498ea40692c84c06234ee4bb77b0889b5e3ba1a Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 31 Jul 2019 09:44:30 +0800 Subject: [PATCH] =?UTF-8?q?-=20ActStoreSku2=E4=B8=AD=E6=B7=BB=E5=8A=A0Vend?= =?UTF-8?q?orPrice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/act.go | 7 ++++--- business/model/dao/act.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/business/model/act.go b/business/model/act.go index a7acd1713..7ec305027 100644 --- a/business/model/act.go +++ b/business/model/act.go @@ -159,8 +159,8 @@ type ActStoreSkuMap struct { VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"` SyncStatus int8 `orm:"default(2)" json:"syncStatus"` - VendorPrice int64 `json:"vendorPrice"` // 创建活动时的平台价格 - ActualActPrice int64 `orm:"" json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格 + VendorPrice int64 `json:"vendorPrice"` // 创建活动时的平台价格 + ActualActPrice int64 `json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格 } func (*ActStoreSkuMap) TableUnique() [][]string { @@ -184,7 +184,8 @@ type ActStoreSku2 struct { VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"` SyncStatus int8 `orm:"default(2)" json:"syncStatus"` - ActualActPrice int64 `orm:"" json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格 + VendorPrice int64 `json:"vendorPrice"` // 创建活动时的平台价格 + ActualActPrice int64 `json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格 VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"` StoreName string `json:"storeName"` diff --git a/business/model/dao/act.go b/business/model/dao/act.go index 4dcebb88c..f66bfe739 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -77,7 +77,7 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs } sql := fmt.Sprintf(` SELECT t1.*, - t2.id map_id, t2.vendor_id, t2.vendor_act_id, t2.sync_status, t2.actual_act_price, + t2.id map_id, t2.vendor_id, t2.vendor_act_id, t2.sync_status, t2.actual_act_price, t2.vendor_price, t3.vendor_store_id, CASE t2.vendor_id WHEN 0 THEN