From c9d7144ee410f69d1e666548e5f7985fe1e0adc4 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, 15 Jan 2020 13:56:02 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=EF=BC=88=E6=B5=8B=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go  | 38 +++++++++++++++++++----------------
 business/jxstore/cms/sync2.go | 19 ++++++++++++++++++
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index a61a2d7c8..32e2f867d 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -632,23 +632,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
 	}
 	task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList)
 	if isAsync {
-		task.SetFinishHook(func(task tasksch.ITask) {
-			var noticeMsg string
-			if ctx.GetUserName() != "jxadmin" {
-				if len(task.GetFailedList()) > 10 {
-					downloadURL, _, _ := WirteToExcelBySyncFailed(task)
-					noticeMsg = "您此次的同步任务错误详情返回如下：  "
-					noticeMsg += fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s  \n", globals.BackstageHost, downloadURL)
-				} else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 {
-					if task.GetErr() != nil {
-						noticeMsg = utils.Format4Output(buildErrMsgJson(task), true)
-					}
-				}
-				if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
-				}
-			}
-		})
+		buildSetFinishHook(task, ctx)
 	}
 	tasksch.HandleTask(task, parentTask, isManageIt).Run()
 	if !isAsync {
@@ -669,6 +653,26 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
 	return task, hint, err
 }
 
+func buildSetFinishHook(task tasksch.ITask, ctx *jxcontext.Context) {
+	task.SetFinishHook(func(task tasksch.ITask) {
+		var noticeMsg string
+		if ctx.GetUserName() != "jxadmin" {
+			if len(task.GetFailedList()) > 10 {
+				downloadURL, _, _ := WirteToExcelBySyncFailed(task)
+				noticeMsg = "您此次的同步任务错误详情返回如下：  "
+				noticeMsg += fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s  \n", globals.BackstageHost, downloadURL)
+			} else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 {
+				if task.GetErr() != nil {
+					noticeMsg = utils.Format4Output(buildErrMsgJson(task), true)
+				}
+			}
+			if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
+				ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
+			}
+		}
+	})
+}
+
 func buildErrMsg(task tasksch.ITask) (err error) {
 	err = fmt.Errorf(utils.Format4Output(buildErrMsgJson(task), true))
 	return makeSpecSyncError(err)
diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index c4adde26d..a8f16de87 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -137,6 +137,7 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 		task := tasksch.NewParallelTask(fmt.Sprintf("同步商品:%v,%v", nameIDs, skuIDs), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
 			func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 				skuVendorInfo := batchItemList[0].(*dao.StoreSkuSyncInfo)
+				var failedList []*partner.StoreSkuInfoWithErr
 				if skuVendorInfo.VendorCatID == "" {
 					return nil, fmt.Errorf("商品:%d的商家分类没有同步", skuVendorInfo.SkuID)
 				}
@@ -150,25 +151,43 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 						if !dao.IsVendorThingIDEmpty(skuVendorInfo.VendorSkuID) &&
 							model.IsSyncStatusNeedDelete(skuVendorInfo.SkuSyncStatus) {
 							err = multiStoresHandler.DeleteSku2(ctx, skuVendorInfo.VendorOrgCode, storeSkuSyncInfo2Bare(skuVendorInfo))
+							if err != nil {
+								failedList = putils.GetErrMsg2FailedSingleList(skuVendorInfo, err, 0, skuVendorInfo.VendorID, "删除商品")
+							}
 						}
 					} else if model.IsSyncStatusNew(skuVendorInfo.SkuSyncStatus) { // 新增
 						err = multiStoresHandler.CreateSku2(ctx, skuVendorInfo)
+						if err != nil {
+							failedList = putils.GetErrMsg2FailedSingleList(skuVendorInfo, err, 0, skuVendorInfo.VendorID, "新增商品")
+						}
 					} else if model.IsSyncStatusUpdate(skuVendorInfo.SkuSyncStatus) { // 修改
 						err = multiStoresHandler.UpdateSku2(ctx, skuVendorInfo)
+						if err != nil {
+							failedList = putils.GetErrMsg2FailedSingleList(skuVendorInfo, err, 0, skuVendorInfo.VendorID, "修改商品")
+						}
 					}
 				} else {
 					err = fmt.Errorf("平台:%d不合法", skuVendorInfo.VendorID)
 				}
+				if len(failedList) > 0 {
+					task.AddFailedList(failedList)
+				}
 				if err = OnThingSync(ctx, dao.GetDB(), SkuVendor2ThingMap(skuVendorInfo), err); err == nil {
 					retVal = []int{1}
 				}
 				return retVal, err
 			}, skuList)
