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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-08 18:14:19 +08:00
parent b968e844ac
commit eb0bc0b7c8
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jxstore/report/report.go
View File

@@ -7,6 +7,8 @@ import (
"sort" "sort"
"time" "time"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/jxstore/permission" "git.rosy.net.cn/jx-callback/business/jxstore/permission"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -400,6 +402,9 @@ type GetStoreManageStateResult struct {
} }
func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, fromTime, toTime string) (getStoreManageStateResult []*GetStoreManageStateResult, err error) { func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, fromTime, toTime string) (getStoreManageStateResult []*GetStoreManageStateResult, err error) {
var (
db = dao.GetDB()
)
//权限 //权限
if permission.IsRoled(ctx) { if permission.IsRoled(ctx) {
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
@@ -419,9 +424,16 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
storeIDs = storeIDs2 storeIDs = storeIDs2
} }
} }
getStoreManageStateResult = append(getStoreManageStateResult, &GetStoreManageStateResult{ for _, v := range storeIDs {
StoreID: 1, storeDetail, _ := dao.GetStoreDetail(db, v, vendorID, "")
StoreName: "1", result := &GetStoreManageStateResult{
}) StoreID: v,
StoreName: storeDetail.Name,
}
handler := partner.GetPurchasePlatformFromVendorID(vendorID)
store, _ := handler.ReadStore(ctx, storeDetail.VendorOrgCode, storeDetail.VendorStoreID)
fmt.Println("testdddd", store.DeliveryRange)
getStoreManageStateResult = append(getStoreManageStateResult, result)
}
return getStoreManageStateResult, err return getStoreManageStateResult, err
} }

4
business/partner/purchase/ebai/store.go
View File

@@ -231,7 +231,9 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0)) retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0))
retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon
retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"]) retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"])
if retVal.DeliveryRange == "" {
api.EbaiAPI.ShopDeliveryinfoGet("", utils.Str2Int64(vendorStoreID))
}
return retVal, nil return retVal, nil
} }
return nil, err return nil, err