order
CI / changes (push) Successful in 38s
CI / ad (push) Successful in 32s
CI / admin (push) Successful in 27s
CI / bff (push) Successful in 23s
CI / chore (push) Successful in 24s
CI / equipment (push) Successful in 26s
CI / express (push) Successful in 24s
CI / factory (push) Successful in 22s
CI / payment (push) Successful in 24s
CI / product (push) Successful in 24s
CI / record (push) Successful in 23s
CI / sale (push) Successful in 26s
CI / task (push) Successful in 25s
CI / user (push) Successful in 26s
CI / wecom (push) Successful in 26s
CI / changes (push) Successful in 38s
CI / ad (push) Successful in 32s
CI / admin (push) Successful in 27s
CI / bff (push) Successful in 23s
CI / chore (push) Successful in 24s
CI / equipment (push) Successful in 26s
CI / express (push) Successful in 24s
CI / factory (push) Successful in 22s
CI / payment (push) Successful in 24s
CI / product (push) Successful in 24s
CI / record (push) Successful in 23s
CI / sale (push) Successful in 26s
CI / task (push) Successful in 25s
CI / user (push) Successful in 26s
CI / wecom (push) Successful in 26s
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"lone-services/pkg/modelbase"
|
||||
"lone-services/pkg/utils"
|
||||
"lone-services/pkg/validate"
|
||||
order "lone-services/rpc/order/pb"
|
||||
"reflect"
|
||||
"strconv"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
@@ -46,3 +48,29 @@ func (l *BaseLogic) ok(data any) (*order.Response, error) {
|
||||
buf, _ := jsoniter.Marshal(data)
|
||||
return &order.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg, Data: string(buf)}, nil
|
||||
}
|
||||
|
||||
func (s BaseLogic) SetWhere(w *modelbase.Params, u utils.UserInfo) {
|
||||
if u.Type == utils.SaleType {
|
||||
s.SetGroupWhere(w, u, false)
|
||||
}
|
||||
}
|
||||
|
||||
func (s BaseLogic) SetGroupWhere(w *modelbase.Params, u utils.UserInfo, checkProvince bool) {
|
||||
if w.Eq == nil {
|
||||
w.Eq = make(map[string]string)
|
||||
}
|
||||
if u.GroupId < utils.NumberOne {
|
||||
return
|
||||
}
|
||||
|
||||
//如果是公司销售
|
||||
if u.Type == utils.SaleType {
|
||||
w.Eq["group_id"] = strconv.Itoa(int(u.GroupId))
|
||||
} else if u.SaleProvince > utils.NumberZero {
|
||||
if checkProvince {
|
||||
w.Eq["sale_province"] = strconv.Itoa(int(u.SaleProvince))
|
||||
} else {
|
||||
w.Eq["group_id"] = strconv.Itoa(int(u.GroupId))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,6 +81,8 @@ func (l *ItemsLogic) Items(in *order.OrderItemsRequest) (*order.Response, error)
|
||||
w.Other["create_time < ?"] = strconv.Itoa(int(in.Time[utils.NumberOne]))
|
||||
}
|
||||
|
||||
l.SetWhere(&w, adminInfo)
|
||||
|
||||
items, err := model.OrderModel{}.Init().Page(w, &info)
|
||||
if err != nil {
|
||||
l.Logger.Error(err)
|
||||
|
||||
Reference in New Issue
Block a user