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 += `%s %s %s

` + orderFmt += `%s %s %s
` 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 += `%25s

` + orderFmt += `%25s
` 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"` // 附件路径 +}