From 8c9f3126af1a7a6f7cc2cff51449da6f77f56e01 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 18 八月 2023 17:36:11 +0800
Subject: [PATCH] fix
---
model/product.go | 3 +++
service/salesDetails.go | 39 ++++++++++++++++++++++++---------------
model/salesDetailsProduct.go | 4 ++--
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/model/product.go b/model/product.go
index 7ec7b6b..e88a323 100644
--- a/model/product.go
+++ b/model/product.go
@@ -47,6 +47,9 @@
if slf.Name != "" {
db = db.Where("name = ?", slf.Name)
}
+ if len(slf.Ids) != 0 {
+ db = db.Where("id in ?", slf.Ids)
+ }
return db
}
diff --git a/model/salesDetailsProduct.go b/model/salesDetailsProduct.go
index 467b869..a803e83 100644
--- a/model/salesDetailsProduct.go
+++ b/model/salesDetailsProduct.go
@@ -10,8 +10,8 @@
type (
// SalesDetailsProduct 閿�鍞槑缁嗗拰浜у搧鍏宠仈
SalesDetailsProduct struct {
- SalesDetailsId int `json:"id" gorm:"column:id;type:int;primary_key;AUTO_INCREMENT"`
- ProductId uint `json:"name" gorm:"primary_key;column:name;type:varchar(255);not null;default:'';comment:鍚嶇О"`
+ 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 閿�鍞槑缁嗗拰浜у搧鍏宠仈鎼滅储鏉′欢
diff --git a/service/salesDetails.go b/service/salesDetails.go
index a2e5ad8..73ff94b 100644
--- a/service/salesDetails.go
+++ b/service/salesDetails.go
@@ -53,7 +53,7 @@
func (SalesDetailsService) UpdateSalesDetails(salesDetails *model.SalesDetails) int {
// check salesDetails exist
- old, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).First()
+ old, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).SetPreload(true).First()
if err != nil {
return ecode.SalesDetailsNotExist
}
@@ -77,22 +77,31 @@
if err != nil {
return err
}
- err = model.NewProductSearch(db).SetIds(removedProductIds).Delete()
- if err != nil {
- return err
+ if len(removedProductIds) > 0 {
+ err = model.NewProductSearch(db).SetIds(removedProductIds).Delete()
+ if err != nil {
+ return err
+ }
}
- err = model.NewProductSearch(db).CreateBatch(newProducts)
- if err != nil {
- return err
+ if len(newProducts) > 0 {
+ err = model.NewProductSearch(db).CreateBatch(newProducts)
+ 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,
- })
- }
- return model.NewSalesDetailsProductSearch().CreateBatch(rel)
+ return nil
+
})
if err != nil {
--
Gitblit v1.8.0