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
---
service/masterOrder.go | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/service/masterOrder.go b/service/masterOrder.go
index 16d3fb5..4836e3a 100644
--- a/service/masterOrder.go
+++ b/service/masterOrder.go
@@ -16,19 +16,6 @@
return ecode.OK
}
-func (MasterOrderService) DeleteMasterOrder(id int) int {
- _, err := model.NewMasterOrderSearch().SetId(id).Find()
- if err != nil {
- return ecode.MasterOrderNotExist
- }
-
- err = model.NewMasterOrderSearch().SetId(id).Delete()
- if err != nil {
- return ecode.MasterOrderNotExist
- }
- return ecode.OK
-}
-
func (MasterOrderService) UpdateMasterOrder(masterOrder *model.MasterOrder) int {
// check masterOrder exist
_, err := model.NewMasterOrderSearch().SetId(masterOrder.Id).Find()
@@ -44,11 +31,20 @@
return ecode.OK
}
-func (MasterOrderService) GetMasterOrderList(page, pageSize int, keyword string) ([]*model.MasterOrder, int) {
+func (MasterOrderService) GetMasterOrderList(page, pageSize int, data map[string]interface{}) ([]*model.MasterOrder, int64, int) {
// get contact list
- contacts, err := model.NewMasterOrderSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewMasterOrderSearch().SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
- return nil, ecode.MasterOrderListErr
+ return nil, 0, ecode.MasterOrderListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
+}
+
+func (MasterOrderService) DeleteMasterOrder(ids []int) int {
+ // delete client
+ err := model.NewMasterOrderSearch().SetIds(ids).Delete()
+ if err != nil {
+ return ecode.MasterOrderDeleteErr
+ }
+ return ecode.OK
}
--
Gitblit v1.8.0