diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go index 0ac388b8c..0dbdc5641 100644 --- a/business/lakala/lakala_incoming.go +++ b/business/lakala/lakala_incoming.go @@ -2,6 +2,7 @@ package lakala import ( "encoding/json" + "errors" "fmt" "git.rosy.net.cn/baseapi/platformapi/lakala" "git.rosy.net.cn/baseapi/utils" @@ -675,6 +676,26 @@ func AccountStatusQuery(tradeMode, subMerchantId, merchantNo string) (map[string return api.LaKaLaApi.AccountStatusQuery(tradeMode, subMerchantId, merchantNo) } +// SubMerchantInfoQuery 报备查询 +func SubMerchantInfoQuery(merInnerNo, merCupNo string) ([]*lakala.SubMerchantInfoQueryResp, error) { + if merInnerNo == "" && merCupNo == "" { + return nil, errors.New("内部商户号和银联号必须填写一个") + } + param := &lakala.SubMerchantInfoQueryReq{ + Version: "1.0", + OrderNo: lakala.GetOrderNumber(8), + OrgCode: lakala.OrgCode, + MerInnerNo: "", + MerCupNo: "", + } + if merInnerNo != "" { + param.MerInnerNo = merInnerNo + } else { + param.MerCupNo = merCupNo + } + return api.LaKaLaApi.SubMerchantInfoQuery(param) +} + //#endregion //#region 订单相关 diff --git a/controllers/lakala.go b/controllers/lakala.go index beeb20098..88a4d83c0 100644 --- a/controllers/lakala.go +++ b/controllers/lakala.go @@ -996,9 +996,9 @@ func (c *LaKaLaController) QueryAuthentication() { // @Title 开户状态查询 // @Description 开户状态查询 // @Param token header string true "认证token" -// @Param tradeMode formData string true "支付类型交易钱包类型[ALIPAY,WECHAT]" -// @Param subMerchantId formData string true "子商户号 " -// @Param merchantNo formData string true "商户号 " +// @Param tradeMode query string true "支付类型交易钱包类型[ALIPAY,WECHAT]" +// @Param subMerchantId query string true "子商户号 " +// @Param merchantNo query string true "商户号 " // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /AccountStatusQuery [get] @@ -1008,3 +1008,19 @@ func (c *LaKaLaController) AccountStatusQuery() { return }) } + +// QuerySubMerInfo 商户报备查询 +// @Title 商户报备查询 +// @Description 商户报备查询 +// @Param token header string true "认证token" +// @Param merCupNo query string true "银联商户号(二选一填写)" +// @Param merInnerNo query string true "内部商户号(二选一填写)" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /QuerySubMerInfo [get] +func (c *LaKaLaController) QuerySubMerInfo() { + c.callQuerySubMerInfo(func(params *tLakalaQuerySubMerInfoParams) (retVal interface{}, errCode string, err error) { + retVal, err = lakalaServer.SubMerchantInfoQuery(params.MerInnerNo, params.MerCupNo) + return + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 878975533..d59d7458e 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -5176,6 +5176,15 @@ func init() { MethodParams: param.Make(), Filters: nil, Params: nil}) + // 商户报备查询 + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:LaKaLaController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:LaKaLaController"], + web.ControllerComments{ + Method: "QuerySubMerInfo", + Router: `/QuerySubMerInfo`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) //web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FnController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FnController"], // web.ControllerComments{