+		if isAsync {
+			buildSetFinishHook(task, ctx)
+		}
 		tasksch.HandleTask(task, parentTask, len(skuList) == 0 || len(skuList) > 10).Run()
 		if isAsync {
 			hint = task.GetID()
 		} else {
 			resultList, err2 := task.GetResult(0)
+			if len(task.GetFailedList()) > 0 {
+				err2 = buildErrMsg(task)
+			}
 			if err = err2; err == nil {
 				hint = utils.Int2Str(len(resultList))
 			}

From 07badc4a8f5b3f747165361636a0406a7bbcf9dc 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, 15 Jan 2020 14:06:06 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/putils/store_sku.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go
index e3004f7a8..1b1ee7a72 100644
--- a/business/partner/putils/store_sku.go
+++ b/business/partner/putils/store_sku.go
@@ -262,6 +262,23 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID, ve
 					SyncType:     syncType,
 				}
 				failedList = append(failedList, storeSkuInfoWithErr)
+			} else if storeSku, ok := storeSkuList.(*dao.StoreSkuSyncInfo); ok {
+				storeSkuInfo := &partner.StoreSkuInfo{
+					SkuID:        storeSku.SkuID,
+					VendorSkuID:  storeSku.VendorSkuID,
+					NameID:       storeSku.NameID,
+					VendorNameID: storeSku.VendorNameID,
+					VendorPrice:  storeSku.VendorPrice,
+					Status:       storeSku.Status,
+				}
+				storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{
+					StoreSkuInfo: storeSkuInfo,
+					ErrMsg:       errExt.ErrMsg(),
+					StoreID:      storeID,
+					VendoreID:    vendorID,
+					SyncType:     syncType,
+				}
+				failedList = append(failedList, storeSkuInfoWithErr)
 			} else {
 				storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{
 					ErrMsg:    errExt.ErrMsg(),

From f7535eac303c3ac833960cf693414812780822dc 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, 15 Jan 2020 14:12:57 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 771f237c8..f1f9f2256 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1079,8 +1079,8 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}
 		errList := errlist.New()
 		errList.AddErr(err)
 		_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
-		errList.AddErr(err)
-		err = errList.GetErrListAsOne()
+		// errList.AddErr(err)
+		// err = errList.GetErrListAsOne()
 	}
 	return num, err
 }

From 41583569f725a0f883f90362082f7a91e9400b25 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, 15 Jan 2020 14:16:04 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go   | 4 ++--
 business/jxstore/cms/sync2.go | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index f1f9f2256..771f237c8 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1079,8 +1079,8 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}
 		errList := errlist.New()
 		errList.AddErr(err)
 		_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
-		// errList.AddErr(err)
-		// err = errList.GetErrListAsOne()
+		errList.AddErr(err)
+		err = errList.GetErrListAsOne()
 	}
 	return num, err
 }
diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index a8f16de87..aca28fa56 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -187,6 +187,7 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 			resultList, err2 := task.GetResult(0)
 			if len(task.GetFailedList()) > 0 {
 				err2 = buildErrMsg(task)
+				err2 = makeSyncError(err2)
 			}
 			if err = err2; err == nil {
 				hint = utils.Int2Str(len(resultList))

From 42b83cc8d15511839c5f76a1675341f8eba7fe91 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, 15 Jan 2020 14:41:09 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=AE=A1=E7=90=86=E8=BF=94=E5=9B=9E=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 32e2f867d..befeaf812 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -6,6 +6,8 @@ import (
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner/putils"
+
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -230,6 +232,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 	isManageIt := len(storeIDs) == 0 || len(storeIDs) > 5
 	_, hint, err = v.LoopStoresMap2(ctx, nil, db, fmt.Sprintf("同步门店信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, mustDirty, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (resultList interface{}, err error) {
 		loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
+		var failedList []*partner.StoreSkuInfoWithErr
 		handler := v.GetStoreHandler(loopMapInfo.VendorID)
 		if handler != nil {
 			if len(loopMapInfo.StoreMapList) > 1 {
@@ -245,6 +248,8 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 							storeMap.SyncStatus = 0
 							_, err = dao.UpdateEntity(db2, storeMap, model.FieldSyncStatus)
 							resultList = append(resultList, 1)
+						} else {
+							failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, storeMap.VendorID, "同步门店")
 						}
 						return resultList, err
 					}, loopMapInfo.StoreMapList)
@@ -255,6 +260,8 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 				if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
 					storeMap.SyncStatus = 0
 					_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+				} else {
+					failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, storeMap.VendorID, "同步门店")
 				}
 				if err == nil {
 					resultList = []interface{}{1}
@@ -262,6 +269,9 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 			}
 			err = partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}
