From 010987a93cd1187b533fd5e5b671b34d28c10910 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 Apr 2020 18:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEexcel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A0=87=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 9 +++++++++ business/model/dao/store.go | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 6782e451f..d72268fd4 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1850,12 +1850,15 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error skuName.Img = downloadURL2 } else { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, err.Error())) + continue } } else { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, err.Error())) + continue } } else { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, err.Error())) + continue } } else { skuName.Img = model.NOSkuNameImg @@ -1868,6 +1871,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error if v.Price == 0 { if result.Price == "" { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, "商品的售价不能为空！")) + continue } else { skuName.Price = int(utils.Str2Int64(result.Price) * 100) } @@ -1878,12 +1882,14 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error skuName.Unit = v.Unit } else { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, "商品的单位不能为空！")) + continue } if v.SpecQuality != 0 { skuName.Skus[0].SpecQuality = v.SpecQuality skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(v.SpecQuality)))) } else { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, "商品的重量不能为空！")) + continue } skuName.Skus[0].SpecUnit = model.SpecialSpecUnit } else { @@ -1906,6 +1912,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error } if result.Price == "" { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, "商品的售价不能为空！")) + continue } else { skuName.Price = int(utils.Str2Int64(result.Price) * 100) } @@ -1927,6 +1934,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error _, err = AddSkuName(ctx, skuName, ctx.GetUserName()) if err != nil { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, err.Error())) + continue } } case 2: @@ -1962,6 +1970,7 @@ func writeToExcel(excelTitle []string, dataList interface{}, task *tasksch.SeqTa } else { noticeMsg := fmt.Sprintf("[详情点我]path=%s\n", downloadURL) task.SetNoticeMsg(noticeMsg) + baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess downloadURL: [%v]", downloadURL) } return err } diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 2c7f5e606..db2238dcd 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -577,9 +577,10 @@ func GetStorePriceScore(db *DaoDB, storeIDs, vendorIDs []int, fromScore, toScore LEFT JOIN act_map c ON c.act_id = b.act_id LEFT JOIN act d ON d.id = c.act_id WHERE 1=1 + AND d.status = ? ` sqlParams := []interface{}{ - model.ActSkuDirectDown, model.ActSkuSecKill, + model.ActSkuDirectDown, model.ActSkuSecKill, model.ActStatusCreated, } if len(storeIDs) > 0 { sql += " AND a.store_id IN(" + GenQuestionMarks(len(storeIDs)) + ")" @@ -592,12 +593,12 @@ func GetStorePriceScore(db *DaoDB, storeIDs, vendorIDs []int, fromScore, toScore sql += ` AND NOW() BETWEEN d.begin_at AND d.end_at AND a.status = ? - AND a.deleted_at = ? + AND a.deleted_at = ? AND b.deleted_at = ? AND c.deleted_at = ? AND d.deleted_at = ? GROUP BY 1,2,3)t1 GROUP BY 1)t2 ON t2.store_id = a.store_id WHERE 1=1 ` - sqlParams = append(sqlParams, model.StoreSkuBindStatusNormal, utils.DefaultTimeValue) + sqlParams = append(sqlParams, model.StoreSkuBindStatusNormal, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue) if fromScore != 0 || toScore != 0 { sql += " AND a.score BETWEEN ? AND ?" sqlParams = append(sqlParams, fromScore, toScore)