From 9b12510cca52c5ebe21216dc8c2ec8f780665213 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 18 Nov 2019 11:52:19 +0800
Subject: [PATCH] =?UTF-8?q?jd.UpdateStore=E4=B8=AD=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=B9=9F=E8=A6=81=E5=B0=9D=E8=AF=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=85=8D=E8=BF=90=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jd/store.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 0c7f6461b..039fd747e 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -15,6 +15,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
@@ -160,10 +161,9 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			}
 			fillOpTimeParams(storeParams, store.GetOpTimeList())
 			globals.SugarLogger.Debug(utils.Format4Output(storeParams, false))
+			errList := errlist.New()
 			if globals.EnableJdStoreWrite {
-				if err = getAPI("").UpdateStoreInfo4Open2(storeParams, modifyCloseStatus); err != nil {
-					return err
-				}
+				errList.AddErr(getAPI("").UpdateStoreInfo4Open2(storeParams, modifyCloseStatus))
 			}
 			if store.FreightDeductionPack != "" {
 				storeDetail, err2 := dao.GetStoreDetail(db, store.ID, model.VendorIDJD)
@@ -196,11 +196,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 						freightParams.IsFullFree = len(freightParams.FreeFreightInfoList) > 0
 						globals.SugarLogger.Debug(utils.Format4Output(freightParams, false))
 						if globals.EnableJdStoreWrite {
-							err = getAPI("").UpdateStoreFreightConfigNew(freightParams)
+							errList.AddErr(getAPI("").UpdateStoreFreightConfigNew(freightParams))
 						}
 					}
 				}
 			}
+			err = errList.GetErrListAsOne()
 		}
 	}
 	return err