liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dyps update

Browse Source
This commit is contained in:
richboo111
2023-01-09 13:45:59 +08:00
parent 3bc119ab21
commit 27c3042d85
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/store.go
View File

@@ -6126,7 +6126,7 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str
} }
//辅助函数 //辅助函数
func String2Array(data string) (retVal []int64) { func String2ArrayInt64(data string) (retVal []int64) {
temp := strings.Split(data, ",") temp := strings.Split(data, ",")
for _, v := range temp { for _, v := range temp {
retVal = append(retVal, utils.Str2Int64(v)) retVal = append(retVal, utils.Str2Int64(v))

6
controllers/cms_store.go
View File

@@ -1557,8 +1557,8 @@ func (c *StoreController) SetStoreAutoCallRider() {
c.callSetStoreAutoCallRider(func(params *tStoreSetStoreAutoCallRiderParams) (retVal interface{}, errCode string, err error) { c.callSetStoreAutoCallRider(func(params *tStoreSetStoreAutoCallRiderParams) (retVal interface{}, errCode string, err error) {
openIDs := make([]int64, 0) openIDs := make([]int64, 0)
closeIDs := make([]int64, 0) closeIDs := make([]int64, 0)
openIDs = cms.String2Array(params.OpenIDs) openIDs = cms.String2ArrayInt64(params.OpenIDs)
closeIDs = cms.String2Array(params.CloseIDs) closeIDs = cms.String2ArrayInt64(params.CloseIDs)
retVal, err = cms.SetStoreAutoCallRider(params.VendorOrgCode, openIDs, closeIDs) retVal, err = cms.SetStoreAutoCallRider(params.VendorOrgCode, openIDs, closeIDs)
return retVal, "", err return retVal, "", err
}) })
@@ -1575,7 +1575,7 @@ func (c *StoreController) SetStoreAutoCallRider() {
func (c *StoreController) GetStoreAutoCallRiderInfo() { func (c *StoreController) GetStoreAutoCallRiderInfo() {
c.callGetStoreAutoCallRiderInfo(func(params *tStoreGetStoreAutoCallRiderInfoParams) (retVal interface{}, errCode string, err error) { c.callGetStoreAutoCallRiderInfo(func(params *tStoreGetStoreAutoCallRiderInfoParams) (retVal interface{}, errCode string, err error) {
storeIDs := make([]int64, 0) storeIDs := make([]int64, 0)
storeIDs = cms.String2Array(params.StoreIDs) storeIDs = cms.String2ArrayInt64(params.StoreIDs)
retVal, err = tiktok_store.GetStoreAutoCallRiderInfo(params.VendorOrgCode, storeIDs) retVal, err = tiktok_store.GetStoreAutoCallRiderInfo(params.VendorOrgCode, storeIDs)
return retVal, "", err return retVal, "", err
}) })

15
globals/beegodb/beegodb.go
View File

@@ -6,24 +6,25 @@ import (
"git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/business/model/legacymodel"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/client/orm" "github.com/astaxie/beego/client/orm"
"github.com/astaxie/beego/server/web"
) )
func Init() { func Init() {
// set default database // set default database
// orm.RegisterDataBase(aliasName, driverName, dataSource, params) // orm.RegisterDataBase(aliasName, driverName, dataSource, params)
//正式服务器
//orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) 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("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("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("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("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") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true")
//本地服务器测试用 -ysq //本地服务器测试用 -ysq
orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?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("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("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
// 开启sql打印 // 开启sql打印
//orm.Debug = true //orm.Debug = true