diff --git a/business/jxstore/secretNumber/secretNum.go b/business/jxstore/secretNumber/secretNum.go index d9ec7b6cc..bd1c071a7 100644 --- a/business/jxstore/secretNumber/secretNum.go +++ b/business/jxstore/secretNumber/secretNum.go @@ -249,3 +249,7 @@ func CallbackBrandBill(res *SecretNumberMsgRes) (err error) { err = errLists.GetErrListAsOne() return err } + +func GetBrandSecretNumbers(ctx *jxcontext.Context, brandID int) (results []*model.SecretNumber, err error) { + return dao.GetBrandSecretNumbers(dao.GetDB(), brandID) +} diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 6b6fe6f36..f8a437a75 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1433,3 +1433,15 @@ func GetBrandCategoryMap(db *DaoDB, parentID, level, brandID, categoryID int) (b } return brandCatMaps, err } + +func GetBrandSecretNumbers(db *DaoDB, brandID int) (results []*model.SecretNumber, err error) { + sql := ` + SELECT a.* + FROM secret_number a + LEFT JOIN brand b ON a.pool_key = b.pool_key + WHERE b.deleted_at = ? AND b.id = ? + ` + sqlParams := []interface{}{utils.DefaultTimeValue, brandID} + err = GetRows(db, &results, sql, sqlParams) + return results, err +} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 7cc605280..f3050335c 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxstore/common" "git.rosy.net.cn/jx-callback/business/jxstore/misc" + "git.rosy.net.cn/jx-callback/business/jxstore/secretNumber" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" @@ -1306,7 +1307,10 @@ func (c *StoreController) ReorderBrandCategories() { // @Failure 200 {object} controllers.CallResult // @router /GetBrandSecretNumbers [get] func (c *StoreController) GetBrandSecretNumbers() { - + c.callGetBrandSecretNumbers(func(params *tStoreGetBrandSecretNumbersParams) (retVal interface{}, errCode string, err error) { + retVal, err = secretNumber.GetBrandSecretNumbers(params.Ctx, params.BrandID) + return retVal, "", err + }) } // @Title 查询号码绑定关系 @@ -1318,7 +1322,10 @@ func (c *StoreController) GetBrandSecretNumbers() { // @Failure 200 {object} controllers.CallResult // @router /GetSecretNumberBind [get] func (c *StoreController) GetSecretNumberBind() { - + c.callGetSecretNumberBind(func(params *tStoreGetSecretNumberBindParams) (retVal interface{}, errCode string, err error) { + retVal, err = secretNumber.QuerySubscriptionDetail(params.PoolKey, params.SecretNumber) + return retVal, "", err + }) } // @Title 购买号码 @@ -1329,7 +1336,10 @@ func (c *StoreController) GetSecretNumberBind() { // @Failure 200 {object} controllers.CallResult // @router /BuySecretNo [post] func (c *StoreController) BuySecretNo() { - + c.callBuySecretNo(func(params *tStoreBuySecretNoParams) (retVal interface{}, errCode string, err error) { + err = secretNumber.BuySecretNo(params.Ctx, params.PoolKey, "成都") + return retVal, "", err + }) } // @Title 绑定号码 @@ -1343,7 +1353,10 @@ func (c *StoreController) BuySecretNo() { // @Failure 200 {object} controllers.CallResult // @router /BindSecretNumber [post] func (c *StoreController) BindSecretNumber() { - + c.callBindSecretNumber(func(params *tStoreBindSecretNumberParams) (retVal interface{}, errCode string, err error) { + err = secretNumber.BindAxb(params.Ctx, params.SecretNumber, params.NumberA, params.NumberB, params.Expiration) + return retVal, "", err + }) } // @Title 修改绑定 @@ -1351,6 +1364,7 @@ func (c *StoreController) BindSecretNumber() { // @Param token header string true "认证token" // @Param poolKey formData string true "号码池key" // @Param subsID formData string true "绑定关系ID(查询列表中有" +// @Param secretNumber formData string true "号码x" // @Param numberA formData string true "号码1" // @Param numberB formData string true "号码2" // @Param expiration formData string true "绑定时间(绑定到多久" @@ -1358,7 +1372,10 @@ func (c *StoreController) BindSecretNumber() { // @Failure 200 {object} controllers.CallResult // @router /UpdateSecretBind [post] func (c *StoreController) UpdateSecretBind() { - + c.callUpdateSecretBind(func(params *tStoreUpdateSecretBindParams) (retVal interface{}, errCode string, err error) { + err = secretNumber.UpdateSubscription(params.PoolKey, params.SubsID, params.SecretNumber, params.NumberA, params.NumberB, params.Expiration) + return retVal, "", err + }) } // @Title 解除绑定 @@ -1366,9 +1383,13 @@ func (c *StoreController) UpdateSecretBind() { // @Param token header string true "认证token" // @Param poolKey formData string true "号码池key" // @Param subsID formData string true "绑定关系ID(查询列表中有" +// @Param secretNumber formData string true "号码x" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /DelSecretBind [post] func (c *StoreController) DelSecretBind() { - + c.callDelSecretBind(func(params *tStoreDelSecretBindParams) (retVal interface{}, errCode string, err error) { + err = secretNumber.UnbindSubscription(params.PoolKey, params.SubsID, params.SecretNumber) + return retVal, "", err + }) } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 5a7b0b0ca..479158b8a 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -2475,6 +2475,60 @@ 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: "GetBrandSecretNumbers", + Router: `/GetBrandSecretNumbers`, + 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{ + Method: "GetSecretNumberBind", + Router: `/GetSecretNumberBind`, + 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{ + Method: "BuySecretNo", + Router: `/BuySecretNo`, + 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: "BindSecretNumber", + Router: `/BindSecretNumber`, + 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: "UpdateSecretBind", + Router: `/UpdateSecretBind`, + 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: "DelSecretBind", + Router: `/DelSecretBind`, + 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: "GetStoreCourierMaps",