+		if len(failedList) > 0 {
+			t.AddFailedList(failedList)
+		}
 		return resultList, err
 	}, true)
 	return hint, makeSyncError(err)

From 942328e96f5cec3796022331df6d2236bed01c68 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, 16 Jan 2020 10:08:44 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E7=94=A8Excel=E5=AF=BC=E5=85=A5=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8(=E4=B8=80=E5=8D=8A)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/act/act.go |  5 +++++
 controllers/act.go          | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index f006081ad..a95be0634 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -3,6 +3,7 @@ package act
 import (
 	"fmt"
 	"math"
+	"mime/multipart"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -1150,3 +1151,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 	}
 	return hint, err
 }
+
+func CreateActByExcel(ctx *jxcontext.Context, file []*multipart.FileHeader, vendorID, impType int) (hint string, err error) {
+	return hint, err
+}
diff --git a/controllers/act.go b/controllers/act.go
index d3626bfc2..9cde3aa98 100644
--- a/controllers/act.go
+++ b/controllers/act.go
@@ -116,6 +116,23 @@ func (c *ActController) CreateAct() {
 	})
 }
 
+// @Title 通过Excel创建活动
+// @Description 通过Excel创建活动
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorID		formData	int		false	"平台ID"
+// @Param	impType			formData	int		false	"导入类型：一个门店对一个商品传1，所有门店对所有商品传2"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /CreateActByExcel [post]
+func (c *ActController) CreateActByExcel() {
+	c.callCreateActByExcel(func(params *tActCreateActByExcelParams) (retVal interface{}, errCode string, err error) {
+		r := c.Ctx.Request
+		files := r.MultipartForm.File["userfiles"]
+		retVal, err = act.CreateActByExcel(params.Ctx, files, params.VendorID, params.ImpType)
+		return retVal, "", err
+	})
+}
+
 // @Title 查询活动
 // @Description 查询活动
 // @Param	token			header		string	true	"认证token"

From e925327e8a1509eb0a38cfe776783608c37d89a7 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, 15 Jan 2020 13:56:02 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=EF=BC=88=E6=B5=8B=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go  | 38 +++++++++++++++++++----------------
 business/jxstore/cms/sync2.go | 19 ++++++++++++++++++
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 140eea868..d401bf3cc 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -621,23 +621,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
 	}
 	task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList)
 	if isAsync {
-		task.SetFinishHook(func(task tasksch.ITask) {
-			var noticeMsg string
-			if ctx.GetUserName() != "jxadmin" {
-				if len(task.GetFailedList()) > 10 {
-					downloadURL, _, _ := WirteToExcelBySyncFailed(task)
-					noticeMsg = "您此次的同步任务错误详情返回如下：  "
-					noticeMsg += fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s  \n", globals.BackstageHost, downloadURL)
-				} else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 {
-					if task.GetErr() != nil {
-						noticeMsg = utils.Format4Output(buildErrMsgJson(task), true)
-					}
-				}
-				if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
-				}
-			}
-		})
+		buildSetFinishHook(task, ctx)
 	}
 	tasksch.HandleTask(task, parentTask, isManageIt).Run()
 	if !isAsync {
@@ -658,6 +642,26 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
 	return task, hint, err
 }
 
