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/masterOrder.go | 90 ++++++++++++++++++++++++++++++--------------- 1 files changed, 60 insertions(+), 30 deletions(-) diff --git a/api/v1/masterOrder.go b/api/v1/masterOrder.go index 3c479b3..6362d0d 100644 --- a/api/v1/masterOrder.go +++ b/api/v1/masterOrder.go @@ -1,13 +1,14 @@ 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/utils" "github.com/gin-gonic/gin" - "strconv" ) type MasterOrderApi struct{} @@ -33,6 +34,23 @@ return } + count, err := model.NewMasterOrderSearch().SetNumber(params.Number).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") + return + } + + if masterOrder.MemberId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + masterOrder.MemberId = userInfo.CrmUserId + } + } + errCode = masterOrderService.AddMasterOrder(&masterOrder) if errCode != ecode.OK { ctx.Fail(errCode) @@ -47,17 +65,17 @@ // @Tags MasterOrder // @Summary 鍒犻櫎涓昏鍗� // @Produce application/json -// @Param id path int true "鏌ヨ鍙傛暟" +// @Param object body request.DeleteMasterOrder true "鏌ヨ鍙傛暟" // @Success 200 {object} contextx.Response{} -// @Router /api/masterOrder/delete/{id} [delete] +// @Router /api/masterOrder/delete [delete] func (s *MasterOrderApi) Delete(c *gin.Context) { - ctx, ok := contextx.NewContext(c, nil) + var params request.DeleteMasterOrder + ctx, ok := contextx.NewContext(c, ¶ms) if !ok { return } - id, _ := strconv.Atoi(c.Param("id")) - errCode := masterOrderService.DeleteMasterOrder(id) + errCode := masterOrderService.DeleteMasterOrder(params.Ids) if errCode != ecode.OK { ctx.Fail(errCode) return @@ -98,30 +116,6 @@ ctx.Ok() } -// List -// -// @Tags MasterOrder -// @Summary 涓昏鍗曞垪琛� -// @Produce application/json -// @Success 200 {object} contextx.Response{data=response.MasterOrderResponse} -// @Router /api/masterOrder/list [get] -func (s *MasterOrderApi) List(c *gin.Context) { - ctx, ok := contextx.NewContext(c, nil) - if !ok { - return - } - - list, errCode := masterOrderService.GetMasterOrderList() - if errCode != ecode.OK { - ctx.Fail(errCode) - return - } - - ctx.OkWithDetailed(response.MasterOrderResponse{ - List: list, - }) -} - // checkMasterOrderParams // 妫�鏌ヤ富璁㈠崟鍙傛暟 func checkMasterOrderParams(masterOrder request.MasterOrder) (errCode int, masterOrderModel model.MasterOrder) { @@ -149,6 +143,42 @@ masterOrderModel.MemberId = masterOrder.MemberId masterOrderModel.ClientId = masterOrder.ClientId masterOrderModel.Money = masterOrder.Money + masterOrderModel.CodeStandID = masterOrder.CodeStandID return ecode.OK, masterOrderModel } + +// List +// +// @Tags MasterOrder +// @Summary 閿�鍞�诲崟鍒楄〃 +// @Produce application/json +// @Param object body request.GetMasterOrderList true "鍙傛暟" +// @Success 200 {object} contextx.Response{data=response.MasterOrderResponse} +// @Router /api/masterOrder/list [post] +func (con *MasterOrderApi) List(c *gin.Context) { + var params request.GetMasterOrderList + ctx, ok := contextx.NewContext(c, ¶ms) + if !ok { + return + } + + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + if params.SearchMap == nil { + params.SearchMap = make(map[string]interface{}, 0) + } + params.SearchMap["member_ids"] = userInfo.SubUserIds + } + + masterOrders, total, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.SearchMap) + if errCode != ecode.OK { + ctx.Fail(errCode) + return + } + + ctx.OkWithDetailed(response.MasterOrderResponse{ + List: masterOrders, + Count: int(total), + }) +} -- Gitblit v1.8.0