From 29c79beb5f6fd844d366d08c0352f9b87f62322c Mon Sep 17 00:00:00 2001
From: timerzz <zhhgzhhgzhhg@163.com>
Date: Tue, 21 May 2024 19:46:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E5=88=A9=E6=B6=A6=E7=8E=87=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 product/controller.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/product/controller.go b/product/controller.go
index f378184..a2ed941 100644
--- a/product/controller.go
+++ b/product/controller.go
@@ -86,10 +86,10 @@ func (c *Controller) saveRespData(list []coach_client.Product) error {
 				return item.Id == color.VgId
 			})
 			// 获取已经存的运费
-			var saveFreight float64
-			c.db.Model(&productv1.Product{}).Where("pid = ?", color.VgId).Select("freight").Scan(&saveFreight)
-			if saveFreight > 0 {
-				c.Freight = saveFreight
+			var savedProduct productv1.Product
+			c.db.Model(&savedProduct).Where("pid = ?", color.VgId).Select("freight", "dw_price").Scan(&savedProduct)
+			if savedProduct.Freight == 0 {
+				savedProduct.Freight = c.Freight
 			}
 			products = append(products, productv1.Product{
 				UpdatedAt:    time.Now(),
@@ -101,8 +101,9 @@ func (c *Controller) saveRespData(list []coach_client.Product) error {
 				Orderable:    color.Orderable,
 				DiscPercent:  price.Price.MarkdownDiscPercent,
 				USPrice:      price.Price.Sales.Value,
-				Freight:      c.Freight,
+				Freight:      savedProduct.Freight,
 				ExchangeRate: c.ExchangeRate,
+				DWPrice:      savedProduct.DWPrice,
 			})
 		}
 	}