+func buildSetFinishHook(task tasksch.ITask, ctx *jxcontext.Context) {
+	task.SetFinishHook(func(task tasksch.ITask) {
+		var noticeMsg string
+		if ctx.GetUserName() != "jxadmin" {
+			if len(task.GetFailedList()) > 10 {
+				downloadURL, _, _ := WirteToExcelBySyncFailed(task)
+				noticeMsg = "您此次的同步任务错误详情返回如下：  "
+				noticeMsg += fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s  \n", globals.BackstageHost, downloadURL)
+			} else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 {
+				if task.GetErr() != nil {
+					noticeMsg = utils.Format4Output(buildErrMsgJson(task), true)
+				}
+			}
+			if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
+				ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
+			}
+		}
+	})
+}
+
 func buildErrMsg(task tasksch.ITask) (err error) {
 	err = fmt.Errorf(utils.Format4Output(buildErrMsgJson(task), true))
 	return makeSpecSyncError(err)
diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index c4adde26d..a8f16de87 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -137,6 +137,7 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 		task := tasksch.NewParallelTask(fmt.Sprintf("同步商品:%v,%v", nameIDs, skuIDs), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
 			func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 				skuVendorInfo := batchItemList[0].(*dao.StoreSkuSyncInfo)
+				var failedList []*partner.StoreSkuInfoWithErr
 				if skuVendorInfo.VendorCatID == "" {
 					return nil, fmt.Errorf("商品:%d的商家分类没有同步", skuVendorInfo.SkuID)
 				}
@@ -150,25 +151,43 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 						if !dao.IsVendorThingIDEmpty(skuVendorInfo.VendorSkuID) &&
 							model.IsSyncStatusNeedDelete(skuVendorInfo.SkuSyncStatus) {
 							err = multiStoresHandler.DeleteSku2(ctx, skuVendorInfo.VendorOrgCode, storeSkuSyncInfo2Bare(skuVendorInfo))
+							if err != nil {
+								failedList = putils.GetErrMsg2FailedSingleList(skuVendorInfo, err, 0, skuVendorInfo.VendorID, "删除商品")
+							}
 						}
 					} else if model.IsSyncStatusNew(skuVendorInfo.SkuSyncStatus) { // 新增
 						err = multiStoresHandler.CreateSku2(ctx, skuVendorInfo)
+						if err != nil {
+							failedList = putils.GetErrMsg2FailedSingleList(skuVendorInfo, err, 0, skuVendorInfo.VendorID, "新增商品")
+						}
 					} else if model.IsSyncStatusUpdate(skuVendorInfo.SkuSyncStatus) { // 修改
 						err = multiStoresHandler.UpdateSku2(ctx, skuVendorInfo)
+						if err != nil {
+							failedList = putils.GetErrMsg2FailedSingleList(skuVendorInfo, err, 0, skuVendorInfo.VendorID, "修改商品")
+						}
 					}
 				} else {
 					err = fmt.Errorf("平台:%d不合法", skuVendorInfo.VendorID)
 				}
+				if len(failedList) > 0 {
+					task.AddFailedList(failedList)
+				}
 				if err = OnThingSync(ctx, dao.GetDB(), SkuVendor2ThingMap(skuVendorInfo), err); err == nil {
 					retVal = []int{1}
 				}
 				return retVal, err
 			}, skuList)
+		if isAsync {
+			buildSetFinishHook(task, ctx)
+		}
 		tasksch.HandleTask(task, parentTask, len(skuList) == 0 || len(skuList) > 10).Run()
 		if isAsync {
 			hint = task.GetID()
 		} else {
 			resultList, err2 := task.GetResult(0)
+			if len(task.GetFailedList()) > 0 {
+				err2 = buildErrMsg(task)
+			}
 			if err = err2; err == nil {
 				hint = utils.Int2Str(len(resultList))
 			}

From ccff34148920befad02a656706cb4509f8c6c96a 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, 15 Jan 2020 14:06:06 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/putils/store_sku.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/business/partner/putils/store_sku.go b/business/partner/putils/store_sku.go
index e3004f7a8..1b1ee7a72 100644
--- a/business/partner/putils/store_sku.go
+++ b/business/partner/putils/store_sku.go
@@ -262,6 +262,23 @@ func GetErrMsg2FailedSingleList(storeSkuList interface{}, err error, storeID, ve
 					SyncType:     syncType,
 				}
 				failedList = append(failedList, storeSkuInfoWithErr)
+			} else if storeSku, ok := storeSkuList.(*dao.StoreSkuSyncInfo); ok {
+				storeSkuInfo := &partner.StoreSkuInfo{
+					SkuID:        storeSku.SkuID,
+					VendorSkuID:  storeSku.VendorSkuID,
+					NameID:       storeSku.NameID,
+					VendorNameID: storeSku.VendorNameID,
+					VendorPrice:  storeSku.VendorPrice,
+					Status:       storeSku.Status,
+				}
+				storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{
+					StoreSkuInfo: storeSkuInfo,
+					ErrMsg:       errExt.ErrMsg(),
+					StoreID:      storeID,
+					VendoreID:    vendorID,
+					SyncType:     syncType,
+				}
+				failedList = append(failedList, storeSkuInfoWithErr)
 			} else {
 				storeSkuInfoWithErr := &partner.StoreSkuInfoWithErr{
 					ErrMsg:    errExt.ErrMsg(),

From 7f2be04650800af53af190cbabe974077cd0068b 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, 15 Jan 2020 14:12:57 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index bd54c3757..d5961eff4 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1079,8 +1079,8 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}
 		errList := errlist.New()
 		errList.AddErr(err)
 		_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
-		errList.AddErr(err)
-		err = errList.GetErrListAsOne()
+		// errList.AddErr(err)
+		// err = errList.GetErrListAsOne()
 	}
 	return num, err
 }

