From 7615cfa6bcf6523059b18dfea8907891fb3eec34 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 13 Dec 2019 16:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BB=93=E7=AE=97=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8D=E5=88=A4=E6=96=AD=E9=97=A8=E5=BA=97=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/act/act.go | 98 +++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index 4de287908..f0490e7d5 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -138,62 +138,64 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 			for _, vendorID := range vendorIDs {
 				storeDetail, err2 := dao.GetStoreDetail(db, storeID, vendorID)
 				if err = err2; err == nil {
-					if storeDetail.IsSync != 0 && storeDetail.Status != model.StoreStatusDisabled && storeDetail.VendorStatus != model.StoreStatusDisabled {
-						for _, v := range oneStoreSkuParam {
-							validVendorMap[vendorID] = 1
-							validSkuMap[v.SkuID] = 1
-							v.ActID = act.ID
-							actSkuMap := &model.ActStoreSkuMap{
-								ActID:    act.ID,
-								StoreID:  storeID,
-								SkuID:    v.SkuID,
-								VendorID: vendorID,
-							}
-							v.OriginalPrice = actSkuMap.VendorPrice
-							storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
-							if storeSkuInfo != nil {
-								jxPrice := storeSkuInfo.Price
-								actSkuMap.VendorPrice = int64(getVendorPriceFromStoreSkuBind(storeSkuInfo, vendorID))
-								v.OriginalPrice = int64(jxPrice)
-							}
-							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
+					if storeDetail.IsSync != 0 {
+						if act.Type == model.ActSkuFake ||
+							storeDetail.Status != model.StoreStatusDisabled && storeDetail.VendorStatus != model.StoreStatusDisabled {
+							for _, v := range oneStoreSkuParam {
+								validVendorMap[vendorID] = 1
+								validSkuMap[v.SkuID] = 1
+								v.ActID = act.ID
+								actSkuMap := &model.ActStoreSkuMap{
+									ActID:    act.ID,
+									StoreID:  storeID,
+									SkuID:    v.SkuID,
+									VendorID: vendorID,
 								}
-								if !(vendorID == model.VendorIDJX || act.Type == model.ActSkuFake) {
-									actSkuMap.SyncStatus = model.SyncFlagNewMask
+								storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
+								if storeSkuInfo != nil {
+									jxPrice := storeSkuInfo.Price
+									actSkuMap.VendorPrice = int64(getVendorPriceFromStoreSkuBind(storeSkuInfo, vendorID))
+									v.OriginalPrice = int64(jxPrice)
 								}
-								if v.ActPrice != 0 {
-									actSkuMap.ActualActPrice = v.ActPrice
-								} else {
-									percentage := act.PricePercentage
-									if v.PricePercentage != 0 {
-										percentage = v.PricePercentage
+								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.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage, 0))
-									if actSkuMap.ActualActPrice > 10 {
-										actSkuMap.ActualActPrice = int64(math.Floor(float64(actSkuMap.ActualActPrice)/10) * 10)
+									if !(vendorID == model.VendorIDJX || act.Type == model.ActSkuFake) {
+										actSkuMap.SyncStatus = model.SyncFlagNewMask
+									}
+									if v.ActPrice != 0 {
+										actSkuMap.ActualActPrice = v.ActPrice
+									} else {
+										percentage := act.PricePercentage
+										if v.PricePercentage != 0 {
+											percentage = v.PricePercentage
+										}
+										actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage, 0))
+										if actSkuMap.ActualActPrice > 10 {
+											actSkuMap.ActualActPrice = int64(math.Floor(float64(actSkuMap.ActualActPrice)/10) * 10)
+										}
+									}
+									if actSkuMap.ActualActPrice <= 0 {
+										actSkuMap.ActualActPrice = 1
+									}
+									if err2 = checkDiscountValidation(vendorIDs, act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil {
+										v.ErrMsg = err2.Error()
+										v.ActualActPrice = actSkuMap.ActualActPrice
+										v.VendorPrice = actSkuMap.VendorPrice
+										wrongSkuList = append(wrongSkuList, v)
 									}
 								}
-								if actSkuMap.ActualActPrice <= 0 {
-									actSkuMap.ActualActPrice = 1
-								}
-								if err2 = checkDiscountValidation(vendorIDs, act.Type, float64(actSkuMap.ActualActPrice)*100/float64(actSkuMap.VendorPrice)); err2 != nil {
-									v.ErrMsg = err2.Error()
-									v.ActualActPrice = actSkuMap.ActualActPrice
-									v.VendorPrice = actSkuMap.VendorPrice
-									wrongSkuList = append(wrongSkuList, v)
+								if err2 == nil {
+									dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
+									actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
 								}
 							}
-							if err2 == nil {
-								dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
-								actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
-							}
+							wholeValidVendorMap[vendorID] = 1
 						}
-						wholeValidVendorMap[vendorID] = 1
 					}
 				} else if !dao.IsNoRowsError(err) {
 					return nil, nil, nil, err