From a2848823efd19c7e32db69a3b3d0a66c3771ecab Mon Sep 17 00:00:00 2001 From: overBaker <55166473+yuhan-feng@users.noreply.github.com> Date: Fri, 14 Jul 2023 18:12:23 +0800 Subject: [PATCH] =?UTF-8?q?ah=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/slnx.sqlite | Bin 155648 -> 159744 bytes docker-compose.yaml | 2 +- internal/servants/web/alipay.go | 22 ++++++++++++---------- internal/servants/web/pub.go | 2 ++ internal/servants/web/utils.go | 2 ++ mirc/web/v1/alipay.go | 2 ++ 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 3a21cf62480a6af4889281ecc80dddf3ffe3db53..77c27283d80eeb8206d728c9823f3842e9e3726f 100644 GIT binary patch delta 19311 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�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 delta 14925 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 BM)Uvx diff --git a/docker-compose.yaml b/docker-compose.yaml index d3b903d6..c287b42c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -119,4 +119,4 @@ services: networks: paopao-network: - driver: bridge + driver: bridge \ No newline at end of file diff --git a/internal/servants/web/alipay.go b/internal/servants/web/alipay.go index bf8d7a91..4685c7f3 100644 --- a/internal/servants/web/alipay.go +++ b/internal/servants/web/alipay.go @@ -6,12 +6,14 @@ package web import ( "fmt" + "github.com/alimy/mir/v4" "github.com/gin-gonic/gin" api "github.com/rocboss/paopao-ce/auto/api/v1" "github.com/rocboss/paopao-ce/internal/model/web" "github.com/rocboss/paopao-ce/internal/servants/base" "github.com/rocboss/paopao-ce/internal/servants/chain" "github.com/sirupsen/logrus" + "github.com/smartwalle/alipay/v3" ) var ( @@ -79,20 +81,20 @@ func (s *alipayPrivSrv) UserRechargeLink(req *web.UserRechargeLinkReq) (*web.Use return nil, web.ErrRechargeReqFail } //定义一个整型变量,单价 - a := 0.8 - //var a float64 - //if req.Amount == 3000 { - // a = 1 - // //a = viper.GetFloat64("Monthly") - //} else { - // a = 0.8 - // //a = viper.GetFloat64("Yearly") - //} + //a := 0.8 + var a float64 + if req.Amount == 3000 { + a = 1 + //a = viper.GetFloat64("Monthly") + } else { + a = 0.8 + //a = viper.GetFloat64("Yearly") + } //定义一个整型变量,单价 p := alipay.TradePreCreate{} p.OutTradeNo = fmt.Sprintf("%d", recharge.ID) p.Subject = "PaoPao用户钱包充值" - p.TotalAmount = fmt.Sprintf("%.2f", (float64(recharge.Amount)/100.0)*a) + p.TotalAmount = fmt.Sprintf("%.2f", float64(recharge.Amount)/100.0*a) p.NotifyURL = "https://" + req.Host + "/v1/alipay/notify" rsp, err := s.alipayClient.TradePreCreate(p) if err != nil { diff --git a/internal/servants/web/pub.go b/internal/servants/web/pub.go index 67063bbe..cc210978 100644 --- a/internal/servants/web/pub.go +++ b/internal/servants/web/pub.go @@ -14,6 +14,8 @@ import ( "unicode/utf8" "github.com/afocus/captcha" + "github.com/alimy/mir/v4" + "github.com/gofrs/uuid/v5" api "github.com/rocboss/paopao-ce/auto/api/v1" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/model/web" diff --git a/internal/servants/web/utils.go b/internal/servants/web/utils.go index ed4f825b..ca6f7ddd 100644 --- a/internal/servants/web/utils.go +++ b/internal/servants/web/utils.go @@ -11,6 +11,8 @@ import ( "time" "unicode/utf8" + "github.com/alimy/mir/v4" + "github.com/gofrs/uuid/v5" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/model/web" "github.com/rocboss/paopao-ce/pkg/utils" diff --git a/mirc/web/v1/alipay.go b/mirc/web/v1/alipay.go index c11f155a..b3f6e07f 100644 --- a/mirc/web/v1/alipay.go +++ b/mirc/web/v1/alipay.go @@ -1,6 +1,8 @@ package v1 import ( + "github.com/alimy/mir/v4" + "github.com/alimy/mir/v4/engine" "github.com/rocboss/paopao-ce/internal/model/web" )