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/subOrder.go |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/api/v1/subOrder.go b/api/v1/subOrder.go
index 8d804fe..7f1e53a 100644
--- a/api/v1/subOrder.go
+++ b/api/v1/subOrder.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 SubOrderApi struct{}
@@ -33,6 +34,23 @@
 		return
 	}
 
+	count, err := model.NewSubOrderSearch(nil).SetNumber(params.Number).Count()
+	if err != nil {
+		ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触")
+		return
+	}
+	if count > 0 {
+		ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�")
+		return
+	}
+
+	if subOrder.MemberId == 0 {
+		userInfo := utils.GetUserInfo(c)
+		if userInfo.UserType == constvar.UserTypeSub {
+			subOrder.MemberId = userInfo.CrmUserId
+		}
+	}
+
 	errCode = subOrderService.AddSubOrder(&subOrder)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
@@ -47,17 +65,17 @@
 //	@Tags		SubOrder
 //	@Summary	鍒犻櫎瀛愯鍗�
 //	@Produce	application/json
-//	@Param		id	path		int	true	"鏌ヨ鍙傛暟"
+//	@Param		object	body		request.DeleteSubOrder true	"鏌ヨ鍙傛暟"
 //	@Success	200	{object}	contextx.Response{}
-//	@Router		/api/subOrder/delete/{id} [delete]
+//	@Router		/api/subOrder/delete [delete]
 func (s *SubOrderApi) Delete(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.DeleteSubOrder
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
 
-	id, _ := strconv.Atoi(c.Param("id"))
-	errCode := subOrderService.DeleteSubOrder(id)
+	errCode := subOrderService.DeleteSubOrder(params.Ids)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return
@@ -114,6 +132,7 @@
 	newSubOrder.MemberId = subOrder.MemberId
 
 	newSubOrder.Products = subOrder.Product
+	newSubOrder.CodeStandID = subOrder.CodeStandID
 
 	return ecode.OK, newSubOrder
 }
@@ -133,6 +152,14 @@
 		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
+	}
+
 	subOrders, total, errCode := subOrderService.GetSubOrderList(params.Page, params.PageSize, params.SearchMap)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)

--
Gitblit v1.8.0