Merge branch 'feat/coupon' into dev

dotbitHQ · Nov 8, 2023 · 941936d · 941936d
2 parents bac97b1 + 46ae857
commit 941936d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/http_server/handle/check_permissions.go b/http_server/handle/check_permissions.go
@@ -22,6 +22,7 @@ func (h *HttpHandle) CheckPermissions(ctx *gin.Context) {
 	var apiResp api_code.ApiResp
 	defer func() {
 		if apiResp.ErrNo != 0 {
+			ctx.JSON(http.StatusOK, apiResp)
 			ctx.Abort()
 		}
 	}()

diff --git a/http_server/handle/coupon_code_list.go b/http_server/handle/coupon_code_list.go
@@ -5,6 +5,7 @@ import (
 	"github.com/dotbitHQ/das-lib/core"
 	api_code "github.com/dotbitHQ/das-lib/http_api"
 	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
 	"net/http"
 )
 
@@ -44,7 +45,7 @@ func (h *HttpHandle) CouponCodeList(ctx *gin.Context) {
 	)
 	log.Info("ApiReq:", funcName, clientIp, remoteAddrIP, ctx)
 
-	if err := ctx.ShouldBindJSON(&req); err != nil {
+	if err := ctx.ShouldBindBodyWith(&req, binding.JSON); err != nil {
 		log.Error("ShouldBindJSON err: ", err.Error(), funcName, clientIp, remoteAddrIP, ctx)
 		apiResp.ApiRespErr(api_code.ApiCodeParamsInvalid, "params invalid")
 		ctx.JSON(http.StatusOK, apiResp)

diff --git a/http_server/handle/coupon_download.go b/http_server/handle/coupon_download.go
@@ -6,6 +6,7 @@ import (
 	"github.com/dotbitHQ/das-lib/core"
 	api_code "github.com/dotbitHQ/das-lib/http_api"
 	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
 	"net/http"
 )
 
@@ -25,7 +26,7 @@ func (h *HttpHandle) CouponDownload(ctx *gin.Context) {
 	)
 	log.Info("ApiReq:", funcName, clientIp, remoteAddrIP, ctx)
 
-	if err := ctx.ShouldBindJSON(&req); err != nil {
+	if err := ctx.ShouldBindBodyWith(&req, binding.JSON); err != nil {
 		log.Error("ShouldBindJSON err: ", err.Error(), funcName, clientIp, remoteAddrIP, ctx)
 		apiResp.ApiRespErr(api_code.ApiCodeParamsInvalid, "params invalid")
 		ctx.JSON(http.StatusOK, apiResp)

diff --git a/http_server/handle/coupon_order_create.go b/http_server/handle/coupon_order_create.go
@@ -14,6 +14,7 @@ import (
 	"github.com/dotbitHQ/das-lib/core"
 	api_code "github.com/dotbitHQ/das-lib/http_api"
 	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
 	"github.com/scorpiotzh/toolib"
 	"github.com/shopspring/decimal"
 	"net/http"
@@ -59,7 +60,7 @@ func (h *HttpHandle) CouponOrderCreate(ctx *gin.Context) {
 		err                    error
 	)
 
-	if err := ctx.ShouldBindJSON(&req); err != nil {
+	if err := ctx.ShouldBindBodyWith(&req, binding.JSON); err != nil {
 		log.Error("ShouldBindJSON err: ", err.Error(), funcName, clientIp, remoteAddrIP, ctx)
 		apiResp.ApiRespErr(api_code.ApiCodeParamsInvalid, "params invalid")
 		ctx.JSON(http.StatusOK, apiResp)