diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 3a21cf62..77c27283 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ 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" )