From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix
---
service/subOrder.go | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/service/subOrder.go b/service/subOrder.go
index 38a56c6..183f8e5 100644
--- a/service/subOrder.go
+++ b/service/subOrder.go
@@ -16,19 +16,6 @@
return ecode.OK
}
-func (SubOrderService) DeleteSubOrder(id int) int {
- _, err := model.NewSubOrderSearch().SetId(id).Find()
- if err != nil {
- return ecode.SubOrderNotExist
- }
-
- err = model.NewSubOrderSearch().SetId(id).Delete()
- if err != nil {
- return ecode.SubOrderNotExist
- }
- return ecode.OK
-}
-
func (SubOrderService) UpdateSubOrder(subOrder *model.SubOrder) int {
// check subOrder exist
_, err := model.NewSubOrderSearch().SetId(subOrder.Id).Find()
@@ -44,11 +31,20 @@
return ecode.OK
}
-func (SubOrderService) GetSubOrderList(page, pageSize int, keyword string) ([]*model.SubOrder, int) {
+func (SubOrderService) GetSubOrderList(page, pageSize int, data map[string]interface{}) ([]*model.SubOrder, int64, int) {
// get contact list
- contacts, err := model.NewSubOrderSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewSubOrderSearch().SetSearchMap(data).SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
- return nil, ecode.SubOrderListErr
+ return nil, 0, ecode.SubOrderListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
+}
+
+func (SubOrderService) DeleteSubOrder(ids []int) int {
+ // delete client
+ err := model.NewSubOrderSearch().SetIds(ids).Delete()
+ if err != nil {
+ return ecode.SubOrderDeleteErr
+ }
+ return ecode.OK
}
--
Gitblit v1.8.0