From d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 17 十月 2023 14:31:31 +0800
Subject: [PATCH] bug修改

---
 api/v1/serviceFollowup.go |   41 ++++++++++++++++++++++++++++++++---------
 1 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/api/v1/serviceFollowup.go b/api/v1/serviceFollowup.go
index 8819528..39af767 100644
--- a/api/v1/serviceFollowup.go
+++ b/api/v1/serviceFollowup.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 ServiceFollowupApi struct{}
@@ -27,6 +28,12 @@
 		return
 	}
 
+	if params.MemberId == 0 {
+		userInfo := utils.GetUserInfo(c)
+		if userInfo.UserType == constvar.UserTypeSub {
+			params.MemberId = userInfo.CrmUserId
+		}
+	}
 	errCode, serviceFollowup := checkServiceFollowupParams(params.ServiceFollowup)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -38,6 +45,13 @@
 		ctx.Fail(errCode)
 		return
 	}
+	if params.CodeRule.Method == 1 {
+		autoCode := model.GetAutoCode(serviceFollowup.Id, &params.CodeRule)
+		m := map[string]interface{}{
+			"number": autoCode,
+		}
+		_ = model.NewServiceFollowupSearch().SetId(serviceFollowup.Id).UpdateByMap(m)
+	}
 
 	ctx.Ok()
 }
@@ -47,17 +61,17 @@
 //	@Tags		ServiceFollowup
 //	@Summary	鍒犻櫎鏈嶅姟璺熻繘
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteServiceFollowup true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/serviceFollowup/delete/{id} [delete]
+//	@Router		/api/serviceFollowup/delete [delete]
 func (s *ServiceFollowupApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteServiceFollowup
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := serviceFollowupService.DeleteServiceFollowup(id)
+	errCode := serviceFollowupService.DeleteServiceFollowup(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -112,7 +126,7 @@
 		ClientId:       serviceFollowup.ClientId,
 		Number:         serviceFollowup.Number,
 		ContactId:      serviceFollowup.ContactId,
-		ServiceId:      serviceFollowup.ServiceId,
+		ServiceOrderId: serviceFollowup.ServiceOrderId,
 		MemberId:       serviceFollowup.MemberId,
 		PlanId:         serviceFollowup.PlanId,
 		SatisfactionId: serviceFollowup.Satisfaction,
@@ -122,6 +136,7 @@
 		OldMemberId:    serviceFollowup.OldMemberId,
 		Remark:         serviceFollowup.Remark,
 		File:           serviceFollowup.File,
+		CodeStandID:    serviceFollowup.CodeStandID,
 	}
 
 	return ecode.OK, serviceFollowupModel
@@ -133,7 +148,9 @@
 //	@Summary	鍥炶鍗曠鐞嗗垪琛�
 //	@Produce	application/json
 //	@Param		object	body		request.GetServiceFollowupList	true	"鍙傛暟"
-//	@Success	200		{object}	contextx.Response{data=response.ServiceFollowupResponse}
+//
+// @Success	200		{object}	contextx.Response{data=response.ServiceFollowupResponse}
+//
 //	@Router		/api/serviceFollowup/list [post]
 func (con *ServiceFollowupApi) List(c *gin.Context) {
 	var params request.GetServiceFollowupList
@@ -142,7 +159,13 @@
 		return
 	}
 
-	serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
+	var memberIds []int
+	userInfo := utils.GetUserInfo(c)
+	if userInfo.UserType == constvar.UserTypeSub {
+		memberIds = []int{userInfo.CrmUserId}
+	}
+
+	serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.ServiceOrderId, memberIds)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0