diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go index 3c527e939..193656e70 100644 --- a/business/lakala/lakala_incoming.go +++ b/business/lakala/lakala_incoming.go @@ -740,7 +740,7 @@ func SubMerchantInfoQuery(merInnerNo, merCupNo string) ([]*lakala.SubMerchantInf //#region 订单相关 // CreateOrder 创建拉卡拉交易订单 -func CreateOrder(ctx *jxcontext.Context, vendorOrderID, merchantNo string, vendorId int) (*lakala.CreateOrderResp, error) { +func CreateOrder(ctx *jxcontext.Context, vendorOrderID, merchantNo, callbackUrl string, vendorId int) (*lakala.CreateOrderResp, error) { order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorId) if err != nil { return nil, err @@ -753,6 +753,7 @@ func CreateOrder(ctx *jxcontext.Context, vendorOrderID, merchantNo string, vendo OrderInfo: fmt.Sprintf("门店扫码订单:%d", order.OrderSeq), NotifyUrl: lakala.OrderStatusCallback, SupportRepeatPay: 1, + CallbackUrl: callbackUrl, } result, err := api.LaKaLaApi.CreateOrder(param) diff --git a/controllers/lakala.go b/controllers/lakala.go index f68ca37ea..118687751 100644 --- a/controllers/lakala.go +++ b/controllers/lakala.go @@ -639,12 +639,13 @@ func (c *LaKaLaController) SeparateFallBack() { // @Param merchantNo query string true "商户号" // @Param vendorOrderId query string true "订单号" // @Param vendorId query int true "平台id" +// @Param callbackUrl query string false "支付后打开地址" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /CreateOrder [get] func (c *LaKaLaController) CreateOrder() { c.callCreateOrder(func(params *tLakalaCreateOrderParams) (retVal interface{}, errCode string, err error) { - retVal, err = lakalaServer.CreateOrder(params.Ctx, params.VendorOrderId, params.MerchantNo, params.VendorId) + retVal, err = lakalaServer.CreateOrder(params.Ctx, params.VendorOrderId, params.MerchantNo, params.CallbackUrl, params.VendorId) return }) }