From 5c3b42bb561c1731c0922d74f4ffc089f6b24268 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 18 八月 2023 19:16:00 +0800
Subject: [PATCH] fix
---
/dev/null | 133 --------------------------------------------
service/salesDetails.go | 22 +++---
model/salesDetails.go | 2
3 files changed, 12 insertions(+), 145 deletions(-)
diff --git a/model/request/salesDetailsProduct.go b/model/request/salesDetailsProduct.go
deleted file mode 100644
index b494989..0000000
--- a/model/request/salesDetailsProduct.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package request
-
-import (
- "aps_crm/constvar"
- "aps_crm/model"
-)
-
-type AddSalesDetailsProduct struct {
- model.SalesDetailsProduct
-}
-
-type UpdateSalesDetailsProduct struct {
- Id int `json:"id"`
- model.SalesDetailsProduct
-}
-
-type GetSalesDetailsProductList struct {
- PageInfo
- QueryClass constvar.SalesDetailsProductQueryClass `json:"queryClass" form:"queryClass"`
- KeywordType constvar.SalesDetailsProductKeywordType `json:"keywordType" form:"keywordType"`
- Keyword string `json:"keyword" form:"keyword"`
-}
diff --git a/model/salesDetails.go b/model/salesDetails.go
index a2659d8..ed81fab 100644
--- a/model/salesDetails.go
+++ b/model/salesDetails.go
@@ -30,7 +30,7 @@
Conditions string `json:"conditions" gorm:"column:conditions;type:text;comment:鏉′欢"`
CreatorId int `json:"creatorId" gorm:"column:creator_id;type:int;comment:鍒涘缓浜篿d"`
Remark string `json:"remark" gorm:"column:remark;type:text;comment:澶囨敞"`
- Products []*Product `json:"products" gorm:"many2many:sales_details_product;"`
+ Products []*Product `json:"products" gorm:"many2many:SalesDetails_Product;"`
LogisticCompany string `json:"logisticCompany" gorm:"column:logistic_company;type:varchar(255);comment:鐗╂祦鍏徃"`
LogisticNumber string `json:"logisticNumber" gorm:"column:logistic_number;type:varchar(255);comment:鐗╂祦鍗曞彿"`
LogisticCost float64 `json:"logisticCost" gorm:"column:logistic_cost;type:decimal(10,2);comment:鐗╂祦璐圭敤"`
diff --git a/model/salesDetailsProduct.go b/model/salesDetailsProduct.go
deleted file mode 100644
index a803e83..0000000
--- a/model/salesDetailsProduct.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package model
-
-import (
- "aps_crm/constvar"
- "aps_crm/pkg/mysqlx"
- "fmt"
- "gorm.io/gorm"
-)
-
-type (
- // SalesDetailsProduct 閿�鍞槑缁嗗拰浜у搧鍏宠仈
- SalesDetailsProduct struct {
- SalesDetailsId int `json:"id" gorm:"column:sales_details_id;type:int;primary_key;not null;default:0"`
- ProductId uint `json:"name" gorm:"primary_key;column:product_id;type:int;not null;default:0;comment:浜у搧id"`
- }
-
- // SalesDetailsProductSearch 閿�鍞槑缁嗗拰浜у搧鍏宠仈鎼滅储鏉′欢
- SalesDetailsProductSearch struct {
- SalesDetailsProduct
- Orm *gorm.DB
- QueryClass constvar.SalesDetailsProductQueryClass
- KeywordType constvar.SalesDetailsProductKeywordType
- Keyword string
- PageNum int
- PageSize int
- }
-)
-
-func (SalesDetailsProduct) TableName() string {
- return "sales_details_product"
-}
-
-func NewSalesDetailsProductSearch() *SalesDetailsProductSearch {
- return &SalesDetailsProductSearch{
- Orm: mysqlx.GetDB(),
- }
-}
-
-func (slf *SalesDetailsProductSearch) build() *gorm.DB {
- var db = slf.Orm.Model(&SalesDetailsProduct{})
-
- return db
-}
-
-func (slf *SalesDetailsProductSearch) Create(record *SalesDetailsProduct) error {
- var db = slf.build()
- return db.Create(record).Error
-}
-
-func (slf *SalesDetailsProductSearch) CreateBatch(records []*SalesDetailsProduct) error {
- var db = slf.build()
- return db.Create(records).Error
-}
-
-func (slf *SalesDetailsProductSearch) Delete() error {
- var db = slf.build()
- return db.Delete(&SalesDetailsProduct{}).Error
-}
-
-func (slf *SalesDetailsProductSearch) Update(record *SalesDetailsProduct) error {
- var db = slf.build()
- return db.Updates(record).Error
-}
-
-func (slf *SalesDetailsProductSearch) FindAll() ([]*SalesDetailsProduct, error) {
- var db = slf.build()
- var record = make([]*SalesDetailsProduct, 0)
- err := db.Find(&record).Error
- return record, err
-}
-
-func (slf *SalesDetailsProductSearch) SetPage(page, size int) *SalesDetailsProductSearch {
- slf.PageNum, slf.PageSize = page, size
- return slf
-}
-
-func (slf *SalesDetailsProductSearch) SetOrm(tx *gorm.DB) *SalesDetailsProductSearch {
- slf.Orm = tx
- return slf
-}
-
-func (slf *SalesDetailsProductSearch) First() (*SalesDetailsProduct, error) {
- var db = slf.build()
- var record = new(SalesDetailsProduct)
- err := db.First(record).Error
- return record, err
-}
-
-func (slf *SalesDetailsProductSearch) Updates(values interface{}) error {
- var db = slf.build()
- return db.Updates(values).Error
-}
-
-func (slf *SalesDetailsProductSearch) Save(record *SalesDetailsProduct) error {
- var db = slf.build()
-
- if err := db.Save(record).Error; err != nil {
- return fmt.Errorf("save err: %v, record: %+v", err, record)
- }
-
- return nil
-}
-
-func (slf *SalesDetailsProductSearch) Find() ([]*SalesDetailsProduct, int64, error) {
- var db = slf.build()
- var records = make([]*SalesDetailsProduct, 0)
- var total int64
- if err := db.Count(&total).Error; err != nil {
- return records, total, err
- }
- if slf.PageNum > 0 && slf.PageSize > 0 {
- db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
- }
-
- err := db.Find(&records).Error
- return records, total, err
-}
-
-// InitDefaultData 鍒濆鍖栨暟鎹�
-func (slf *SalesDetailsProductSearch) InitDefaultData() error {
- var (
- db = slf.Orm.Table(slf.TableName())
- total int64 = 0
- )
- if err := db.Count(&total).Error; err != nil {
- return err
- }
- if total != 0 {
- return nil
- }
- records := []*SalesDetailsProduct{}
- return slf.CreateBatch(records)
-}
diff --git a/service/salesDetails.go b/service/salesDetails.go
index 73ff94b..d925e9d 100644
--- a/service/salesDetails.go
+++ b/service/salesDetails.go
@@ -88,17 +88,17 @@
if err != nil {
return err
}
- var rel []*model.SalesDetailsProduct
- for _, p := range newProducts {
- rel = append(rel, &model.SalesDetailsProduct{
- SalesDetailsId: salesDetails.Id,
- ProductId: p.Id,
- })
- }
- err = model.NewSalesDetailsProductSearch().CreateBatch(rel)
- if err != nil {
- return err
- }
+ //var rel []*model.SalesDetailsProduct
+ //for _, p := range newProducts {
+ // rel = append(rel, &model.SalesDetailsProduct{
+ // SalesDetailsId: salesDetails.Id,
+ // ProductId: p.Id,
+ // })
+ //}
+ //err = model.NewSalesDetailsProductSearch().CreateBatch(rel)
+ //if err != nil {
+ // return err
+ //}
}
return nil
--
Gitblit v1.8.0