From ef8acccb3bc8dca8a7cd450671cc94452c10f354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 Nov 2019 15:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=B0=B8=E8=BE=89excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/yonghui/yonghui.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/yonghui/yonghui.go b/business/jxstore/yonghui/yonghui.go
index 83a736092..9037d406b 100644
--- a/business/jxstore/yonghui/yonghui.go
+++ b/business/jxstore/yonghui/yonghui.go
@@ -114,7 +114,7 @@ var (
 			OrgSkuIdCol:    5,
 			OrgSkuPriceCol: 8,
 			OrgSkuNameCol:  6,
-			SkuRow:         2,
+			SkuRow:         1,
 		}, "水果": &SheetParam{
 			SkuIDCol:       0,
 			SkuPriceCol:    14,
@@ -335,9 +335,9 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 							} else {
 								costPrice = skuMap[spuCode].Price
 							}
-							if errMsg == "" {
-								_, _, _ = updateWeiMobGoods(costPrice, skuMap[spuCode].Price, skuList[0].Unit, isCompare, goodsDetail)
-							}
+							// if errMsg == "" {
+							// 	_, _, _ = updateWeiMobGoods(costPrice, skuMap[spuCode].Price, skuList[0].Unit, isCompare, goodsDetail)
+							// }
 						}
 					} else {
 						//下架微盟商品
@@ -360,9 +360,9 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 				for _, v := range batchItemList {
 					int64Slice = append(int64Slice, v.(int64))
 				}
-				if errMsg == "" {
-					PutAwayWeiMobSku(int64Slice)
-				}
+				// if errMsg == "" {
+				// 	PutAwayWeiMobSku(int64Slice)
+				// }
 				return retVal, err
 			}
 			taskParallel4 := tasksch.NewParallelTask("下架微盟商品", tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetBatchSize(UpdateGoodsShelfStatusCount), ctx, taskFunc4, goodsIDListForPutAway)
@@ -755,7 +755,7 @@ func WriteToExcel(task *tasksch.SeqTask, dataSuccess []DataSuccess, dataFailed [
 	if err != nil {
 		baseapi.SugarLogger.Errorf("WriteToExcel:upload %s , %s failed error:%v", fileName1, fileName2, err)
 	} else {
-		noticeMsg := fmt.Sprintf("[详情点我]path1=%s, path2=%s  \n", globals.BackstageHost, downloadURL1, downloadURL2)
+		noticeMsg := fmt.Sprintf("[详情点我]path1=%s, path2=%s  \n", downloadURL1, downloadURL2)
 		task.SetNoticeMsg(noticeMsg)
 		baseapi.SugarLogger.Debugf("WriteToExcel:upload %s ,%s success, downloadURL1:%s ,downloadURL2:%s", fileName1, fileName2, downloadURL1, downloadURL2)
 	}
@@ -911,7 +911,7 @@ func WriteToExcel3(task *tasksch.SeqTask, dataSuccess []DataStoreSkusSuccess, da
 	if err != nil {
 		baseapi.SugarLogger.Errorf("WriteToExcel:upload %s , %s failed error:%v", fileName1, fileName2, err)
 	} else {
-		noticeMsg := fmt.Sprintf("[详情点我]path1=%s, path2=%s  \n", globals.BackstageHost, downloadURL1, downloadURL2)
+		noticeMsg := fmt.Sprintf("[详情点我]path1=%s, path2=%s  \n", downloadURL1, downloadURL2)
 		task.SetNoticeMsg(noticeMsg)
 		baseapi.SugarLogger.Debugf("WriteToExcel:upload %s ,%s success, downloadURL1:%s ,downloadURL2:%s", fileName1, fileName2, downloadURL1, downloadURL2)
 	}