From 4f526b034a6e13a521ad71dcbdbea97043d6ea19 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 20 三月 2024 19:21:20 +0800 Subject: [PATCH] 发货信息字段完善 --- api/v1/quotation.go | 63 +++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 9 deletions(-) diff --git a/api/v1/quotation.go b/api/v1/quotation.go index a6f8790..ecbe7da 100644 --- a/api/v1/quotation.go +++ b/api/v1/quotation.go @@ -9,6 +9,7 @@ "aps_crm/pkg/ecode" "aps_crm/utils" "github.com/gin-gonic/gin" + "github.com/shopspring/decimal" ) type QuotationApi struct{} @@ -34,18 +35,27 @@ return } + count, err := model.NewQuotationSearch(nil).SetNumber(params.Number).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") + return + } + + if quotation.MemberId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + quotation.MemberId = userInfo.CrmUserId + } + } + errCode = quotationService.AddQuotation("ation) if errCode != ecode.OK { ctx.Fail(errCode) return - } - - if params.CodeRule.Method == 1 { - autoCode := model.GetAutoCode(quotation.Id, ¶ms.CodeRule) - m := map[string]interface{}{ - "number": autoCode, - } - _ = model.NewQuotationSearch(nil).SetId(quotation.Id).Updates(m) } ctx.Ok() @@ -177,7 +187,7 @@ if params.SearchMap == nil { params.SearchMap = make(map[string]interface{}, 0) } - params.SearchMap["member_id"] = userInfo.CrmUserId + params.SearchMap["member_ids"] = userInfo.SubUserIds } quotations, total, errCode := quotationService.GetQuotationList(params.Page, params.PageSize, params.SearchMap) @@ -186,8 +196,43 @@ return } + for _, quotation := range quotations { + amount := decimal.NewFromInt(0) + for _, product := range quotation.Products { + amount = amount.Add(product.Total) + } + quotation.AmountTotal = amount + } + ctx.OkWithDetailed(response.QuotationResponse{ List: quotations, Count: int(total), }) } + +// Statistics +// +// @Tags Quotation +// @Summary 鎶ヤ环鍗曠粺璁� +// @Produce application/json +// @Success 200 {object} contextx.Response{data=map[string]int64} +// @Router /api/quotation/statistics [get] +func (con *QuotationApi) Statistics(c *gin.Context) { + ctx, ok := contextx.NewContext(c, nil) + if !ok { + return + } + m := make(map[string]int64) + total, _ := model.NewQuotationSearch(nil).Count() + m["total"] = total + //宸插垱寤� + created, _ := model.NewQuotationSearch(nil).SetQuotationStatusId(1).Count() + m["created"] = created + //宸插鎵� + approved, _ := model.NewQuotationSearch(nil).SetQuotationStatusId(3).Count() + m["approved"] = approved + //宸叉帴鍙� + accepted, _ := model.NewQuotationSearch(nil).SetQuotationStatusId(5).Count() + m["accepted"] = accepted + ctx.OkWithDetailed(m) +} -- Gitblit v1.8.0