From 802f328510cf428fa7515bcc86f2016163399290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 8 Jul 2020 18:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 41 +++++++++++++++++--------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 9680942e7..5689839b3 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1671,24 +1671,29 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 		if vendorMap[v.SkuID] == nil && v.Status == model.StoreSkuBindStatusNormal {
 			addList = append(addList, v.SkuID)
 		} else {
-			if int64(v.JdsPrice) != vendorMap[v.SkuID].SkuList[0].VendorPrice {
-				updateList = append(updateList, &tTmp{
-					SkuID:  v.SkuID,
-					Reason: "价格不同",
-				})
-			}
-			if v.Status != vendorStock2JxStatus(vendorMap[v.SkuID].SkuList[0].Stock) {
-				updateList = append(updateList, &tTmp{
-					SkuID:  v.SkuID,
-					Reason: "库存可售不同",
-				})
-			}
-			skus, _ := dao.GetSkus(dao.GetDB(), []int{v.SkuID}, nil, nil, nil, nil)
-			if skus[0].Comment != vendorMap[v.SkuID].SkuList[0].Comment {
-				updateList = append(updateList, &tTmp{
-					SkuID:  v.SkuID,
-					Reason: "备注与销售属性不同",
-				})
+			if vendorMap[v.SkuID].SkuList[0] != nil {
+				fmt.Println("vendorMap", utils.Format4Output(vendorMap[v.SkuID], false))
+				if int64(v.JdsPrice) != vendorMap[v.SkuID].SkuList[0].VendorPrice {
+					updateList = append(updateList, &tTmp{
+						SkuID:  v.SkuID,
+						Reason: "价格不同",
+					})
+				}
+				if v.Status != vendorStock2JxStatus(vendorMap[v.SkuID].SkuList[0].Stock) {
+					updateList = append(updateList, &tTmp{
+						SkuID:  v.SkuID,
+						Reason: "库存可售不同",
+					})
+				}
+				skus, _ := dao.GetSkus(dao.GetDB(), []int{v.SkuID}, nil, nil, nil, nil)
+				if skus[0].Comment != "" {
+					if skus[0].Comment != vendorMap[v.SkuID].SkuList[0].Comment {
+						updateList = append(updateList, &tTmp{
+							SkuID:  v.SkuID,
+							Reason: "备注与销售属性不同",
+						})
+					}
+				}
 			}
 		}
 		localMap[v.SkuID] = v