print
CI / changes (push) Successful in 1m30s
CI / ad (push) Successful in 31s
CI / admin (push) Successful in 22s
CI / bff (push) Successful in 20s
CI / chore (push) Successful in 21s
CI / equipment (push) Successful in 22s
CI / express (push) Successful in 21s
CI / factory (push) Successful in 19s
CI / message (push) Successful in 18s
CI / order (push) Successful in 19s
CI / payment (push) Successful in 20s
CI / percutaneous (push) Successful in 19s
CI / product (push) Successful in 20s
CI / record (push) Successful in 19s
CI / sale (push) Successful in 19s
CI / support (push) Successful in 19s
CI / task (push) Successful in 18s
CI / user (push) Successful in 19s
CI / wecom (push) Successful in 20s
CI / changes (push) Successful in 1m30s
CI / ad (push) Successful in 31s
CI / admin (push) Successful in 22s
CI / bff (push) Successful in 20s
CI / chore (push) Successful in 21s
CI / equipment (push) Successful in 22s
CI / express (push) Successful in 21s
CI / factory (push) Successful in 19s
CI / message (push) Successful in 18s
CI / order (push) Successful in 19s
CI / payment (push) Successful in 20s
CI / percutaneous (push) Successful in 19s
CI / product (push) Successful in 20s
CI / record (push) Successful in 19s
CI / sale (push) Successful in 19s
CI / support (push) Successful in 19s
CI / task (push) Successful in 18s
CI / user (push) Successful in 19s
CI / wecom (push) Successful in 20s
This commit is contained in:
@@ -2,9 +2,14 @@ package logic
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"lone-services/pkg/modelbase"
|
||||
"lone-services/pkg/utils"
|
||||
"lone-services/rpc/express/pb"
|
||||
"lone-services/services/express/internal/dao"
|
||||
"lone-services/services/express/internal/model"
|
||||
"lone-services/services/express/internal/svc"
|
||||
"lone-services/services/express/validator"
|
||||
"strconv"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
@@ -13,6 +18,7 @@ type PrintExpressLogic struct {
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
logx.Logger
|
||||
BaseLogic
|
||||
}
|
||||
|
||||
func NewPrintExpressLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintExpressLogic {
|
||||
@@ -24,7 +30,59 @@ func NewPrintExpressLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Prin
|
||||
}
|
||||
|
||||
func (l *PrintExpressLogic) PrintExpress(in *express.PrintExpressRequest) (*express.Response, error) {
|
||||
// todo: add your logic here and delete this line
|
||||
var v validator.PrintOrderValidator
|
||||
if fail := l.checkParams(in, &v); fail != nil {
|
||||
return fail, nil
|
||||
}
|
||||
adminInfo := utils.GetUserFromCtx(l.ctx)
|
||||
if adminInfo.ID < utils.NumberOne {
|
||||
return l.fail(utils.ErrorNoLoginInfo)
|
||||
}
|
||||
|
||||
return &express.Response{}, nil
|
||||
var info []dao.DeliveryOrderPrint
|
||||
w := modelbase.Params{
|
||||
In: map[string][]string{"status": {strconv.Itoa(dao.SendStatusOk), strconv.Itoa(dao.SendStatusIn), strconv.Itoa(dao.SendStatusWait)}},
|
||||
}
|
||||
if v.Status == utils.NumberOne {
|
||||
w.Page = utils.NumberOne
|
||||
w.Size = utils.SIZE
|
||||
w.Order = "id desc"
|
||||
}
|
||||
|
||||
if v.Status == utils.NumberZero {
|
||||
w.Page = utils.NumberOne
|
||||
w.Size = utils.SIZE
|
||||
w.Order = "print_status desc, id desc"
|
||||
}
|
||||
|
||||
w.Eq = make(map[string]string)
|
||||
if v.Status > utils.NumberZero {
|
||||
w.Eq["print_status"] = strconv.Itoa(int(v.Status))
|
||||
}
|
||||
|
||||
if len(v.OrderSn) > utils.NumberZero {
|
||||
w.Eq["obj_sn"] = v.OrderSn
|
||||
}
|
||||
|
||||
startTime, endTime := utils.TimeToStartAndEnd(v.Time, utils.NumberOne)
|
||||
if len(startTime) > utils.NumberZero {
|
||||
betweenTimeKey := "create_time"
|
||||
if v.Status == utils.NumberOne {
|
||||
betweenTimeKey = "update_time"
|
||||
}
|
||||
w.Between = map[string][2]string{betweenTimeKey: {startTime, endTime}}
|
||||
}
|
||||
|
||||
items, err := model.DeliveryOrderModel{}.Init().Page(w, &info)
|
||||
|
||||
if err != nil {
|
||||
l.Logger.Error(err)
|
||||
return l.fail(utils.Fail)
|
||||
}
|
||||
|
||||
obj := svc.Print{}
|
||||
obj.GetOrderInfo(l.svcCtx.ProductSvcName, &info)
|
||||
items.Items = info
|
||||
|
||||
return l.ok(items)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user