From 24c9ee0636591c9331ed205dc138a4dc61ad4648 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 17 Jul 2019 17:02:57 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=AF=B9=E4=BA=8E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E8=BF=87=E6=9D=A5=E7=9A=84=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E5=8E=BB=E9=87=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=AF=94=E5=A6=82=E4=BA=AC=E4=B8=9C=E7=9A=84=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=9A74336221=E5=B0=B1=E6=9C=89=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/act/act.go | 52 ++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index 790f7b91a..665ababea 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -412,34 +412,38 @@ func vendorActInfo2Model(ctx *jxcontext.Context, db *dao.DaoDB, act2 *model.Act2
 	for _, v := range storeSkuList {
 		storeSkuMap[v.VendorStoreID+"/"+v.VendorSkuID] = v
 	}
-
+	storeSkuMap2 := make(map[int64]int)
 	for _, v := range actStoreSku {
 		if storeSkuInfo := storeSkuMap[v.VendorStoreID+"/"+v.VendorSkuID]; storeSkuInfo != nil {
-			actSku := &model.ActStoreSku{
-				ActID:   act2.ID,
-				StoreID: storeSkuInfo.StoreID,
-				SkuID:   storeSkuInfo.SkuID,
+			index := jxutils.Combine2Int(storeSkuInfo.StoreID, storeSkuInfo.SkuID)
+			if storeSkuMap2[index] == 0 {
+				storeSkuMap2[index] = 1
+				actSku := &model.ActStoreSku{
+					ActID:   act2.ID,
+					StoreID: storeSkuInfo.StoreID,
+					SkuID:   storeSkuInfo.SkuID,
 
-				Stock:         v.Stock,
-				ActPrice:      v.ActualActPrice,
-				OriginalPrice: int64(storeSkuInfo.Price),
+					Stock:         v.Stock,
+					ActPrice:      v.ActualActPrice,
+					OriginalPrice: int64(storeSkuInfo.Price),
+				}
+				dao.WrapAddIDCULDEntity(actSku, ctx.GetUserName())
+				actStoreSkuList = append(actStoreSkuList, actSku)
+
+				actSkuMap := &model.ActStoreSkuMap{
+					ActID:       act2.ID,
+					VendorActID: act2.VendorActID,
+					StoreID:     storeSkuInfo.StoreID,
+					SkuID:       storeSkuInfo.SkuID,
+					VendorID:    vendorID,
+
+					SyncStatus:     0,
+					VendorPrice:    0,
+					ActualActPrice: v.ActualActPrice,
+				}
+				dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
+				actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
 			}
-			dao.WrapAddIDCULDEntity(actSku, ctx.GetUserName())
-			actStoreSkuList = append(actStoreSkuList, actSku)
-
-			actSkuMap := &model.ActStoreSkuMap{
-				ActID:       act2.ID,
-				VendorActID: act2.VendorActID,
-				StoreID:     storeSkuInfo.StoreID,
-				SkuID:       storeSkuInfo.SkuID,
-				VendorID:    vendorID,
-
-				SyncStatus:     0,
-				VendorPrice:    0,
-				ActualActPrice: v.ActualActPrice,
-			}
-			dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
-			actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
 		}
 	}
 	return actStoreSkuList, actStoreSkuMapList, err