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

- ActStoreSku2中添加VendorPrice

Browse Source
This commit is contained in:
gazebo
2019-07-31 09:44:30 +08:00
parent b225f814ec
commit 5498ea4069
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/model/act.go
View File

@@ -159,8 +159,8 @@ type ActStoreSkuMap struct {
VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"` VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"`
SyncStatus int8 `orm:"default(2)" json:"syncStatus"` SyncStatus int8 `orm:"default(2)" json:"syncStatus"`
VendorPrice int64 `json:"vendorPrice"` // 创建活动时的平台价格 VendorPrice int64 `json:"vendorPrice"` // 创建活动时的平台价格
ActualActPrice int64 `orm:"" json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格 ActualActPrice int64 `json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格
} }
func (*ActStoreSkuMap) TableUnique() [][]string { func (*ActStoreSkuMap) TableUnique() [][]string {
@@ -184,7 +184,8 @@ type ActStoreSku2 struct {
VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"` VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"`
SyncStatus int8 `orm:"default(2)" json:"syncStatus"` 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"` VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
StoreName string `json:"storeName"` StoreName string `json:"storeName"`

2
business/model/dao/act.go
View File

@@ -77,7 +77,7 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
} }
sql := fmt.Sprintf(` sql := fmt.Sprintf(`
SELECT t1.*, 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, t3.vendor_store_id,
CASE t2.vendor_id CASE t2.vendor_id
WHEN 0 THEN WHEN 0 THEN