From 8d6d9a9787a626d9034ca723c47ba4f93fc0cb6f Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 5 Jan 2019 15:17:19 +0800 Subject: [PATCH] - test for Change2JDSPU4Store --- business/jxstore/initdata/initdata.go | 10 ++++++++++ controllers/init_data.go | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go index 95f95d8a2..2ab978d82 100644 --- a/business/jxstore/initdata/initdata.go +++ b/business/jxstore/initdata/initdata.go @@ -319,6 +319,16 @@ func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenErr func Change2JDSPU4Store(ctx *jxcontext.Context, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { db := dao.GetDB() + if len(storeIDs) == 0 { + if err = dao.GetRows(db, &storeIDs, ` + SELECT t1.id + FROM store t1 + JOIN store_map t2 ON t2.store_id = t1.id AND t2.vendor_id = 0 AND t2.deleted_at = ? AND t2.status <> ? + WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.city_code IN (110100, 120100, 440100, 440300, 510100) + `, utils.DefaultTimeValue, model.StoreStatusDisabled, utils.DefaultTimeValue, model.StoreStatusDisabled); err != nil { + return "", err + } + } dao.Begin(db) defer dao.Rollback(db) diff --git a/controllers/init_data.go b/controllers/init_data.go index bb7117d4d..43fbdf0b5 100644 --- a/controllers/init_data.go +++ b/controllers/init_data.go @@ -71,7 +71,7 @@ func (c *InitDataController) Convert2JDSPU() { // @Title 将京东商店为份的SPU转换 // @Description 将京东商店为份的SPU转换 // @Param token header string true "认证token" -// @Param storeIDs formData string true "门店列表" +// @Param storeIDs formData string false "门店列表" // @Param isAsync formData bool false "是否异步操作" // @Param isContinueWhenError formData bool false "单个同步失败是否继续,缺省false" // @Success 200 {object} controllers.CallResult