From f6bf0ee81b080a2bad55aa5bf261c68ab3d555f8 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 19 十二月 2023 18:57:43 +0800
Subject: [PATCH] 新增共用id结构体

---
 api/v1/purchase/purchase.go |    4 ----
 model/purchase/purchase.go  |    2 +-
 model/test/supplier.go      |    2 +-
 global/model.go             |   18 ++++++++++++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index af50022..e723875 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -2,7 +2,6 @@
 
 import (
 	"context"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
@@ -13,8 +12,6 @@
 	"srm/proto/purchase_wms"
 	"strconv"
 	"strings"
-	"time"
-
 	//"srm/model/purchase"
 
 	//"srm/model/purchase"
@@ -54,7 +51,6 @@
 	purchaseRecord.Status = purchase.OrderStatusConfirmed
 	purchaseRecord.HandledBy = "admin"
 	purchaseRecord.Creator = "admin"
-	purchaseRecord.Number = fmt.Sprintf("CG%v", time.Now().Unix())
 	purchaseRecord.Principal = "admin"
 	purchaseRecord.OrderType = "閲囪喘璁㈠崟"
 
diff --git a/global/model.go b/global/model.go
index 0880609..9a3d5b1 100644
--- a/global/model.go
+++ b/global/model.go
@@ -7,10 +7,10 @@
 )
 
 type GVA_MODEL struct {
-	ID        uint           `json:"id,string" gorm:"primarykey"` // 涓婚敭ID
-	CreatedAt *time.Time     `json:"-"`                           // 鍒涘缓鏃堕棿
-	UpdatedAt *time.Time     `json:"-"`                           // 鏇存柊鏃堕棿
-	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`              // 鍒犻櫎鏃堕棿
+	ID        uint           `json:"id" gorm:"primarykey"` // 涓婚敭ID
+	CreatedAt *time.Time     `json:"-"`                    // 鍒涘缓鏃堕棿
+	UpdatedAt *time.Time     `json:"-"`                    // 鏇存柊鏃堕棿
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`       // 鍒犻櫎鏃堕棿
 
 	FormattedCreatedAt string `gorm:"-" json:"created_at"`
 	FormattedUpdatedAt string `gorm:"-" json:"updated_at"`
@@ -21,3 +21,13 @@
 	m.FormattedUpdatedAt = m.UpdatedAt.Format("2006-01-02 15:04:05")
 	return
 }
+
+type GVA_MODEL_INT struct {
+	ID        uint           `json:"id,string" gorm:"primarykey"` // 涓婚敭ID
+	CreatedAt *time.Time     `json:"-"`                           // 鍒涘缓鏃堕棿
+	UpdatedAt *time.Time     `json:"-"`                           // 鏇存柊鏃堕棿
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`              // 鍒犻櫎鏃堕棿
+
+	FormattedCreatedAt string `gorm:"-" json:"created_at"`
+	FormattedUpdatedAt string `gorm:"-" json:"updated_at"`
+}
diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index 2c5a8de..df91ce9 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -7,7 +7,7 @@
 )
 
 type Purchase struct {
-	global.GVA_MODEL
+	global.GVA_MODEL_INT
 	PurchaseTypeId      int                 `json:"purchaseTypeId,string" form:"purchaseType" gorm:"type:int(11);not null;default 0;comment:閲囪喘绫诲瀷id"` // 閲囪喘绫诲瀷id
 	PurchaseType        PurchaseType        `json:"purchaseType" gorm:"foreignKey:PurchaseTypeId"`
 	OrderSource         string              `json:"orderSource" gorm:"type:varchar(255);not null;default '';comment:鍗曟嵁鏉ユ簮"`                    // 鍗曟嵁鏉ユ簮
diff --git a/model/test/supplier.go b/model/test/supplier.go
index acba403..5519a66 100644
--- a/model/test/supplier.go
+++ b/model/test/supplier.go
@@ -7,7 +7,7 @@
 
 // Supplier 缁撴瀯浣�
 type Supplier struct {
-	global.GVA_MODEL
+	global.GVA_MODEL_INT
 	Number                string   `json:"number" form:"number" gorm:"column:number;comment:渚涘簲鍟嗙紪鍙�;size:255;"`
 	Name                  string   `json:"name" form:"name" gorm:"column:name;comment:鍚嶇О;size:255;"`
 	SupplierType          string   `json:"supplierType" form:"supplierType" gorm:"column:supplier_type;comment:渚涘簲鍟嗙被鍨�;size:255;"`

--
Gitblit v1.8.0