From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 01 十一月 2023 19:20:21 +0800 Subject: [PATCH] 公海member_id使用0 --- api/v1/serviceOrder.go | 70 ++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 5 deletions(-) diff --git a/api/v1/serviceOrder.go b/api/v1/serviceOrder.go index 3beabbd..b03eb64 100644 --- a/api/v1/serviceOrder.go +++ b/api/v1/serviceOrder.go @@ -1,12 +1,15 @@ package v1 import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/model/response" "aps_crm/pkg/contextx" "aps_crm/pkg/ecode" + "aps_crm/pkg/structx" "aps_crm/service" + "aps_crm/utils" "github.com/gin-gonic/gin" "strconv" ) @@ -27,7 +30,27 @@ return } + if params.ServiceManId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + params.ServiceManId = userInfo.CrmUserId + } + } serviceOrder := new(model.ServiceOrder) + if err := structx.AssignTo(params, serviceOrder); err != nil { + ctx.Fail(ecode.ParamsErr) + return + } + + count, err := model.NewServiceOrderSearch().SetNumber(serviceOrder.ServiceNumber).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") + return + } errCode := service.NewServiceOrderService().AddServiceOrder(serviceOrder) if errCode != ecode.OK { @@ -61,6 +84,29 @@ ctx.Ok() } +// BatchDelete +// @Tags 鏈嶅姟鍗� +// @Summary 鎵归噺鍒犻櫎鏈嶅姟鍗� +// @Produce application/json +// @Param object body request.CommonIds true "鍙傛暟" +// @Success 200 {object} contextx.Response{} +// @Router /api/serviceOrder/delete [delete] +func (s *ServiceOrderApi) BatchDelete(c *gin.Context) { + var params request.CommonIds + ctx, ok := contextx.NewContext(c, ¶ms) + if !ok { + return + } + + errCode := service.NewServiceOrderService().BatchDeleteServiceOrder(params.Ids) + if errCode != ecode.OK { + ctx.Fail(errCode) + return + } + + ctx.Ok() +} + // Update // @Tags 鏈嶅姟鍗曠鐞� // @Summary 鏇存柊鏈嶅姟鍗� @@ -75,7 +121,13 @@ return } - errCode := service.NewServiceOrderService().UpdateServiceOrder(¶ms.ServiceOrder) + serviceOrder := new(model.ServiceOrder) + if err := structx.AssignTo(params, serviceOrder); err != nil { + ctx.Fail(ecode.ParamsErr) + return + } + + errCode := service.NewServiceOrderService().UpdateServiceOrder(serviceOrder) if errCode != ecode.OK { ctx.Fail(errCode) return @@ -88,22 +140,30 @@ // @Tags 鏈嶅姟鍗曠鐞� // @Summary 鑾峰彇鏈嶅姟鍗曞垪琛� // @Produce application/json +// @Param object body request.GetServiceOrderList true "鍙傛暟" // @Success 200 {object} response.ListResponse{data=[]model.ServiceOrder} -// @Router /api/serviceOrder/list [get] +// @Router /api/serviceOrder/list [post] func (s *ServiceOrderApi) List(c *gin.Context) { - ctx, ok := contextx.NewContext(c, nil) + var params request.GetServiceOrderList + ctx, ok := contextx.NewContext(c, ¶ms) if !ok { return } - serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList() + var memberIds []int + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + memberIds = userInfo.SubUserIds + } + + serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId, memberIds) if errCode != ecode.OK { ctx.Fail(errCode) return } ctx.OkWithDetailed(response.ListResponse{ - Data: serviceOrder, + Data: serviceOrder, Count: total, }) } -- Gitblit v1.8.0