From 13a613b0bce3155835e230d046c1fbbda068a816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 1 Aug 2025 11:25:24 +0800
Subject: [PATCH] 1

---
 business/lakala/lakala_incoming.go    | 18 ++++++++++++++++++
 controllers/lakala.go                 | 17 +++++++++++++++++
 routers/commentsRouter_controllers.go |  9 +++++++++
 3 files changed, 44 insertions(+)

diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go
index 0dbdc5641..b658197fb 100644
--- a/business/lakala/lakala_incoming.go
+++ b/business/lakala/lakala_incoming.go
@@ -774,6 +774,24 @@ func QueryOrder(vendorOrderId, merchantId string, vendorId int) (*lakala.QueryOr
 	return result, nil
 }
 
+// CloseOrderByMini 聚合支付关单,关单重新拉起支付
+func CloseOrderByMini(merchantNo, termNo, orderNo, ip string) error {
+	param := &lakala.ClosePayMiniOrder{
+		MerchantNo:       merchantNo,
+		TermNo:           termNo,
+		OriginOutTradeNo: orderNo,
+		OriginTradeNo:    "",
+		LocationInfo: struct {
+			RequestIp   string `json:"request_ip"`
+			BaseStation string `json:"base_station"`
+			Location    string `json:"location"`
+		}{
+			RequestIp: ip,
+		},
+	}
+	return api.LaKaLaApi.ClosePay(param)
+}
+
 //#endregion
 
 //#region 账户相关
diff --git a/controllers/lakala.go b/controllers/lakala.go
index f2cd70b71..d94803f48 100644
--- a/controllers/lakala.go
+++ b/controllers/lakala.go
@@ -1024,3 +1024,20 @@ func (c *LaKaLaController) QuerySubMerInfo() {
 		return
 	})
 }
+
+// CloseOrderByMini 聚合支付关单
+// @Title 聚合支付关单
+// @Description 聚合支付关单
+// @Param	token				header			string	true	"认证token"
+// @Param	merCupNo			formData		string	true	"银联商户号"
+// @Param	termNo				formData		string	true	"设备号"
+// @Param	orderNo				formData		string	true	"订单号"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /CloseOrderByMini [post]
+func (c *LaKaLaController) CloseOrderByMini() {
+	c.callCloseOrderByMini(func(params *tLakalaCloseOrderByMiniParams) (retVal interface{}, errCode string, err error) {
+		err = lakalaServer.CloseOrderByMini(params.MerCupNo, params.TermNo, params.OrderNo, params.Ctx.GetRealRemoteIP())
+		return
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index d59d7458e..79f90be0d 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -5185,6 +5185,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:           "CloseOrderByMini",
+			Router:           `/CloseOrderByMini`,
+			AllowHTTPMethods: []string{"post"},
+			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{