From 9a2c47ec0d9c621749cc517812390e982be172d2 Mon Sep 17 00:00:00 2001 From: wolter Date: Tue, 24 Dec 2024 14:57:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E9=93=B6=E5=8F=B0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E4=BB=98=E6=AC=BE=E6=A8=A1=E6=9D=BF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9=EF=BC=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/constants/common/common.go | 12 + app/http/controllers/front/pay_page.go | 53 +++-- app/http/routes/route.go | 7 +- app/services/pay_page.go | 2 +- app/services/thirdpay/pay_page.go | 19 +- front/templates/payPage.html | 283 +++++++++++++----------- front/templates/payTemplate.html | 15 -- front/templates/payTemplateDefault.html | 23 ++ 8 files changed, 237 insertions(+), 177 deletions(-) delete mode 100644 front/templates/payTemplate.html create mode 100644 front/templates/payTemplateDefault.html diff --git a/app/constants/common/common.go b/app/constants/common/common.go index fdf9479..04deb94 100644 --- a/app/constants/common/common.go +++ b/app/constants/common/common.go @@ -56,6 +56,18 @@ const ( THIRD_ORDER_LOG_STATUS_SUCCESS = 2 // 第三方日志状态 成功 ) +var PayChannelName = map[int]string{ + PAY_CHANNEL_WECHAT_JSAPI: "微信支付", + PAY_CHANNEL_WECHAT_H5: "微信支付", + PAY_CHANNEL_WECHAT_APP: "微信支付", + PAY_CHANNEL_WECHAT_NATIVE: "微信支付", + PAY_CHANNEL_WECHAT_MINI: "微信支付", + PAY_CHANNEL_ALIPAY_WEB: "支付宝支付", + PAY_CHANNEL_ALIPAY_MINI: "支付宝支付", + PAY_CHANNEL_ALIPAY_JSAPI: "支付宝支付", + PAY_CHANNEL_ALIPAY_PC: "支付宝支付", +} + var PayChannelList = map[int]string{ PAY_CHANNEL_WECHAT_JSAPI: "微信JSAPI", PAY_CHANNEL_WECHAT_H5: "微信H5", diff --git a/app/http/controllers/front/pay_page.go b/app/http/controllers/front/pay_page.go index 3136e09..29ccd24 100644 --- a/app/http/controllers/front/pay_page.go +++ b/app/http/controllers/front/pay_page.go @@ -1,6 +1,7 @@ package front import ( + "PaymentCenter/app/constants/common" "PaymentCenter/app/constants/errorcode" "PaymentCenter/app/http/controllers" "PaymentCenter/app/http/entities/front" @@ -13,10 +14,10 @@ import ( "github.com/gin-gonic/gin" "net/http" "strconv" - "xorm.io/builder" + "strings" ) -// 预支付接口V2, 返回收银台页面 +// 预支付接口V2, 返回收银台页面地址 func PayUrlV2(c *gin.Context) { var res front.ApiResponse req := controllers.GetRequest(c).(*front.PayReqsV2) @@ -41,21 +42,23 @@ func PayUrlV2(c *gin.Context) { // 收银台页面 func PayPage(c *gin.Context) { var ( - code int - message string - amount string + code int + message string + amount string + orderInfo ordersmodel.Orders + desc string ) - orderId := c.Query("no") - if orderId != "" { - orderInfo := &ordersmodel.Orders{} - orderInfo, code = services.OrderFindOne(&ordersmodel.Orders{}, builder.Eq{"id": orderId}) - if code == errorcode.Success { - amount = fmt.Sprintf("%.2f", float64(orderInfo.Amount)/100) - } else { - message = errorcode.GetMsg(code, "") - } - } else { + orderId := strings.TrimSpace(c.Query("no")) + if orderId == "" { message = "页面不存在" + } else { + orderInfo, code = thirdpay.PayPageCheckOrder(orderId) + if code != errorcode.Success { + message = errorcode.GetMsg(code, "") + } else { + amount = fmt.Sprintf("%.2f", float64(orderInfo.Amount)/100) + desc = orderInfo.Desc + } } c.HTML(http.StatusOK, "payPage.html", gin.H{ @@ -63,10 +66,11 @@ func PayPage(c *gin.Context) { "message": message, "id": orderId, "amount": amount, + "desc": desc, }) } -// 收银台获取支付渠道列表 +// 收银台获取支付渠道列表接口 func PayChannelList(c *gin.Context) { req, _ := controllers.GetRequest(c).(*front.PayChannelListRequest) req.UserAgent = c.Request.UserAgent() @@ -76,7 +80,7 @@ func PayChannelList(c *gin.Context) { linq.From(data).SelectT(func(payChannel paychannelmodel.PayChannel) front.PayChannelListResponse { return front.PayChannelListResponse{ ChannelType: payChannel.ChannelType, - PayName: payChannel.PayName, + PayName: common.PayChannelName[payChannel.ChannelType], PayChannelId: strconv.Itoa(int(payChannel.Id)), } }).ToSlice(&result) @@ -84,16 +88,17 @@ func PayChannelList(c *gin.Context) { controllers.HandCodeRes(c, result, code) } -// 获取付款链接 +// 获取付款链接，返回付款模板 func GetPayLink(c *gin.Context) { req, _ := controllers.GetRequest(c).(*front.GetPayLinkRequest) result, message, code := thirdpay.GetPayLinkService(*req) - if code == errorcode.Success { - c.HTML(http.StatusOK, "payTemplate.html", gin.H{ - "payUrl": result, - }) - } else { - c.String(http.StatusOK, errorcode.GetMsg(code, "")+message) + if message == "" { + message = errorcode.GetMsg(code, "") } + c.HTML(http.StatusOK, "payTemplateDefault.html", gin.H{ + "code": code, + "payUrl": result, + "message": message, + }) } diff --git a/app/http/routes/route.go b/app/http/routes/route.go index 00259ac..49f6513 100644 --- a/app/http/routes/route.go +++ b/app/http/routes/route.go @@ -11,12 +11,11 @@ import ( "PaymentCenter/app/http/trace" "PaymentCenter/app/utils/metric" "PaymentCenter/config" - ginSwagger "github.com/swaggo/gin-swagger" - "github.com/swaggo/gin-swagger/swaggerFiles" - "github.com/gin-gonic/gin" "github.com/qit-team/snow-core/http/middleware" "github.com/qit-team/snow-core/log/logger" + ginSwagger "github.com/swaggo/gin-swagger" + "github.com/swaggo/gin-swagger/swaggerFiles" ) // api路由配置 @@ -94,7 +93,7 @@ func RegisterRoute(router *gin.Engine) { payPage := router.Group(common.PayPageAddress, middlewares.ValidateRequest()) // 收银台 支付渠道列表 payPage.POST("/list", front.PayChannelList) - // 获取付款链接 + // 付款 payPage.GET("/submit", front.GetPayLink) //router.GET(common.PayPageAddress, middlewares.ValidateRequest(), front.PayPage) diff --git a/app/services/pay_page.go b/app/services/pay_page.go index 4792f3a..0105fff 100644 --- a/app/services/pay_page.go +++ b/app/services/pay_page.go @@ -85,7 +85,7 @@ func ClientEnvCheck(ua string) int { return common.OpenInUnknown } -// 订单是否是支付状态 +// 订单状态检查是否是支付状态 func OrderStatusCheck(order ordersmodel.Orders) (code int) { switch order.Status { case common.ORDER_STATUS_CLOSE: diff --git a/app/services/thirdpay/pay_page.go b/app/services/thirdpay/pay_page.go index f2bf37e..c8b4159 100644 --- a/app/services/thirdpay/pay_page.go +++ b/app/services/thirdpay/pay_page.go @@ -24,6 +24,12 @@ import ( // 收银台获取付款链接 func GetPayLinkService(req front.GetPayLinkRequest) (result, message string, code int) { + defer func() { + if err := recover(); err != nil { + utils.Log(nil, "", "GetPayLinkService,获取支付链接失败", fmt.Sprintf("错误原因：%s", err)) + code = errorcode.SystemError + } + }() var ( payChannel = &paychannelmodel.PayChannel{} order = &ordersmodel.Orders{} @@ -48,7 +54,7 @@ func GetPayLinkService(req front.GetPayLinkRequest) (result, message string, cod if code != errorcode.Success { return } - // todo 订单的支付方式是否一致 + // 订单的支付方式是否一致, 不一致则更新 if order.PayChannelId != payChannel.Id { order.PayChannelId = payChannel.Id code = services.OrderUpdate(order) @@ -210,3 +216,14 @@ func (this *payUrl) PayUrlV2Service() (result front.PayReqsV2Response, code int) return this.result, code } + +func PayPageCheckOrder(orderId string) (order ordersmodel.Orders, code int) { + orderInfo := &ordersmodel.Orders{} + orderInfo, code = services.OrderFindOne(&ordersmodel.Orders{}, builder.Eq{"id": orderId}) + if code != errorcode.Success { + return + } + + code = services.OrderStatusCheck(*orderInfo) + return *orderInfo, code +} diff --git a/front/templates/payPage.html b/front/templates/payPage.html index 52ebbcf..69f6a55 100644 --- a/front/templates/payPage.html +++ b/front/templates/payPage.html @@ -1,147 +1,166 @@ - - - - - - 收银台页面 +{{define "payPage.html"}} + + + + + + 收银台页面 - - - -{{if eq .code 200 }} - - -{{/*

收银台页面

*/}} -

订单号：{{ .id }}

-

订单金额：{{ .amount }} 元

- - - - + // 在页面加载时调用 fetchPaymentMethods 函数 + window.onload = fetchPaymentMethods; + -{{ else}} - -

{{.message}}

- + {{ else}} + +

{{.message}}

+ -{{end}} + {{end}} - + + +{{end}} \ No newline at end of file diff --git a/front/templates/payTemplate.html b/front/templates/payTemplate.html deleted file mode 100644 index 9c24437..0000000 --- a/front/templates/payTemplate.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Title - - - - - - - \ No newline at end of file diff --git a/front/templates/payTemplateDefault.html b/front/templates/payTemplateDefault.html new file mode 100644 index 0000000..611a383 --- /dev/null +++ b/front/templates/payTemplateDefault.html @@ -0,0 +1,23 @@ +{{ define "payTemplateDefault.html"}} + + + + + {{/* Title*/}} + + + + + {{ if eq .code 200}} + + {{else}} + + {{end}} + +{{ end }} +