From 8ebf0127deb934efd6277a9c56045e26cf5cf64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= <zi__mm@163.com>
Date: Sat, 8 Mar 2025 13:55:30 +0800
Subject: [PATCH] cmb

---
 internal/server/http.go      |  4 ++--
 internal/service/cmb.go      | 15 +++++++++++++--
 internal/service/cmb_mock.go | 31 ++++++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/internal/server/http.go b/internal/server/http.go
index d22daa5..c5a6ba3 100644
--- a/internal/server/http.go
+++ b/internal/server/http.go
@@ -39,8 +39,8 @@ func NewHTTPServer(
 	cmb.POST("/v1/orderMock", voucherService.CmbOrderMock)
 	cmb.POST("/v1/order", voucherService.CmbOrder)
 
-	cmb.POST("/v1/queryMock", voucherService.CmbOrderMock)
-	cmb.POST("/v1/query", voucherService.CmbOrder)
+	cmb.POST("/v1/queryMock", voucherService.CmbQueryMock)
+	cmb.POST("/v1/query", voucherService.CmbQuery)
 
 	cmb.POST("/v1/product/QueryMock", voucherService.CmbProductQueryMock)
 	cmb.POST("/v1/product/query", voucherService.CmbProductQuery)
diff --git a/internal/service/cmb.go b/internal/service/cmb.go
index 96b722f..cb40425 100644
--- a/internal/service/cmb.go
+++ b/internal/service/cmb.go
@@ -53,13 +53,12 @@ func (s *VoucherService) CmbOrder(ctx http.Context) error {
 
 func (s *VoucherService) cmbOrder(ctx http.Context) (string, error) {
 
-	var req *v1.CmbRequest
-
 	bodyBytes, err := io.ReadAll(ctx.Request().Body)
 	if err != nil {
 		return "", err
 	}
 
+	var req *v1.CmbRequest
 	if err = json.Unmarshal(bodyBytes, &req); err != nil {
 		return "", err
 	}
@@ -73,6 +72,10 @@ func (s *VoucherService) cmbOrder(ctx http.Context) (string, error) {
 		return "", err
 	}
 
+	if err = bizContent.Validate(); err != nil {
+		return "", err
+	}
+
 	boReq := &bo.OrderCreateReqBo{
 		OutBizNo:    bizContent.TransactionId,
 		ProductNo:   bizContent.ActivityId,
@@ -139,6 +142,10 @@ func (s *VoucherService) cmbQuery(ctx http.Context) (*v1.CmbQueryReply, error) {
 		return nil, err
 	}
 
+	if err = bizContent.Validate(); err != nil {
+		return nil, err
+	}
+
 	return s.VoucherBiz.CmbQuery(ctx, bizContent.CodeNo)
 }
 
@@ -196,6 +203,10 @@ func (s *VoucherService) cmbProductQuery(ctx http.Context) (*v1.CmbQueryProductR
 		return nil, err
 	}
 
+	if err = bizContent.Validate(); err != nil {
+		return nil, err
+	}
+
 	return s.VoucherBiz.CmbProductQuery(ctx, bizContent.ActivityId)
 }
 
diff --git a/internal/service/cmb_mock.go b/internal/service/cmb_mock.go
index 904f32c..8f31b50 100644
--- a/internal/service/cmb_mock.go
+++ b/internal/service/cmb_mock.go
@@ -3,13 +3,20 @@ package service
 import (
 	"encoding/json"
 	"github.com/go-kratos/kratos/v2/transport/http"
+	"io"
 	v1 "voucher/api/v1"
 )
 
-func (s *VoucherService) CmbQueryMock(ctx http.Context) error {
+func (s *VoucherService) CmbOrderMock(ctx http.Context) error {
 
-	var req *v1.CmbQueryRequest
-	if err := ctx.BindForm(&req); err != nil {
+	bodyBytes, err := io.ReadAll(ctx.Request().Body)
+	if err != nil {
+		return err
+	}
+
+	var req *v1.CmbOrderRequest
+
+	if err = json.Unmarshal(bodyBytes, &req); err != nil {
 		return err
 	}
 
@@ -26,10 +33,15 @@ func (s *VoucherService) CmbQueryMock(ctx http.Context) error {
 	return ctx.JSON(200, reply)
 }
 
-func (s *VoucherService) CmbOrderMock(ctx http.Context) error {
+func (s *VoucherService) CmbQueryMock(ctx http.Context) error {
 
-	var req *v1.CmbOrderRequest
-	if err := ctx.BindForm(&req); err != nil {
+	bodyBytes, err := io.ReadAll(ctx.Request().Body)
+	if err != nil {
+		return err
+	}
+
+	var req *v1.CmbQueryRequest
+	if err = json.Unmarshal(bodyBytes, &req); err != nil {
 		return err
 	}
 
@@ -48,8 +60,13 @@ func (s *VoucherService) CmbOrderMock(ctx http.Context) error {
 
 func (s *VoucherService) CmbProductQueryMock(ctx http.Context) error {
 
+	bodyBytes, err := io.ReadAll(ctx.Request().Body)
+	if err != nil {
+		return err
+	}
+
 	var req *v1.CmbQueryProductRequest
-	if err := ctx.BindForm(&req); err != nil {
+	if err = json.Unmarshal(bodyBytes, &req); err != nil {
 		return err
 	}