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
---
model/subOrder.go | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/model/subOrder.go b/model/subOrder.go
index 8ba75c8..765b112 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -2,18 +2,22 @@
import (
"aps_crm/pkg/mysqlx"
+ "fmt"
"gorm.io/gorm"
)
type (
SubOrder struct {
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
- Client Client `json:"client" gorm:"foreignKey:ClientId"`
- MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
- MasterOrderId int `json:"masterOrderId" gorm:"column:master_order_id;type:int;comment:閿�鍞�诲崟id"`
- Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
- Products []Product `json:"products" gorm:"many2many:subOrder_product;"`
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ ClientId int `json:"clientId" gorm:"column:client_id;type:int;comment:瀹㈡埛id"`
+ Client Client `json:"client" gorm:"foreignKey:ClientId"`
+ MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"`
+ Member User `json:"member" gorm:"foreignKey:MemberId"`
+ MasterOrderId int `json:"masterOrderId" gorm:"column:master_order_id;type:int;comment:閿�鍞�诲崟id"`
+ MasterOrder MasterOrder `json:"masterOrder" gorm:"foreignKey:MasterOrderId"`
+ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:閿�鍞瓙鍗曞彿"`
+ Products []Product `json:"products" gorm:"many2many:subOrder_product;"`
+ CodeStandID string `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:缂栫爜id"`
gorm.Model `json:"-"`
}
@@ -32,9 +36,12 @@
return "sub_order"
}
-func NewSubOrderSearch() *SubOrderSearch {
+func NewSubOrderSearch(db *gorm.DB) *SubOrderSearch {
+ if db == nil {
+ db = mysqlx.GetDB()
+ }
return &SubOrderSearch{
- Orm: mysqlx.GetDB(),
+ Orm: db,
}
}
@@ -43,6 +50,9 @@
if slf.Id != 0 {
db = db.Where("id = ?", slf.Id)
+ }
+ if slf.Number != "" {
+ db = db.Where("number = ?", slf.Number)
}
if len(slf.SearchMap) > 0 {
@@ -64,9 +74,16 @@
if key == "member_name" {
db = db.Joins("Member").Where("User.username LIKE ?", "%"+v+"%")
}
- case int:
- if key == "master_order_id" {
- db = db.Where("master_order_id = ?", v)
+ case int, float64:
+ if key == "client_id" || key == "master_order_id" {
+ db = db.Where(key+" = ?", v)
+ }
+ if key == "member_id" {
+ db = db.Where("sub_order.member_id = ?", v)
+ }
+ case []int:
+ if key == "member_ids" {
+ db = db.Where("sub_order.member_id in ?", v)
}
}
}
@@ -107,8 +124,32 @@
db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
}
- err := db.Preload("Products").Preload("Client").Order("id desc").Find(&records).Error
+ err := db.Preload("MasterOrder").Preload("Member").Preload("Products").Preload("Client").Order("id desc").Find(&records).Error
return records, total, err
+}
+
+func (slf *SubOrderSearch) Count() (int64, error) {
+ var db = slf.build()
+ var total int64
+ err := db.Count(&total).Error
+ return total, err
+}
+
+func (slf *SubOrderSearch) MaxAutoIncr() (int, error) {
+ type Result struct {
+ Max int
+ }
+
+ var (
+ result Result
+ db = slf.build()
+ )
+
+ err := db.Select("MAX(id) as max").Scan(&result).Error
+ if err != nil {
+ return result.Max, fmt.Errorf("max err: %v", err)
+ }
+ return result.Max, nil
}
func (slf *SubOrderSearch) SetId(id int) *SubOrderSearch {
@@ -130,3 +171,17 @@
slf.SearchMap = data
return slf
}
+func (slf *SubOrderSearch) SetIds(ids []int) *SubOrderSearch {
+ slf.Orm = slf.Orm.Where("id in (?)", ids)
+ return slf
+}
+
+func (slf *SubOrderSearch) SetNumber(number string) *SubOrderSearch {
+ slf.Number = number
+ return slf
+}
+
+func (slf *SubOrderSearch) UpdateByMap(data map[string]interface{}) error {
+ var db = slf.build()
+ return db.Updates(data).Error
+}
--
Gitblit v1.8.0