diff --git a/business/jxutils/jxutils_act.go b/business/jxutils/jxutils_act.go index 7778051e4..a2a97bde0 100644 --- a/business/jxutils/jxutils_act.go +++ b/business/jxutils/jxutils_act.go @@ -1,6 +1,8 @@ package jxutils -import "git.rosy.net.cn/jx-callback/business/model" +import ( + "git.rosy.net.cn/jx-callback/business/model" +) type ActStoreSkuMap struct { actStoreSkuMap map[int64]map[int]*model.ActStoreSku2 diff --git a/business/jxutils/jxutils_act_test.go b/business/jxutils/jxutils_act_test.go new file mode 100644 index 000000000..758de51bd --- /dev/null +++ b/business/jxutils/jxutils_act_test.go @@ -0,0 +1,18 @@ +package jxutils + +import ( + "testing" + + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" +) + +func TestGetActStoreSku(t *testing.T) { + actStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(dao.GetDB(), 0, []int{model.VendorIDMTWM}, []int{102046}, []int{25430, 30611}, + utils.Str2Time("2019-07-27 13:29:57"), utils.Str2Time("2019-07-27 13:29:57")) + if err != nil { + t.Fatal(err) + } + storeSkuMap := NewActStoreSkuMap(actStoreSkuList, false) +} diff --git a/business/jxutils/jxutils_test.go b/business/jxutils/jxutils_test.go index ce1b49cfa..c0ddbde4e 100644 --- a/business/jxutils/jxutils_test.go +++ b/business/jxutils/jxutils_test.go @@ -6,8 +6,13 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals/testinit" ) +func init() { + testinit.Init() +} + func TestEarthDistance(t *testing.T) { lng1, lat1 := 118.796877, 32.060255 lng2, lat2 := 116.407395, 39.904211 diff --git a/business/model/dao/act.go b/business/model/dao/act.go index 9f3447372..1ca9c3a68 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -312,7 +312,7 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs sql := ` SELECT t2.*, - t3.actual_act_price, t3.sync_status, t3.vendor_price + t3.actual_act_price, t3.sync_status, t3.vendor_price, t3.vendor_id FROM act t1 JOIN act_store_sku t2 ON t2.act_id = t1.id AND t2.deleted_at = ? JOIN act_store_sku_map t3 ON t3.bind_id = t2.id AND t3.act_id = t1.id