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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-07-31 18:01:04 +08:00
parent cf7970f823 84bb016109
commit 8adc24b3e3
2 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
business/jxstore/cms/store.go
View File

@@ -5844,15 +5844,15 @@ func UpdateStoreTemplate(ctx *jxcontext.Context, storeID int, content, sound str
}
//条件过滤 B2B、物料店
func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*common.Store4User, errCode string, err error) {
userAuth, err := auth2.GetTokenInfo(token)
if err != nil {
return nil, "", err
}
user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1)
if err != nil {
return nil, "", err
}
func FilterByB2B(locationList []*common.Store4User) (retVal []*common.Store4User, errCode string, err error) {
//userAuth, err := auth2.GetTokenInfo(token)
// //if err != nil {
// // return nil, "", err
// //}
// //user, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1)
// //if err != nil {
// // return nil, "", err
// //}
// 获取位置附近门店列表
storeIDs := make([]int, 0, len(locationList))
for _, v := range locationList {
@@ -5875,7 +5875,8 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com
for _, v := range store {
for _, s := range locationList {
if v.ID == s.ID {
if (v.BrandID == model.B2BNumberId || isMatterStore) && user[0].Type == model.YES { // 普通用户进入物料店和b2b店
//if (v.BrandID == model.B2BNumberId || isMatterStore) && user[0].Type == model.YES { // 普通用户进入物料店和b2b店
if v.BrandID == model.B2BNumberId || isMatterStore { // 普通用户进入物料店和b2b店
continue
} else {
result = append(result, s)
@@ -5884,18 +5885,18 @@ func FilterByB2B(locationList []*common.Store4User, token string) (retVal []*com
}
}
if total != model.YES {
return result, "", errors.New("")
}
if user[0].Type != model.YES {
return locationList, "", nil
} else {
return result, "", err
}
//if total != model.YES {
// return result, "", errors.New("")
//}
//if user[0].Type != model.YES {
// return locationList, "", nil
//} else {
return result, "", err
//}
}
//首页信息展示
func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDistance bool, token string) (interface{}, string, error) {
func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDistance bool) (interface{}, string, error) {
//获取门店信息
var (
storeID []int
@@ -5910,49 +5911,50 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
if err != nil {
return nil, "经纬度获取推荐门店失败", err
}
if token != "" {
//权限过滤门店
filterStore, _, err := FilterByB2B(locationList, token)
//if token != "" {
//权限过滤门店
//filterStore, _, err := FilterByB2B(locationList, token)
filterStore, _, err := FilterByB2B(locationList)
if err != nil {
return nil, "权限过滤门店失败", err
}
for _, v := range filterStore {
storeID = append(storeID, v.ID)
//获取门店品牌信息
brandInfos, err := dao.GetStoreBrandInfos(v.ID)
if err != nil {
return nil, "权限过滤门店失败", err
return nil, "获取门店品牌信息失败", err
}
for _, v := range filterStore {
storeID = append(storeID, v.ID)
//获取门店品牌信息
brandInfos, err := dao.GetStoreBrandInfos(v.ID)
if err != nil {
return nil, "获取门店品牌信息失败", err
}
storeInfo := StoreInfo{
StoreID: v.ID,
StoreName: v.Name,
OpenTime1: v.OpenTime1,
CloseTime1: v.CloseTime1,
OpenTime2: v.OpenTime2,
CloseTime2: v.CloseTime2,
Status: v.Status,
Distance: v.Distance,
Address: v.Address,
BrandName: brandInfos.Name,
BrandLogo: brandInfos.Logo,
}
storeInfos = append(storeInfos, storeInfo)
//获取门店减免策略
storePolicy, err := GetStoreVendorMaps(ctx, dao.GetDB(), v.ID, 9)
if err != nil {
return nil, "获取门店减免策略失败", err
}
for _, k := range storePolicy {
if k.StoreID == v.ID {
storeDeductionInfo = StoreDeductionInfo{
StoreID: k.StoreID,
DeliveryFeeDeductionSill: k.DeliveryFeeDeductionSill,
DeliveryFeeDeductionFee: k.DeliveryFeeDeductionFee,
}
storeInfo := StoreInfo{
StoreID: v.ID,
StoreName: v.Name,
OpenTime1: v.OpenTime1,
CloseTime1: v.CloseTime1,
OpenTime2: v.OpenTime2,
CloseTime2: v.CloseTime2,
Status: v.Status,
Distance: v.Distance,
Address: v.Address,
BrandName: brandInfos.Name,
BrandLogo: brandInfos.Logo,
}
storeInfos = append(storeInfos, storeInfo)
//获取门店减免策略
storePolicy, err := GetStoreVendorMaps(ctx, dao.GetDB(), v.ID, 9)
if err != nil {
return nil, "获取门店减免策略失败", err
}
for _, k := range storePolicy {
if k.StoreID == v.ID {
storeDeductionInfo = StoreDeductionInfo{
StoreID: k.StoreID,
DeliveryFeeDeductionSill: k.DeliveryFeeDeductionSill,
DeliveryFeeDeductionFee: k.DeliveryFeeDeductionFee,
}
storeDeductionInfos = append(storeDeductionInfos, storeDeductionInfo)
}
storeDeductionInfos = append(storeDeductionInfos, storeDeductionInfo)
}
//}
//获取热销商品
topSkusInfo, err := GetTopSkusByStoreIDs(ctx, storeID)
if err != nil {
@@ -6279,6 +6281,7 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str
type MtRelInfo struct {
PoiCode string `json:"poi_code"`
PicUrl string `json:"pic_url"`
Address string `json:"address"`
}
//[]{PoiCode:"16594433",PicUrl:"http://p0.meituan.net/business/e23d337029fcf74f5a7bcea4e01dac98219292.jpg"}
@@ -6307,6 +6310,7 @@ func BatchUpdateMTStoreLogos(vendorOrgCode string, relInfo []MtRelInfo) (hint st
for _, v := range relInfo {
param := map[string]interface{}{
"pic_url": v.PicUrl,
"address": v.Address,
}
storeDetail, err1 := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDMTWM, v.PoiCode, "")
if err1 != nil {