From d09279222954b1501c1bd3c747d10076e8be4a2e 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, 15 Jan 2020 14:16:04 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go   | 4 ++--
 business/jxstore/cms/sync2.go | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index d5961eff4..bd54c3757 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1079,8 +1079,8 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}
 		errList := errlist.New()
 		errList.AddErr(err)
 		_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
-		// errList.AddErr(err)
-		// err = errList.GetErrListAsOne()
+		errList.AddErr(err)
+		err = errList.GetErrListAsOne()
 	}
 	return num, err
 }
diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index a8f16de87..aca28fa56 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -187,6 +187,7 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 			resultList, err2 := task.GetResult(0)
 			if len(task.GetFailedList()) > 0 {
 				err2 = buildErrMsg(task)
+				err2 = makeSyncError(err2)
 			}
 			if err = err2; err == nil {
 				hint = utils.Int2Str(len(resultList))

From 1ded6199f4d2655763983bf50bef9551dd83e05c 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, 15 Jan 2020 14:41:09 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=AE=A1=E7=90=86=E8=BF=94=E5=9B=9E=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index d401bf3cc..6c11bb624 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -6,6 +6,8 @@ import (
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner/putils"
+
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -230,6 +232,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 	isManageIt := len(storeIDs) == 0 || len(storeIDs) > 5
 	_, hint, err = v.LoopStoresMap2(ctx, nil, db, fmt.Sprintf("同步门店信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, mustDirty, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (resultList interface{}, err error) {
 		loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
+		var failedList []*partner.StoreSkuInfoWithErr
 		handler := v.GetStoreHandler(loopMapInfo.VendorID)
 		if handler != nil {
 			if len(loopMapInfo.StoreMapList) > 1 {
@@ -245,6 +248,8 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 							storeMap.SyncStatus = 0
 							_, err = dao.UpdateEntity(db2, storeMap, model.FieldSyncStatus)
 							resultList = append(resultList, 1)
+						} else {
+							failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, storeMap.VendorID, "同步门店")
 						}
 						return resultList, err
 					}, loopMapInfo.StoreMapList)
@@ -255,6 +260,8 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 				if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
 					storeMap.SyncStatus = 0
 					_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+				} else {
+					failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, storeMap.VendorID, "同步门店")
 				}
 				if err == nil {
 					resultList = []interface{}{1}
@@ -262,6 +269,9 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 			}
 			err = partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}
+		if len(failedList) > 0 {
+			t.AddFailedList(failedList)
+		}
 		return resultList, err
 	}, true)
 	return hint, makeSyncError(err)

From fdce90097260211ab900c64d18a66d648608cfc2 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, 16 Jan 2020 10:48:54 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/act/act.go |  4 ----
 controllers/act.go          | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index ed0487a63..1ac655acb 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -1151,7 +1151,3 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 	}
 	return hint, err
 }
-
-func CreateActByExcel(ctx *jxcontext.Context, file []*multipart.FileHeader, vendorID, impType int) (hint string, err error) {
-	return hint, err
-}
diff --git a/controllers/act.go b/controllers/act.go
index 9cde3aa98..d3626bfc2 100644
--- a/controllers/act.go
+++ b/controllers/act.go
@@ -116,23 +116,6 @@ func (c *ActController) CreateAct() {
 	})
 }
 
-// @Title 通过Excel创建活动
-// @Description 通过Excel创建活动
-// @Param	token			header		string	true	"认证token"
-// @Param	vendorID		formData	int		false	"平台ID"
-// @Param	impType			formData	int		false	"导入类型：一个门店对一个商品传1，所有门店对所有商品传2"
-// @Success 200 {object} controllers.CallResult
-// @Failure 200 {object} controllers.CallResult
-// @router /CreateActByExcel [post]
-func (c *ActController) CreateActByExcel() {
-	c.callCreateActByExcel(func(params *tActCreateActByExcelParams) (retVal interface{}, errCode string, err error) {
-		r := c.Ctx.Request
-		files := r.MultipartForm.File["userfiles"]
-		retVal, err = act.CreateActByExcel(params.Ctx, files, params.VendorID, params.ImpType)
-		return retVal, "", err
-	})
-}
-
 // @Title 查询活动
 // @Description 查询活动
 // @Param	token			header		string	true	"认证token"

From 2b2eb2a67ddd936119ddb5355afcef1bc4705812 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, 16 Jan 2020 10:49:48 +0800
Subject: [PATCH 13/13] mm

---
 business/jxstore/act/act.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index 1ac655acb..ae20ce1f8 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -3,7 +3,6 @@ package act
 import (
 	"fmt"
 	"math"
-	"mime/multipart"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"