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

1

Browse Source
This commit is contained in:
邹宗楠
2024-10-28 10:47:29 +08:00
parent 8a262667f1
commit b28a614342
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) { 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() 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 {
var storeIDs2 []int // var storeIDs2 []int
if len(storeIDs) > 0 { // if len(storeIDs) > 0 {
for _, v := range storeIDs { // for _, v := range storeIDs {
if storeIDsMap[v] != 0 { // if storeIDsMap[v] != 0 {
storeIDs2 = append(storeIDs2, v) // storeIDs2 = append(storeIDs2, v)
} // }
} // }
if len(storeIDs2) == 0 { // if len(storeIDs2) == 0 {
storeIDs2 = append(storeIDs2, -1) // storeIDs2 = append(storeIDs2, -1)
} // }
} else { // } else {
for k, _ := range storeIDsMap { // for k, _ := range storeIDsMap {
storeIDs2 = append(storeIDs2, k) // storeIDs2 = append(storeIDs2, k)
} // }
} // }
storeIDs = nil // storeIDs = nil
storeIDs = storeIDs2 // storeIDs = storeIDs2
} // }
} //}
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS SELECT SQL_CALC_FOUND_ROWS
t1.*, t2.name store_name, t3.name city_name, t1.*, t2.name store_name, t3.name city_name,

1
business/partner/purchase/mtwm/order.go
View File

@@ -571,7 +571,6 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
order.Status = model.OrderStatusAccepted order.Status = model.OrderStatusAccepted
dao.UpdateEntity(dao.GetDB(), order, "Status") dao.UpdateEntity(dao.GetDB(), order, "Status")
} }
partner.CurOrderManager.OnOrderMsg(order, "订单确认接单成功", utils.Time2TimeStr(time.Now())) partner.CurOrderManager.OnOrderMsg(order, "订单确认接单成功", utils.Time2TimeStr(time.Now()))
} else { } else {
globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err) globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err)