From 18c42494735992c42d63c7858f5fdb31069d0342 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 23 十一月 2023 20:11:31 +0800
Subject: [PATCH] 获取客户列表服务端

---
 api/v1/contract.go |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/api/v1/contract.go b/api/v1/contract.go
index 8e05fa5..a0228fc 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -9,6 +9,7 @@
 	"aps_crm/pkg/ecode"
 	"aps_crm/utils"
 	"github.com/gin-gonic/gin"
+	"strconv"
 )
 
 type ContractApi struct{}
@@ -34,6 +35,16 @@
 		return
 	}
 
+	count, err := model.NewContractSearch().SetNumber(params.Number).Count()
+	if err != nil {
+		ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触")
+		return
+	}
+	if count > 0 {
+		ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�")
+		return
+	}
+
 	if contract.MemberId == 0 {
 		userInfo := utils.GetUserInfo(c)
 		if userInfo.UserType == constvar.UserTypeSub {
@@ -45,14 +56,6 @@
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
-	}
-
-	if params.CodeRule.Method == 1 {
-		autoCode := model.GetAutoCode(contract.Id, &params.CodeRule)
-		m := map[string]interface{}{
-			"number": autoCode,
-		}
-		_ = model.NewContractSearch().SetId(contract.Id).UpdateByMap(m)
 	}
 
 	ctx.Ok()
@@ -67,13 +70,18 @@
 //	@Success	200	{object}	contextx.Response{}
 //	@Router		/api/contract/delete [delete]
 func (s *ContractApi) Delete(c *gin.Context) {
-	var params request.DeleteContract
-	ctx, ok := contextx.NewContext(c, &params)
-	if !ok {
+	id := c.Param("id")
+	ctx, _ := contextx.NewContext(c, nil)
+	if id == "" {
+		ctx.Fail(ecode.ParamsErr)
 		return
 	}
-
-	errCode := contractService.DeleteContract(params.Ids)
+	atoi, err := strconv.Atoi(id)
+	if err != nil {
+		ctx.FailWithMsg(ecode.UnknownErr, "鏁版嵁杞崲澶辫触")
+		return
+	}
+	errCode := contractService.DeleteContract(atoi)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -132,6 +140,7 @@
 		File:         contract.File,
 		CodeStandID:  contract.CodeStandID,
 		ContractName: contract.ContractName,
+		SendTime:     contract.SendTime,
 	}
 
 	return ecode.OK, contractModel
@@ -152,15 +161,15 @@
 		return
 	}
 
+	if params.SearchMap == nil {
+		params.SearchMap = make(map[string]interface{}, 0)
+	}
 	userInfo := utils.GetUserInfo(c)
 	if userInfo.UserType == constvar.UserTypeSub {
-		if params.SearchMap == nil {
-			params.SearchMap = make(map[string]interface{}, 0)
-		}
-		params.SearchMap["member_id"] = userInfo.CrmUserId
+		params.SearchMap["member_ids"] = userInfo.SubUserIds
 	}
 
-	contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap)
+	contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap, params.Keyword)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0