From 4b2c52b17abef8521f9211b4865e1cad0288b12a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 21 十月 2023 17:47:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
model/paymentType.go | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/model/paymentType.go b/model/paymentType.go
index e16a84a..0da5975 100644
--- a/model/paymentType.go
+++ b/model/paymentType.go
@@ -6,24 +6,25 @@
"errors"
"fmt"
"gorm.io/gorm"
+ "sync"
)
type (
// PaymentType 鏀粯鏂瑰紡
PaymentType struct {
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Name string `json:"name" gorm:"column:name"`
+ Name string `json:"name" gorm:"column:name"`
}
// PaymentTypeSearch 鏀粯鏂瑰紡鎼滅储鏉′欢
PaymentTypeSearch struct {
PaymentType
- Orm *gorm.DB
- QueryClass constvar.PaymentTypeQueryClass
- KeywordType constvar.PaymentTypeKeywordType
- Keyword string
- PageNum int
- PageSize int
+ Orm *gorm.DB
+ QueryClass constvar.PaymentTypeQueryClass
+ KeywordType constvar.PaymentTypeKeywordType
+ Keyword string
+ PageNum int
+ PageSize int
}
)
@@ -124,17 +125,30 @@
}
// InitDefaultData 鍒濆鍖栨暟鎹�
-func (slf *PaymentTypeSearch) InitDefaultData() error {
+func (slf *PaymentTypeSearch) InitDefaultData(errCh chan<- error, wg *sync.WaitGroup) {
var (
db = slf.Orm.Table(slf.TableName())
total int64 = 0
)
+ defer wg.Done()
+
if err := db.Count(&total).Error; err != nil {
- return err
+ errCh <- err
+ return
}
if total != 0 {
- return nil
+ return
}
- records := []*PaymentType{}
- return slf.CreateBatch(records)
+
+ records := []*PaymentType{
+ {1, "瀵瑰叕杞处"},
+ {2, "绾夸笅浠樻"},
+ {3, "鏀エ"},
+ {4, "鍏朵粬"},
+ }
+ err := slf.CreateBatch(records)
+ if err != nil {
+ errCh <- err
+ return
+ }
}
--
Gitblit v1.8.0