beans , mask admin
CI / changes (push) Successful in 38s
CI / ad (push) Successful in 3m1s
CI / admin (push) Successful in 34s
CI / bff (push) Successful in 29s
CI / chore (push) Successful in 34s
CI / equipment (push) Failing after 11s
CI / express (push) Successful in 27s
CI / factory (push) Successful in 32s
CI / payment (push) Successful in 29s
CI / product (push) Successful in 30s
CI / record (push) Successful in 30s
CI / sale (push) Successful in 30s
CI / task (push) Successful in 32s
CI / user (push) Successful in 31s
CI / wecom (push) Successful in 33s

This commit is contained in:
2026-09-18 16:27:13 +08:00
parent 2b19937065
commit d597975b42
21 changed files with 2778 additions and 39 deletions
@@ -0,0 +1,59 @@
package logic
import (
"context"
"fmt"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/rpc/equipment/pb"
"lone-services/services/equipment/internal/dao"
"lone-services/services/equipment/internal/model"
"lone-services/services/equipment/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
)
type BeansItemsLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
BaseLogic
}
func NewBeansItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *BeansItemsLogic {
return &BeansItemsLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
func (l *BeansItemsLogic) BeansItems(in *equipment.BeansItemsRequest) (*equipment.Response, error) {
adminInfo := utils.GetUserFromCtx(l.ctx)
if adminInfo.ID < utils.NumberOne {
return l.fail(utils.ErrorNoLoginInfo)
}
var info []dao.BeansInfo
w := modelbase.Params{
Size: int(in.Size),
Order: "id DESC",
Page: int(in.Page),
}
if len(in.Time) > utils.NumberOne {
w.Between = map[string][2]string{"created_at": {
in.Time[utils.NumberZero], in.Time[utils.NumberOne]}}
}
if in.Name != utils.StringEmpty {
key := fmt.Sprintf("(user_name LIKE '%s' OR user_nick_name LIKE ?)", "%%"+in.Name+"%%")
w.Other = map[string]string{key: "%%" + in.Name + "%%"}
}
items, err := model.BeansModel{}.Init().Page(w, &info)
if err != nil {
l.Logger.Error(err)
return l.fail(utils.Fail)
}
return l.ok(items)
}
@@ -0,0 +1,71 @@
package logic
import (
"context"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/services/equipment/internal/dao"
"lone-services/services/equipment/internal/model"
"lone-services/services/equipment/validator"
"strconv"
"lone-services/rpc/equipment/pb"
"lone-services/services/equipment/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
)
type BindExpiryLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
BaseLogic
}
func NewBindExpiryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *BindExpiryLogic {
return &BindExpiryLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
func (l *BindExpiryLogic) BindExpiry(in *equipment.BindExpiryRequest) (*equipment.Response, error) {
var v validator.BindSetExpiryValidator
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)
}
w := modelbase.Params{
Eq: map[string]string{
"id": strconv.FormatInt(in.Id, utils.NumberTen),
},
}
var info dao.BindExpiry
err := model.BindModel{}.Init().GetOne(w, &info)
if err != nil {
l.Logger.Error(err)
return l.fail(utils.Fail)
}
if info.Id < utils.NumberOne {
return l.fail(utils.SetError(utils.Fail, "没有找到数据"))
}
info.ExpiryTime = in.Expiry
info.AdminId = in.Id
info.AdminName = adminInfo.Name
info.Reason = in.Reason
_, err = model.BindModel{}.Init().Edit(w, &info)
if err != nil {
l.Logger.Error(err)
return l.fail(utils.Fail)
}
return l.ok(utils.NumberOne)
}
@@ -0,0 +1,88 @@
package logic
import (
"context"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/rpc/equipment/pb"
"lone-services/services/equipment/internal/dao"
"lone-services/services/equipment/internal/model"
"lone-services/services/equipment/internal/svc"
"strconv"
"github.com/zeromicro/go-zero/core/logx"
)
type MaskItemsLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
BaseLogic
}
func NewMaskItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MaskItemsLogic {
return &MaskItemsLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
func (l *MaskItemsLogic) MaskItems(in *equipment.MaskItemsRequest) (*equipment.Response, error) {
adminInfo := utils.GetUserFromCtx(l.ctx)
if adminInfo.ID < utils.NumberOne {
return l.fail(utils.ErrorNoLoginInfo)
}
var info []dao.MaskAddInfo
w := modelbase.Params{
Size: int(in.Size),
Order: "id desc",
Page: int(in.Page),
}
w.Eq = make(map[string]string)
if in.FacialMaskId != utils.StringEmpty {
w.Eq["facial_mask_id"] = in.FacialMaskId
}
if in.Batch != utils.StringEmpty {
w.Eq["batch"] = in.Batch
}
if in.Model >= utils.NumberZero {
mm := "MM"
if in.Model == utils.NumberOne {
mm = "YT"
}
w.Eq["model"] = mm
}
if in.IsStore >= utils.NumberZero {
w.Eq["is_store"] = strconv.Itoa(int(in.IsStore))
}
if in.IsOnTrial >= utils.NumberZero {
w.Eq["is_on_trial"] = strconv.Itoa(int(in.IsOnTrial))
}
if in.UseScenario >= utils.NumberZero {
w.Eq["use_scenario"] = strconv.Itoa(int(in.UseScenario))
}
if in.Effect >= utils.NumberZero {
w.Eq["effect"] = strconv.Itoa(int(in.Effect))
}
if in.IsUse >= utils.NumberZero {
w.Eq["is_use"] = strconv.Itoa(int(in.IsUse))
}
if in.WorkerGroupId >= utils.NumberZero {
w.Eq["worker_group_id"] = strconv.Itoa(int(in.WorkerGroupId))
}
if len(in.Time) > utils.NumberOne {
w.Between = map[string][2]string{"created_at": {
in.Time[utils.NumberZero], in.Time[utils.NumberOne]}}
}
items, err := model.MaskModel{}.Init().Page(w, &info)
if err != nil {
l.Logger.Error(err)
return l.fail(utils.Fail)
}
return l.ok(items)
}