From 9cbfa6f6eff937fec26c24c260f0b341415e9566 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 4 Nov 2019 20:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8A=E5=A4=A9=E6=94=B9?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=BC=95=E5=85=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/act/act.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index d84c4a540..eef24edb7 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -128,24 +128,23 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 							StoreID:  storeID,
 							SkuID:    v.SkuID,
 							VendorID: vendorID,
-
-							SyncStatus: model.SyncFlagNewMask,
 						}
 						v.OriginalPrice = actSkuMap.VendorPrice
-						if storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]; storeSkuInfo != nil {
+						storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
+						if storeSkuInfo != nil {
 							jxPrice := storeSkuInfo.Price
 							pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, jxPrice, int(storeDetail.PricePercentage))
 							actSkuMap.VendorPrice = int64(jxutils.CaculateSkuVendorPrice(jxPrice, pricePercentage))
 							v.OriginalPrice = int64(jxPrice)
-						} else if act.Type != model.ActSkuFake {
-							v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID)
-							wrongSkuList = append(wrongSkuList, v)
-							continue
 						}
-						if act.Type == model.ActSkuFake {
-							actSkuMap.ActualActPrice = 0
-							actSkuMap.SyncStatus = 0
-						} else {
+						var err2 error
+						if act.Type != model.ActSkuFake {
+							if storeSkuInfo == nil {
+								v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID)
+								wrongSkuList = append(wrongSkuList, v)
+								continue
+							}
+							actSkuMap.SyncStatus = model.SyncFlagNewMask
 							if v.ActPrice != 0 {
 								actSkuMap.ActualActPrice = v.ActPrice
 							} else {
@@ -161,15 +160,16 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 							if actSkuMap.ActualActPrice <= 0 {
 								actSkuMap.ActualActPrice = 1
 							}
-							if err2 := checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil {
+							if err2 = checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil {
 								v.ErrMsg = err2.Error()
 								v.ActualActPrice = actSkuMap.ActualActPrice
 								wrongSkuList = append(wrongSkuList, v)
-							} else {
-								dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
-								actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
 							}
 						}
+						if err2 == nil {
+							dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
+							actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
+						}
 					}
 					wholeValidVendorMap[vendorID] = 1
 				} else if !dao.IsNoRowsError(err) {