From a26fa917b139c295c9fd6279453a074bfe117a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 9 Jun 2025 17:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=9E=E9=B9=85=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9C=BA=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/printer/feie/feie.go |  4 +--
 controllers/lakala_callback.go        | 36 ++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index fc40576d4..77d79e686 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -204,10 +204,10 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 
 		switch order.EarningType {
 		case model.EarningTypePoints: // 扣点
-			orderFmt += `<B>%s %s %s<BR><BR></B>`
+			orderFmt += `<B>%s %s %s<BR></B>`
 			orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
 		case model.EarningTypeQuote: // 报价
-			orderFmt += `<B>%25s<BR><BR></B>`
+			orderFmt += `<B>%25s<BR></B>`
 			orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
 		}
 
diff --git a/controllers/lakala_callback.go b/controllers/lakala_callback.go
index e63af3822..06114c64d 100644
--- a/controllers/lakala_callback.go
+++ b/controllers/lakala_callback.go
@@ -11,7 +11,7 @@ type LaKaLaCallbackController struct {
 	web.Controller
 }
 
-// SeparateMsg 开通分账业务回调
+// SeparateMsg 商户开通/修改分账业务回调(分账接收方没得回调)
 func (c *LaKaLaCallbackController) SeparateMsg() {
 	body, err := ioutil.ReadAll(c.Ctx.Request.Body)
 	if err != nil {
@@ -30,6 +30,7 @@ func (c *LaKaLaCallbackController) SeparateMsg() {
 	// todo
 }
 
+// SeparateCallback 商户分账创建/修改回调
 type SeparateCallback struct {
 	ApplyId          int64  `json:"applyId"`
 	MerCupNo         string `json:"merCupNo"`
@@ -42,3 +43,36 @@ type SeparateCallback struct {
 	UploadAttachType string `json:"uploadAttachType"`
 	EntrustFilePath  string `json:"entrustFilePath"`
 }
+
+// SeparateBind 分账关系绑定回调
+func (c *LaKaLaCallbackController) SeparateBind() {
+	body, err := ioutil.ReadAll(c.Ctx.Request.Body)
+	if err != nil {
+		c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
+		c.ServeJSON()
+		return
+	}
+
+	separate := &SeparateBindCallback{}
+	if err = json.Unmarshal(body, &separate); err != nil {
+		c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
+		c.ServeJSON()
+		return
+	}
+
+	// todo
+}
+
+// SeparateBindCallback 分账关系绑定回调
+type SeparateBindCallback struct {
+	OptType         string `json:"optType"`         // 操作类型
+	ApplyId         int64  `json:"applyId"`         // 申请编号
+	MerCupNo        string `json:"merCupNo"`        // 商户号
+	EntrustFileName string `json:"entrustFileName"` // 附件
+	AuditStatus     string `json:"auditStatus"`     // 附件路径
+	MerInnerNo      string `json:"merInnerNo"`      // 分账商户内部商户号
+	ReceiverNo      string `json:"receiverNo"`      // 分账接收方编号
+	Remark          string `json:"remark"`          // 备注
+	AuditStatusText string `json:"auditStatusText"` // 审核状态
+	EntrustFilePath string `json:"entrustFilePath"` // 附件路径
+}