From b0d1fe4e0acb0fa40c684069c0e9d77d7a65ace3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 15:53:53 +0800
Subject: [PATCH] fix

---
 model/request/subOrder.go |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/model/request/subOrder.go b/model/request/subOrder.go
index a9e894c..556f4e0 100644
--- a/model/request/subOrder.go
+++ b/model/request/subOrder.go
@@ -1,17 +1,22 @@
 package request
 
-import "aps_crm/model"
+import (
+	"aps_crm/model"
+	"aps_crm/proto/code"
+)
 
 type AddSubOrder struct {
 	SubOrder
 }
 
 type SubOrder struct {
-	ClientId      int             `json:"clientId"`
-	MasterOrderId int             `json:"masterOrderId"`
-	Number        string          `json:"number"`
-	MemberId      int             `json:"memberId"`
-	Product       []model.Product `json:"product"`
+	ClientId      int               `json:"clientId"`
+	MasterOrderId int               `json:"masterOrderId"`
+	Number        string            `json:"number"`
+	MemberId      int               `json:"memberId"`
+	Product       []model.Product   `json:"product"`
+	CodeStandID   string            `json:"codeStandID"` //缂栫爜id
+	CodeRule      code.CodeStandard `json:"codeRule"`
 }
 
 type UpdateSubOrder struct {
@@ -21,5 +26,9 @@
 
 type GetSubOrderList struct {
 	PageInfo
-	Keyword string `json:"keyword"`
+	SearchMap map[string]interface{} `json:"search_map"` // 鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"number": "閿�鍞瓙鍗曞彿", "client_name": "瀹㈡埛鍚嶇О", "master_order_number": "閿�鍞�诲崟鍙�", "member_name": "閿�鍞礋璐d汉", "master_order_id": "閿�鍞�诲崟id"}
+}
+
+type DeleteSubOrder struct {
+	Ids []int `json:"ids"`
 }

--
Gitblit v1.8.0