diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 42714a3c4..c6ba6291f 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -142,22 +142,22 @@ type Info1 struct { //首页展示信息 type HomePageInfos struct { - StoreID int `json:"storeID"` //门店ID - StoreName string `json:"storeName"` //门店名字 - OpenTime1 int16 `json:"openTime1"` // 930就表示9点半,用两个的原因是为了支持中午休息,1与2的时间段不能交叉,为0表示没有 - CloseTime1 int16 `json:"closeTime1"` // 营业时间 1 - OpenTime2 int16 `json:"openTime2"` // 营业时间2 - CloseTime2 int16 `json:"closeTime2"` - Status int `json:"status"` //门店是否营业 - Distance int `json:"distance"` //店铺与定位 直线距离 - Address string `json:"address"` //门店地址 - BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID - BrandName string `json:"brandName"` //品牌名字 - BrandLogo string `json:"brandLogo"` //品牌logo - DeliveryFeeDeductionSill int `json:"deliveryFeeDeductionSill"` //订单满减金额 - DeliveryFeeDeductionFee int `json:"deliveryFeeDeductionFee"` //订单减免金额 - WeeklyScore int `json:"weeklyScore"` //店铺每周评分 - //Info *Info1 `json:"info"` //拼接数据 + //StoreID int `json:"storeID"` //门店ID + //StoreName string `json:"storeName"` //门店名字 + //OpenTime1 int16 `json:"openTime1"` // 930就表示9点半,用两个的原因是为了支持中午休息,1与2的时间段不能交叉,为0表示没有 + //CloseTime1 int16 `json:"closeTime1"` // 营业时间 1 + //OpenTime2 int16 `json:"openTime2"` // 营业时间2 + //CloseTime2 int16 `json:"closeTime2"` + //Status int `json:"status"` //门店是否营业 + //Distance int `json:"distance"` //店铺与定位 直线距离 + //Address string `json:"address"` //门店地址 + //BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID + //BrandName string `json:"brandName"` //品牌名字 + //BrandLogo string `json:"brandLogo"` //品牌logo + //DeliveryFeeDeductionSill int `json:"deliveryFeeDeductionSill"` //订单满减金额 + //DeliveryFeeDeductionFee int `json:"deliveryFeeDeductionFee"` //订单减免金额 + //WeeklyScore int `json:"weeklyScore"` //店铺每周评分 + Info *Info1 `json:"info"` //拼接数据 //热销商品信息 SkuID int `json:"skuID"` //商品ID SkuName string `json:"skuName"` //商品名字 @@ -5793,20 +5793,21 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis for _, j := range topSkusInfo { if i.StoreID == j.StoreID { data := HomePageInfos{ - StoreID: i.StoreID, - StoreName: i.StoreName, - OpenTime1: i.OpenTime1, - CloseTime1: i.CloseTime1, - OpenTime2: i.OpenTime2, - CloseTime2: i.CloseTime2, - Status: i.Status, - Distance: i.Distance, - Address: i.Address, - BrandName: i.BrandName, - BrandLogo: i.BrandLogo, - DeliveryFeeDeductionSill: i.DeliveryFeeDeductionSill, - DeliveryFeeDeductionFee: i.DeliveryFeeDeductionFee, + //StoreID: i.StoreID, + //StoreName: i.StoreName, + //OpenTime1: i.OpenTime1, + //CloseTime1: i.CloseTime1, + //OpenTime2: i.OpenTime2, + //CloseTime2: i.CloseTime2, + //Status: i.Status, + //Distance: i.Distance, + //Address: i.Address, + //BrandName: i.BrandName, + //BrandLogo: i.BrandLogo, + //DeliveryFeeDeductionSill: i.DeliveryFeeDeductionSill, + //DeliveryFeeDeductionFee: i.DeliveryFeeDeductionFee, //WeeklyScore: i.WeeklyScore, + Info: i, SkuID: j.SkuID, SkuName: j.Name, SkuStatus: j.Status,