From a424851bd3e7c0c6b9bb888fb790eeea86604b9b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 9 Oct 2023 18:12:46 +0800 Subject: [PATCH 1/5] 1 --- controllers/cms_store.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 069d4ff48..5a0664f15 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" "errors" + "strings" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/jx-callback/business/partner" @@ -1169,7 +1170,7 @@ func (c *StoreController) GetStoreAcctBalance() { // @Description 直接修改平台门店上下线 // @Param token header string true "认证token" // @Param storeID formData int true "门店ID" -// @Param vendorIDs query string true "订单所属厂商列表[1,2,3]，缺省不限制" +// @Param vendorIDs formData string true "订单所属厂商列表[1,2,3]，缺省不限制" // @Param status formData int true "状态，-1 下线，1上线" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -1177,10 +1178,10 @@ func (c *StoreController) GetStoreAcctBalance() { func (c *StoreController) UpdateVendorStoreBussinessStatus() { c.callUpdateVendorStoreBussinessStatus(func(params *tStoreUpdateVendorStoreBussinessStatusParams) (retVal interface{}, errCode string, err error) { var vendorIDList []int - if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDList); err != nil { - return retVal, "", err + temp := strings.Split(params.VendorIDs, ",") + for _, v := range temp { + vendorIDList = append(vendorIDList, utils.Str2Int(v)) } - err = cms.UpdateVendorStoreBussinessStatus(params.Ctx, params.StoreID, vendorIDList, params.Status) return retVal, "", err }) From cf0272557b0828712d17b1a5579661c427cfe020 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 10 Oct 2023 09:11:44 +0800 Subject: [PATCH 2/5] 1 --- controllers/cms_store.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 5a0664f15..e4130f5d8 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -6,6 +6,8 @@ import ( "errors" "strings" + "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/jx-callback/business/partner" @@ -1177,6 +1179,7 @@ func (c *StoreController) GetStoreAcctBalance() { // @router /UpdateVendorStoreBussinessStatus [post] func (c *StoreController) UpdateVendorStoreBussinessStatus() { c.callUpdateVendorStoreBussinessStatus(func(params *tStoreUpdateVendorStoreBussinessStatusParams) (retVal interface{}, errCode string, err error) { + globals.SugarLogger.Debugf("UpdateVendorStoreBussinessStatus %d,%d,%s", params.StoreID, params.Status, params.VendorIDs) var vendorIDList []int temp := strings.Split(params.VendorIDs, ",") for _, v := range temp { From aac7124795809070bf4fd1d450ca50322cb6a319 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 10 Oct 2023 09:34:25 +0800 Subject: [PATCH 3/5] 1 --- business/jxstore/cms/store.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index fa72d6120..fc809e4a1 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4744,10 +4744,11 @@ func RefreshStoreBind(ctx *jxcontext.Context) (err error) { func UpdateVendorStoreBussinessStatus(ctx *jxcontext.Context, storeID int, vendorID []int, status int) (err error) { var ( - db = dao.GetDB() + db = dao.GetDB() + errList errlist.ErrList ) - errList := make([]string, 0, 0) + //errList := make([]string, 0, 0) for _, v := range vendorID { storeDetail, err := dao.GetStoreDetail(db, storeID, v, "") if err != nil { @@ -4762,14 +4763,19 @@ func UpdateVendorStoreBussinessStatus(ctx *jxcontext.Context, storeID int, vendo dao.UpdateEntity(db, storeMaps[0], "IsOnline", "Status") } } else { - errList = append(errList, fmt.Sprintf("平台[%d],门店id[%d],错误:%s", v, storeID, err.Error())) + errList.AddErr(fmt.Errorf("平台[%d],门店id[%d],错误:%s", v, storeID, err)) + //errList = append(errList, fmt.Sprintf("平台[%d],门店id[%d],错误:%s", v, storeID, err.Error())) } } - if len(errList) == model.NO { - return nil + if errList.GetErrListAsOne() != nil { + return errList.GetErrListAsOne() } - return fmt.Errorf(strings.Join(errList, ",")) + return nil + //if len(errList) == model.NO { + // return nil + //} + //return fmt.Errorf(strings.Join(errList, ",")) } type JdPage struct { From 3147e8767303604317c91071a506349a01271273 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 10 Oct 2023 09:57:05 +0800 Subject: [PATCH 4/5] 1 --- business/jxstore/cms/store.go | 6 +++--- business/partner/purchase/tao_vegetable/store.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index fc809e4a1..1bf3c09f9 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4744,10 +4744,10 @@ func RefreshStoreBind(ctx *jxcontext.Context) (err error) { func UpdateVendorStoreBussinessStatus(ctx *jxcontext.Context, storeID int, vendorID []int, status int) (err error) { var ( - db = dao.GetDB() - errList errlist.ErrList + db = dao.GetDB() + //errList errlist.ErrList ) - + errList := errlist.New() //errList := make([]string, 0, 0) for _, v := range vendorID { storeDetail, err := dao.GetStoreDetail(db, storeID, v, "") diff --git a/business/partner/purchase/tao_vegetable/store.go b/business/partner/purchase/tao_vegetable/store.go index a79194e69..042cfc311 100644 --- a/business/partner/purchase/tao_vegetable/store.go +++ b/business/partner/purchase/tao_vegetable/store.go @@ -574,5 +574,5 @@ func (c *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOr //} else { // err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOffline(vendorStoreID) //} - return err + return nil } From 039a4050be7578c845aa99948266b4f7eb6557ff Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 10 Oct 2023 10:24:41 +0800 Subject: [PATCH 5/5] 1 --- business/jxstore/cms/store.go | 11 ++--------- controllers/cms_store.go | 3 --- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 1bf3c09f9..44a2209ca 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4744,11 +4744,9 @@ func RefreshStoreBind(ctx *jxcontext.Context) (err error) { func UpdateVendorStoreBussinessStatus(ctx *jxcontext.Context, storeID int, vendorID []int, status int) (err error) { var ( - db = dao.GetDB() - //errList errlist.ErrList + db = dao.GetDB() + errList = errlist.New() ) - errList := errlist.New() - //errList := make([]string, 0, 0) for _, v := range vendorID { storeDetail, err := dao.GetStoreDetail(db, storeID, v, "") if err != nil { @@ -4764,7 +4762,6 @@ func UpdateVendorStoreBussinessStatus(ctx *jxcontext.Context, storeID int, vendo } } else { errList.AddErr(fmt.Errorf("平台[%d],门店id[%d],错误:%s", v, storeID, err)) - //errList = append(errList, fmt.Sprintf("平台[%d],门店id[%d],错误:%s", v, storeID, err.Error())) } } @@ -4772,10 +4769,6 @@ func UpdateVendorStoreBussinessStatus(ctx *jxcontext.Context, storeID int, vendo return errList.GetErrListAsOne() } return nil - //if len(errList) == model.NO { - // return nil - //} - //return fmt.Errorf(strings.Join(errList, ",")) } type JdPage struct { diff --git a/controllers/cms_store.go b/controllers/cms_store.go index e4130f5d8..5a0664f15 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -6,8 +6,6 @@ import ( "errors" "strings" - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/jx-callback/business/partner" @@ -1179,7 +1177,6 @@ func (c *StoreController) GetStoreAcctBalance() { // @router /UpdateVendorStoreBussinessStatus [post] func (c *StoreController) UpdateVendorStoreBussinessStatus() { c.callUpdateVendorStoreBussinessStatus(func(params *tStoreUpdateVendorStoreBussinessStatusParams) (retVal interface{}, errCode string, err error) { - globals.SugarLogger.Debugf("UpdateVendorStoreBussinessStatus %d,%d,%s", params.StoreID, params.Status, params.VendorIDs) var vendorIDList []int temp := strings.Split(params.VendorIDs, ",") for _, v := range temp {