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/salesDetails.go |  138 +++++++++++++++++++++++++++------------------
 1 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 307735c..350e9c2 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -1,11 +1,13 @@
 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"
 )
@@ -18,7 +20,7 @@
 //	@Summary	娣诲姞閿�鍞槑缁�
 //	@Produce	application/json
 //	@Param		object	body		request.AddSalesDetails	true	"鏌ヨ鍙傛暟"
-//	@Success	200		{object}	contextx.Response{}
+//	@Success	200		{object}	contextx.Response{data=request.AddSalesDetails}
 //	@Router		/api/salesDetails/add [post]
 func (s *SalesDetailsApi) Add(c *gin.Context) {
 	var params request.AddSalesDetails
@@ -33,13 +35,28 @@
 		return
 	}
 
+	if salesDetails.MemberId == 0 {
+		userInfo := utils.GetUserInfo(c)
+		if userInfo.UserType == constvar.UserTypeSub {
+			salesDetails.MemberId = userInfo.CrmUserId
+		}
+	}
+
 	errCode = salesDetailsService.AddSalesDetails(&salesDetails)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
 	}
 
-	ctx.Ok()
+	if params.CodeRule.Method == 1 {
+		autoCode := model.GetAutoCode(salesDetails.Id, &params.CodeRule)
+		m := map[string]interface{}{
+			"number": autoCode,
+		}
+		_ = model.NewSalesDetailsSearch().SetId(salesDetails.Id).UpdateByMap(m)
+	}
+
+	ctx.OkWithDetailed(salesDetails)
 }
 
 // Delete
@@ -58,6 +75,29 @@
 
 	id, _ := strconv.Atoi(c.Param("id"))
 	errCode := salesDetailsService.DeleteSalesDetails(id)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.Ok()
+}
+
+// BatchDelete
+// @Tags	SalesDetails 閿�鍞槑缁�
+// @Summary	鎵归噺鍒犻櫎閿�鍞槑缁�
+// @Produce	application/json
+// @Param	object	body request.CommonIds	true "鍙傛暟"
+// @Success	200	{object}	contextx.Response{}
+// @Router		/api/salesDetails/delete [delete]
+func (s *SalesDetailsApi) BatchDelete(c *gin.Context) {
+	var params request.CommonIds
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	errCode := salesDetailsService.BatchDeleteSalesDetails(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -87,6 +127,7 @@
 		return
 	}
 
+	salesDetails.Id = params.Id
 	errCode = salesDetailsService.UpdateSalesDetails(&salesDetails)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -96,71 +137,58 @@
 	ctx.Ok()
 }
 
-// List
-//
-//	@Tags		SalesDetails
-//	@Summary	鑾峰彇閿�鍞槑缁嗗垪琛�
-//	@Produce	application/json
-//	@Success	200	{object}	contextx.Response{data=response.SalesDetailsResponse}
-//	@Router		/api/salesDetails/list [get]
-func (s *SalesDetailsApi) List(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
-	if !ok {
-		return
-	}
-
-	list, errCode := salesDetailsService.GetSalesDetailsList()
-	if errCode != ecode.OK {
-		ctx.Fail(errCode)
-		return
-	}
-
-	ctx.OkWithDetailed(response.SalesDetailsResponse{
-		List: list,
-	})
-}
-
 func checkSalesDetailsParams(salesDetails request.SalesDetails) (errCode int, salesDetailsModel model.SalesDetails) {
-	//if salesDetails.ClientId == 0 {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-	//
-	//if salesDetails.Number == "" {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-	//
-	//if salesDetails.MemberId == 0 {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-	//
-	//if salesDetails.SignTime == "" {
-	//	return ecode.InvalidParams, salesDetailsModel
-	//}
-
-	t, err := checkTimeFormat(salesDetails.SignTime)
-	if err != nil {
-		return ecode.InvalidParams, salesDetailsModel
-	}
-
-	t, err = checkTimeFormat(salesDetails.DeliveryDate)
-	if err != nil {
-		return ecode.InvalidParams, salesDetailsModel
-	}
-
 	salesDetailsModel.ClientId = salesDetails.ClientId
 	salesDetailsModel.Number = salesDetails.Number
 	salesDetailsModel.SaleChanceId = salesDetails.SaleChanceId
 	salesDetailsModel.SaleType = salesDetails.SaleType
-	salesDetailsModel.SignTime = t
+	salesDetailsModel.SignTime = salesDetails.SignTime
 	salesDetailsModel.MemberId = salesDetails.MemberId
-	salesDetailsModel.DeliveryDate = t
-	salesDetailsModel.WechatOrderStatus = salesDetails.WechatOrderStatus
+	salesDetailsModel.DeliveryDate = salesDetails.DeliveryDate
+	salesDetailsModel.WechatOrderStatusId = salesDetails.WechatOrderStatusId
 	salesDetailsModel.Address = salesDetails.Address
 	salesDetailsModel.Phone = salesDetails.Phone
 	salesDetailsModel.Remark = salesDetails.Remark
 	salesDetailsModel.Addressee = salesDetails.Addressee
 	salesDetailsModel.Conditions = salesDetails.Conditions
 	salesDetailsModel.Products = salesDetails.Products
+	salesDetailsModel.LogisticCompany = salesDetails.LogisticCompany
+	salesDetailsModel.LogisticNumber = salesDetails.LogisticNumber
+	salesDetailsModel.LogisticCost = salesDetails.LogisticCost
+	salesDetailsModel.CodeStandID = salesDetails.CodeStandID
 
 	return ecode.OK, salesDetailsModel
 }
+
+// List
+//
+//	@Tags		SalesDetails
+//	@Summary	閿�鍞槑缁嗗崟鍒楄〃
+//	@Produce	application/json
+//	@Param		object	body		request.GetSalesDetailsList	true	"鍙傛暟"
+//	@Success	200		{object}	contextx.Response{data=response.SalesDetailsResponse}
+//	@Router		/api/salesDetails/list [post]
+func (con *SalesDetailsApi) List(c *gin.Context) {
+	var params request.GetSalesDetailsList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	var memberIds []int
+	userInfo := utils.GetUserInfo(c)
+	if userInfo.UserType == constvar.UserTypeSub {
+		memberIds = []int{userInfo.CrmUserId}
+	}
+
+	salesDetailss, total, errCode := salesDetailsService.GetSalesDetailsList(params, memberIds)
+	if errCode != ecode.OK {
+		ctx.Fail(errCode)
+		return
+	}
+
+	ctx.OkWithDetailed(response.SalesDetailsResponse{
+		List:  salesDetailss,
+		Count: int(total),
+	})
+}

--
Gitblit v1.8.0