diff --git a/internal/service/cmb.go b/internal/service/cmb.go
index 7ae7c16..060acb2 100644
--- a/internal/service/cmb.go
+++ b/internal/service/cmb.go
@@ -92,8 +92,7 @@ func (this *CmbService) QueryOrder(ctx http.Context) error {
}
func (this *CmbService) QueryByOrderNo(ctx http.Context) error {
-
- // 获取访问ip
+ // 获取访问 ip
ip := ctx.Request().Header.Get("X-Forwarded-For")
if len(ip) == 0 {
ip = ctx.Request().RemoteAddr
@@ -107,22 +106,11 @@ func (this *CmbService) QueryByOrderNo(ctx http.Context) error {
return fmt.Errorf("orderNo is empty")
}
- order, err := this.VoucherBiz.OrderQuery(ctx, orderNo)
+ order, err := this.VoucherBiz.OrderQuery(ctx.Request().Context(), orderNo)
if err != nil {
return err
}
- msg := "# " +
- "订单查询
" +
- " \n" +
- "" +
- "查询结果" +
- "[%s]悉知" +
- ""
-
- s := "\n订单号:%s\n招行订单号:%s\n订单状态:%s\nopenid:%s\n微信券ID:%s\n商品编号:%s\n批次号:%s\n商户号:%s\nappId:%s\n订单创建时间:%s\n" +
- "领取成功时间(成功即有该值):%s\n最后一次核销时间(核销即有该值):%s\n订单备注说明(失败说明):%s\n"
-
receiveSuccessTimeStr := ""
if order.ReceiveSuccessTime != nil {
receiveSuccessTimeStr = order.ReceiveSuccessTime.Format("2006-01-02 15:04:05")
@@ -131,7 +119,99 @@ func (this *CmbService) QueryByOrderNo(ctx http.Context) error {
if order.LastUseTime != nil {
lastUseTimeStr = order.LastUseTime.Format("2006-01-02 15:04:05")
}
- orderMsg := fmt.Sprintf(s,
+
+ html := `
+
+
+
+
+
+ 订单查询结果
+
+
+
+ 订单查询
+ 查询结果 [%s] 悉知
+
+
+ | 订单号 |
+ %s |
+
+
+ | 招行订单号 |
+ %s |
+
+
+ | 订单状态 |
+ %s |
+
+
+ | openid |
+ %s |
+
+
+ | 微信券 ID |
+ %s |
+
+
+ | 商品编号 |
+ %s |
+
+
+ | 批次号 |
+ %s |
+
+
+ | 商户号 |
+ %s |
+
+
+ | appId |
+ %s |
+
+
+ | 订单创建时间 |
+ %s |
+
+
+ | 领取成功时间(成功即有该值) |
+ %s |
+
+
+ | 最后一次核销时间(核销即有该值) |
+ %s |
+
+
+ | 订单备注说明(失败说明) |
+ %s |
+
+
+
+
+`
+
+ str := fmt.Sprintf(html,
+ orderNo,
orderNo,
order.OutBizNo,
order.Status.GetText(),
@@ -147,7 +227,5 @@ func (this *CmbService) QueryByOrderNo(ctx http.Context) error {
order.Remark,
)
- str := fmt.Sprintf(msg, orderMsg)
-
return ctx.String(http2.StatusOK, str)
}