From 33bacc5cd06aa02fd40d801128fc484d9e69bdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 20 Aug 2024 16:27:10 +0800 Subject: [PATCH] 1 --- business/jxstore/permission/permission.go | 5 +++++ business/partner/purchase/mtwm/order_comment.go | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/business/jxstore/permission/permission.go b/business/jxstore/permission/permission.go index 4a75bc4b2..1d33946f0 100644 --- a/business/jxstore/permission/permission.go +++ b/business/jxstore/permission/permission.go @@ -3,6 +3,7 @@ package permission import ( "fmt" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" + "git.rosy.net.cn/jx-callback/globals/api2" "strings" "time" @@ -373,6 +374,10 @@ func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) { } } } + roleList, _ := api2.RoleMan.GetUserRoleList(userID) + for _, v := range roleList { + resultMap[v.StoreID] = v.StoreID + } return resultMap, err } diff --git a/business/partner/purchase/mtwm/order_comment.go b/business/partner/purchase/mtwm/order_comment.go index 6103d85e8..f389958ad 100644 --- a/business/partner/purchase/mtwm/order_comment.go +++ b/business/partner/purchase/mtwm/order_comment.go @@ -44,14 +44,12 @@ func formalizeTagList(mtwmTagList string) (outTagList string) { } func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) { - globals.SugarLogger.Debugf("--------------------------------------------------------------") startTime := time.Now().Add(-24 * time.Hour) //endTime := time.Now().Add(-RefreshCommentTime) endDateStr := startTime.Format("20060102") startDateStr := time.Now().Add(-RefreshCommentTime).Format("20060102") storeIDs, _ := dao.GetOrderStoreIDs(dao.GetDB(), fromTime, toTime, model.VendorIDMTWM) storeIDs = append(storeIDs, 804697) - globals.SugarLogger.Debugf("------storeIDs := %s", utils.Format4Output(storeIDs, false)) task := tasksch.NewParallelTask("mtwm RefreshComment", nil, jxcontext.AdminCtx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeID := batchItemList[0].(int) @@ -61,11 +59,7 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) return nil, nil } // 查询门店差评 - commentList, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).CommentQuery(storeDetail.VendorStoreID, startDateStr, endDateStr, 0, 0, mtwmapi.CommentReplyStatusNotReplied) - globals.SugarLogger.Debugf("commentList lenght --------------- :=%d,%s,%s", storeID, storeDetail.VendorStoreID, utils.Format4Output(len(commentList), false)) - if err != nil { - globals.SugarLogger.Debugf("=========err := %v", err) - } + commentList, _ := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).CommentQuery(storeDetail.VendorStoreID, startDateStr, endDateStr, 0, 0, mtwmapi.CommentReplyStatusNotReplied) var orderCommentList []*model.OrderComment if len(commentList) == model.NO || commentList == nil { return nil, nil