From da739b4632653eda85061a1ebc9107d607f0f261 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 18 Nov 2022 15:20:50 +0800 Subject: [PATCH 1/5] sqlparams --- business/model/dao/dao_order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index d2f509637..b8680c3fe 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1080,6 +1080,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat sql += " LIMIT ? OFFSET ?" sqlParams = append(sqlParams, pageSize, offset) globals.SugarLogger.Debugf("sqlParams pageSize=====%d,offset==========%d", pageSize, offset) + globals.SugarLogger.Debugf("test sql=======================%s", sql) txDB, _ := Begin(db) defer Commit(db, txDB) if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { From 11b63862d1968a97313a1f4c4ca9592cf26035f2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 18 Nov 2022 16:35:07 +0800 Subject: [PATCH 2/5] assistcreatefence --- business/jxstore/cms/store.go | 13 +++++++++++++ .../partner/purchase/tiktok_store/warehouse.go | 12 ------------ controllers/cms_store.go | 18 ++++++++++++------ routers/commentsRouter_controllers.go | 9 +++++++++ 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f607c2e6f..3f0737380 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6014,3 +6014,16 @@ func GetVendorOrgCode(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID i } return storeMap, dao.GetEntitiesByKV(db, &storeMap, cond, false) } + +//辅助创建电子围栏 +func AssistCreateFence(appOrgCode string, storeID int64) error { + //创建前检查 暂时不支持 + if fenceID, err := tiktok_store.CreateFenceByStore(appOrgCode, storeID); err != nil { + return errors.New(fmt.Sprintf("创建电子围栏失败:%v", err)) + } else { + if err := tiktok_store.BindFenceByStore(appOrgCode, storeID, []string{fenceID}); err != nil { + return errors.New(fmt.Sprintf("绑定电子围栏失败:%v", err)) + } + } + return nil +} diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index ab5ff3796..646b8fbc8 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -168,18 +168,6 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e } } -//直接创建电子围栏方式 暂时未使用 -func CreateFenceDirectly(param warehouse_createFence_request.WarehouseCreateFenceParam) (fenceID string, err error) { - info := &warehouse_createFence_request.WarehouseCreateFenceParam{ - FenceInfo: param.FenceInfo, - } - resp, err := getAPI("", 0, "").CreateFence(info) - if err != nil { - return "", err - } - return resp.FenceId, err -} - // 通过门店更新电子围栏 func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error { var ( diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 5f86c578f..8bb19eb2d 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1508,11 +1508,17 @@ func (c *StoreController) GetDDScope() { }) } -// @Title 批量绑定抖店与京西门店 -// @Description 批量绑定抖店与京西门店 -// @Param token header string true "认证token" -// @Param storeID formData int true "门店ID" -// @Param vendorStoreID formData string true "平台门店ID" +// @Title 创建抖店电子围栏 +// @Description 创建抖店电子围栏 +// @Param token header string true "认证token" +// @Param storeID formData int true "门店ID" +// @Param vendorOrgCode formData string false "厂商内组织代码" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /BatchBindVendorStore [post] +// @router /CreateDDStoreFence [post] +func (c *StoreController) CreateDDStoreFence() { + c.callCreateDDStoreFence(func(params *tStoreCreateDDStoreFenceParams) (interface{}, string, error) { + err := cms.AssistCreateFence(params.VendorOrgCode, int64(params.StoreID)) + return nil, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index a5b53d945..41a872240 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -2953,6 +2953,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], + web.ControllerComments{ + Method: "AssistCreateFence", + Router: `/AssistCreateFence`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], web.ControllerComments{ Method: "BackUpStoreSkuBind", From a038f850c9bad02547b270f9c8bc02df1cd686b2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 18 Nov 2022 16:53:49 +0800 Subject: [PATCH 3/5] batch --- business/jxstore/cms/store.go | 27 ++++++++++++++++++--------- controllers/cms_store.go | 12 +++++++----- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 3f0737380..5daebccdd 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6015,15 +6015,24 @@ func GetVendorOrgCode(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID i return storeMap, dao.GetEntitiesByKV(db, &storeMap, cond, false) } -//辅助创建电子围栏 -func AssistCreateFence(appOrgCode string, storeID int64) error { - //创建前检查 暂时不支持 - if fenceID, err := tiktok_store.CreateFenceByStore(appOrgCode, storeID); err != nil { - return errors.New(fmt.Sprintf("创建电子围栏失败:%v", err)) - } else { - if err := tiktok_store.BindFenceByStore(appOrgCode, storeID, []string{fenceID}); err != nil { - return errors.New(fmt.Sprintf("绑定电子围栏失败:%v", err)) +//批量辅助创建电子围栏 +func AssistCreateFence(relInfo map[string][]int64) (string, error) { + var ( + errList = errlist.New() + ) + for k, v := range relInfo { + for _, i := range v { + if fenceID, err := tiktok_store.CreateFenceByStore(k, i); err != nil { + errList.AddErr(fmt.Errorf("门店(%d)创建电子围栏失败:%v", i, err)) + } else { + if err := tiktok_store.BindFenceByStore(k, i, []string{fenceID}); err != nil { + errList.AddErr(fmt.Errorf("门店(%d)绑定电子围栏失败:%v", i, err)) + } + } } } - return nil + if errList.GetErrListAsOne() != nil { + return fmt.Sprintf("批量创建电子围栏提示信息:%v", errList.GetErrListAsOne()), nil + } + return "", nil } diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 8bb19eb2d..f7a26bce0 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1511,14 +1511,16 @@ func (c *StoreController) GetDDScope() { // @Title 创建抖店电子围栏 // @Description 创建抖店电子围栏 // @Param token header string true "认证token" -// @Param storeID formData int true "门店ID" -// @Param vendorOrgCode formData string false "厂商内组织代码" +// @Param payload formData string true "json数据，[]string对象" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /CreateDDStoreFence [post] func (c *StoreController) CreateDDStoreFence() { - c.callCreateDDStoreFence(func(params *tStoreCreateDDStoreFenceParams) (interface{}, string, error) { - err := cms.AssistCreateFence(params.VendorOrgCode, int64(params.StoreID)) - return nil, "", err + c.callCreateDDStoreFence(func(params *tStoreCreateDDStoreFenceParams) (retVal interface{}, errCode string, err error) { + payload := make(map[string][]int64) + if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil { + retVal, err = cms.AssistCreateFence(payload) + } + return retVal, "", err }) } From 259c5d56d460c7d77c45660e2872b97bea4133e1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 18 Nov 2022 16:54:35 +0800 Subject: [PATCH 4/5] batch --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 5daebccdd..74e6c6225 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6032,7 +6032,7 @@ func AssistCreateFence(relInfo map[string][]int64) (string, error) { } } if errList.GetErrListAsOne() != nil { - return fmt.Sprintf("批量创建电子围栏提示信息:%v", errList.GetErrListAsOne()), nil + return fmt.Sprintf("批量创建电子围栏错误，请根据提示处理:%v", errList.GetErrListAsOne()), nil } return "", nil } From 3868439e816d78534ce101fafe40c6528c02091a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 18 Nov 2022 17:11:31 +0800 Subject: [PATCH 5/5] batch --- business/jxstore/cms/store.go | 14 ++++++-------- controllers/cms_store.go | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 74e6c6225..cf3308896 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6016,17 +6016,15 @@ func GetVendorOrgCode(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID i } //批量辅助创建电子围栏 -func AssistCreateFence(relInfo map[string][]int64) (string, error) { - var ( - errList = errlist.New() - ) +func AssistCreateFence(relInfo map[string]map[int64]string) (string, error) { + errList := errlist.New() for k, v := range relInfo { - for _, i := range v { + for i, j := range v { if fenceID, err := tiktok_store.CreateFenceByStore(k, i); err != nil { - errList.AddErr(fmt.Errorf("门店(%d)创建电子围栏失败:%v", i, err)) + errList.AddErr(fmt.Errorf("平台门店(%s),门店(%d) 创建电子围栏失败:%v", j, i, err)) } else { - if err := tiktok_store.BindFenceByStore(k, i, []string{fenceID}); err != nil { - errList.AddErr(fmt.Errorf("门店(%d)绑定电子围栏失败:%v", i, err)) + if err := tiktok_store.BindFenceByStore(k, utils.Str2Int64(j), []string{fenceID}); err != nil { + errList.AddErr(fmt.Errorf("平台门店(%s),门店(%d)绑定电子围栏失败:%v", j, i, err)) } } } diff --git a/controllers/cms_store.go b/controllers/cms_store.go index f7a26bce0..41395912b 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1517,7 +1517,7 @@ func (c *StoreController) GetDDScope() { // @router /CreateDDStoreFence [post] func (c *StoreController) CreateDDStoreFence() { c.callCreateDDStoreFence(func(params *tStoreCreateDDStoreFenceParams) (retVal interface{}, errCode string, err error) { - payload := make(map[string][]int64) + payload := make(map[string]map[int64]string) if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil { retVal, err = cms.AssistCreateFence(payload) }