From 2e4c408170404d242da6de2c43e532ef17e8896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 29 Nov 2019 11:56:47 +0800 Subject: [PATCH 1/2] =?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 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/business/jxstore/yonghui/yonghui.go b/business/jxstore/yonghui/yonghui.go index fd9eccd86..2b1942188 100644 --- a/business/jxstore/yonghui/yonghui.go +++ b/business/jxstore/yonghui/yonghui.go @@ -235,14 +235,15 @@ func LoadExcelByYongHui(ctx *jxcontext.Context, files []*multipart.FileHeader, i func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, isContinueWhenError bool) (hint string, err error) { var ( skuMap = make(map[string]*ExcelParam) - errMsg string costPrice float64 //成本价 goodsList []*weimobapi.GoodsInfo goodsIDListForPutAway []interface{} isCompare bool + isExecute = false ) db := dao.GetDB() taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { + var errMsg string switch step { case 0: //读取excel文件 @@ -261,6 +262,11 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is // 分类名格式为：可定XX日 // XX为上传永辉 提供的 价格表时间 +2天 if errMsg == "" { + isExecute = true + } else { + err = fmt.Errorf(errMsg) + } + if isExecute { isCompare, err = UpdateClassifyAndGetLastClassify() } case 1: @@ -326,7 +332,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is } else { costPrice = skuMap[spuCode].Price } - if errMsg == "" { + if isExecute { _, _, _ = updateWeiMobGoods(costPrice, skuMap[spuCode].Price, skuList[0].Unit, isCompare, goodsDetail) } } @@ -351,7 +357,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is for _, v := range batchItemList { int64Slice = append(int64Slice, v.(int64)) } - if errMsg == "" { + if isExecute { PutAwayWeiMobSku(int64Slice) } return retVal, err @@ -362,9 +368,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is case 4: WriteToExcel(task, dataSuccess.dataSuccessList, dataFailed.dataFailedList) } - if errMsg != "" { - return result, errors.New(errMsg) - } + return result, err } taskSeq := tasksch.NewSeqTask2("读取永辉Excel文件修改微盟商品价格可售状态-序列任务", ctx, isContinueWhenError, taskSeqFunc, 5) From 595572ef145caeca37ec88e9def331546a95a975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 29 Nov 2019 14:33:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/tempop/tempop.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 6a3fd16b5..8f8dd250c 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -11,6 +11,7 @@ import ( "mime/multipart" "net/http" "regexp" + "sort" "strings" "sync" "time" @@ -49,6 +50,7 @@ var ( titleList = []string{ "用户名", "关联门店", + "状态", } ) @@ -60,6 +62,7 @@ type GetJdUsersStruct struct { type JdUserStruct struct { UserName string `json:"用户名"` StoreIDs string `json:"关联门店"` + Status string `json:"状态"` } func init() { @@ -1473,20 +1476,19 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint pageNoList []int storeUserList []interface{} ) - //获取京东有效的店 db := dao.GetDB() + //获取京东商城所有用户 + _, _, toatlPage, _ := api.JdAPI.PrivilegeSearchUser(1) + for i := 1; i <= toatlPage; i++ { + pageNoList = append(pageNoList, i) + } storeMapList, err := dao.GetStoreMapsListWithoutDisabled(db, []int{model.VendorIDJD}, model.StoreStatusDisabled) for _, v := range storeMapList { - jxVendorIDsMap[v.VendorStoreID] = v.VendorStoreID + jxVendorIDsMap[v.VendorStoreID] = utils.Int64ToStr(int64(v.StoreID)) } taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - //获取京东商城所有用户 - _, _, toatlPage, _ := api.JdAPI.PrivilegeSearchUser(1) - for i := 1; i <= toatlPage; i++ { - pageNoList = append(pageNoList, i) - } taskFunc1 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { pageNo := batchItemList[0].(int) storeUserLists, _, _, err := api.JdAPI.PrivilegeSearchUser(pageNo) @@ -1506,16 +1508,17 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint if jxVendorIDsMap[v] == "" { continue } - vendorStoreIDsMap[v] = v + vendorStoreIDsMap[v] = jxVendorIDsMap[v] } if len(vendorStoreIDsMap) == 0 { - jdStruct := JdUserStruct{vv.LoginName, ""} + jdStruct := JdUserStruct{vv.LoginName, "", vv.LockStatus} jdUsersStruct.AppendData(jdStruct) } else { for _, m := range vendorStoreIDsMap { vendorStoreIDsResult = append(vendorStoreIDsResult, m) } - jdStruct := JdUserStruct{vv.LoginName, strings.Join(vendorStoreIDsResult, ",")} + sort.Strings(vendorStoreIDsResult[:]) + jdStruct := JdUserStruct{vv.LoginName, strings.Join(vendorStoreIDsResult, ","), vv.LockStatus} jdUsersStruct.AppendData(jdStruct) } return retVal, err