diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8c44dc7ad..e3b70c6b7 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6120,10 +6120,19 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str } } if errList.GetErrListAsOne() != nil { - return fmt.Sprintf("部分门店设置自动运力失败:%s", utils.Format4Output(errList.GetErrListAsOne(), false)), nil + return fmt.Sprintf("部分门店配置自动运力失败:%s", utils.Format4Output(errList.GetErrListAsOne(), false)), nil } return "", nil } + +//辅助函数 +func String2Array(data string) (retVal []int64) { + temp := strings.Split(data, ",") + for _, v := range temp { + retVal = append(retVal, utils.Str2Int64(v)) + } + return retVal +} func GetVendorStoreBind(vendorStoreId string, vendorId int) (int, error) { return dao.GetCodeAndIDByMeiTuan(vendorStoreId, vendorId) } diff --git a/business/partner/purchase/tiktok_store/waybill.go b/business/partner/purchase/tiktok_store/waybill.go index e66354716..bafe98a5f 100644 --- a/business/partner/purchase/tiktok_store/waybill.go +++ b/business/partner/purchase/tiktok_store/waybill.go @@ -1,10 +1,12 @@ package tiktok_store import ( + "errors" superm_getStoreAutoCallRiderInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/response" superm_setStoreAutoCallRider_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_setStoreAutoCallRider/request" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" @@ -86,11 +88,21 @@ func SetStoreAutoCallRider(vendorOrgCode, opType string, storeID int64) error { return nil } -//查询查询自动呼叫运力配置 -func GetStoreAutoCallRiderInfo(vendorOrgCode string, storeID int64) (autoCallInfo *superm_getStoreAutoCallRiderInfo_response.AutoCallInfo, err error) { - if autoCallInfo, err = getAPI(vendorOrgCode, 0, "").GetStoreAutoCallRiderInfo(storeID); err != nil { - return nil, err - } else { - return autoCallInfo, err +//批量查询自动呼叫运力配置 +func GetStoreAutoCallRiderInfo(vendorOrgCode string, storeIDs []int64) (autoCallInfos map[int64]*superm_getStoreAutoCallRiderInfo_response.AutoCallInfo, err error) { + if len(storeIDs) == 0 { + return nil, errors.New("门店ID为空，请检查") } + errList := errlist.ErrList{} + for _, i := range storeIDs { + if autoCallInfo, err := getAPI(vendorOrgCode, 0, "").GetStoreAutoCallRiderInfo(i); err != nil { + errList.AddErr(err) + } else { + autoCallInfos[i] = autoCallInfo + } + } + if errList.GetErrListAsOne() != nil { + return nil, errList.GetErrListAsOne() + } + return autoCallInfos, nil } diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 0f880b21f..424ed3944 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1548,8 +1548,8 @@ func (c *StoreController) CreateFreeShipTemplates() { // @Description 批量配置抖音门店自动呼叫运力 // @Param token header string true "认证token" // @Param vendorOrgCode formData string true "抖音总账号" -// @Param openIDs formData string true "开启自动运力门店，[]string对象" -// @Param closeIDs formData string true "关闭自动运力门店，[]string对象" +// @Param openIDs formData string true "开启自动运力门店，string对象" +// @Param closeIDs formData string true "关闭自动运力门店，string对象" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /SetStoreAutoCallRider [post] @@ -1557,13 +1557,27 @@ func (c *StoreController) SetStoreAutoCallRider() { c.callSetStoreAutoCallRider(func(params *tStoreSetStoreAutoCallRiderParams) (retVal interface{}, errCode string, err error) { openIDs := make([]int64, 0) closeIDs := make([]int64, 0) - if err1 := utils.UnmarshalUseNumber([]byte(params.OpenIDs), &openIDs); err1 == nil { - if err2 := utils.UnmarshalUseNumber([]byte(params.CloseIDs), &closeIDs); err2 == nil { - err = cms.SetStoreAutoCallRider(params.VendorOrgCode, openIDs, closeIDs) - return nil, "", err - } - } - return nil, "", nil + openIDs = cms.String2Array(params.OpenIDs) + closeIDs = cms.String2Array(params.CloseIDs) + retVal, err = cms.SetStoreAutoCallRider(params.VendorOrgCode, openIDs, closeIDs) + return retVal, "", err + }) +} + +// @Title 批量获取抖音门店自动呼叫运力设置 +// @Description 批量获取抖音门店自动呼叫运力设置 +// @Param token header string true "认证token" +// @Param vendorOrgCode query string true "抖音门店总账号" +// @Param storeIDs query string true "抖音门店IDs" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetStoreAutoCallRiderInfo [get] +func (c *StoreController) GetStoreAutoCallRiderInfo() { + c.callGetStoreAutoCallRiderInfo(func(params *tStoreGetStoreAutoCallRiderInfoParams) (retVal interface{}, errCode string, err error) { + storeIDs := make([]int64, 0) + storeIDs = cms.String2Array(params.StoreIDs) + retVal, err = tiktok_store.GetStoreAutoCallRiderInfo(params.VendorOrgCode, storeIDs) + return retVal, "", err }) } diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 3791b0645..e73f63809 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -6,25 +6,24 @@ import ( "git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/client/orm" - "github.com/astaxie/beego/server/web" ) func Init() { // set default database // orm.RegisterDataBase(aliasName, driverName, dataSource, params) - orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) - orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) + //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 本地测试服调试 // orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") //本地服务器测试用 -ysq - //orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - //orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - //orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 开启sql打印 //orm.Debug = true diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 58042c6c5..2e2136836 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -2990,6 +2990,24 @@ 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: "SetStoreAutoCallRider", + Router: `/SetStoreAutoCallRider`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + 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: "GetStoreAutoCallRiderInfo", + Router: `/GetStoreAutoCallRiderInfo`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + 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{