diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 5cd9f854d..e79b7be5e 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2036,27 +2036,27 @@ func TmpGetJxBadCommentsNo(ctx *jxcontext.Context, storeID int) (count int, err func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeIDs []int, offset, pageSize, commentType int, fromTime, toTime time.Time, orderFlag, operatorPhone string) (retVal map[string]interface{}, err error) { db := dao.GetDB() //权限 - if permission.IsRoled(ctx) { - if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { - var storeIDs2 []int - if len(storeIDs) > 0 { - for _, v := range storeIDs { - if storeIDsMap[v] != 0 { - storeIDs2 = append(storeIDs2, v) - } - } - if len(storeIDs2) == 0 { - storeIDs2 = append(storeIDs2, -1) - } - } else { - for k, _ := range storeIDsMap { - storeIDs2 = append(storeIDs2, k) - } - } - storeIDs = nil - storeIDs = storeIDs2 - } - } + //if permission.IsRoled(ctx) { + // if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + // var storeIDs2 []int + // if len(storeIDs) > 0 { + // for _, v := range storeIDs { + // if storeIDsMap[v] != 0 { + // storeIDs2 = append(storeIDs2, v) + // } + // } + // if len(storeIDs2) == 0 { + // storeIDs2 = append(storeIDs2, -1) + // } + // } else { + // for k, _ := range storeIDsMap { + // storeIDs2 = append(storeIDs2, k) + // } + // } + // storeIDs = nil + // storeIDs = storeIDs2 + // } + //} sql := ` SELECT SQL_CALC_FOUND_ROWS t1.*, t2.name store_name, t3.name city_name, diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 3d7d5b5d8..59290e72f 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -571,7 +571,6 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI order.Status = model.OrderStatusAccepted dao.UpdateEntity(dao.GetDB(), order, "Status") } - partner.CurOrderManager.OnOrderMsg(order, "订单确认接单成功", utils.Time2TimeStr(time.Now())) } else { globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err)