bsm-infra/full
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix version 1

Browse Source
This commit is contained in:
yanweidong
2026-09-22 21:15:34 +08:00
parent 9f86366638
commit d63d7e8b3a
277 changed files with 9959 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
module/finance/wallet/internal/logic/payment/by_charge.go
View File

@@ -23,26 +23,27 @@ func ByCharge(ctx context.Context, in *pb.ChargeRequest) (reply *pb.PaymentReply
return nil, ok
}
if in.Amount == 0 || in.Desc == "" {
if in.Amount <= 0 || in.Desc == "" {
return nil, errcode.ErrInvalidArgument
}
var (
myWallet, wErr = models.GetWalletByPassportIdentity(auth.ID, auth.Identity)
orderNo = utils.RandomString(32)
paymentRecrod = models.WalletPayment{
WalletIdentity: myWallet.Identity,
Type: 1, //1充值，2为订单
OrderNo: orderNo,
PayChannel: int8(in.PayChannel),
PayType: in.PayType,
Amount: in.Amount,
}
)
if wErr != nil || myWallet.Identity == "" {
if wErr != nil || myWallet == nil || myWallet.Identity == "" {
return nil, errcode.ErrNotFound(404, "wallet")
}
paymentRecrod := models.WalletPayment{
WalletIdentity: myWallet.Identity,
Type: 1, //1充值，2为订单
OrderNo: orderNo,
PayChannel: int8(in.PayChannel),
PayType: in.PayType,
Amount: in.Amount,
}
paymentRecrod.Identity = utils.UUID()
paymentRecrod.PassportID = auth.ID
paymentRecrod.PassportIdentity = auth.Identity
@@ -93,30 +94,34 @@ func ByCharge(ctx context.Context, in *pb.ChargeRequest) (reply *pb.PaymentReply
}
case 2:
var result string
var (
result string
productCode string
)
switch in.PayType {
case "WAP":
productCode = "QUICK_WAP_WAY"
case "APP":
productCode = "QUICK_MSECURITY_PAY"
default:
return nil, excode.ErrPayType
}
alipay, err := alipay.NewAlipay()
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayInit
}
alipay.SetBody(payBodyAttach.String(), orderNo, in.Amount)
alipay.SetBody(payBodyAttach.String(), orderNo, in.Amount, productCode)
switch in.PayType {
case "WAP":
result, err = alipay.TradeWapPay()
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayGetResp
}
case "APP":
if productCode == "QUICK_MSECURITY_PAY" {
result, err = alipay.TradeAppPay()
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayGetResp
}
default:
return nil, excode.ErrPayType
} else {
result, err = alipay.TradeWapPay()
}
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayGetResp
}
replyResult["payUrl"] = result

66
module/finance/wallet/internal/logic/payment/by_order.go
View File

@@ -35,19 +35,20 @@ func ByOrder(ctx context.Context, in *pb.OrderRequest) (reply *pb.PaymentReply,
var (
myWallet, wErr = models.GetWalletByPassportIdentity(auth.ID, auth.Identity)
paymentRecrod = models.WalletPayment{
WalletIdentity: myWallet.Identity,
Type: 2, //1充值，2为订单
OrderNo: in.OrderNo,
PayChannel: int8(in.PayChannel),
PayType: in.PayType,
Amount: amount,
}
)
if wErr != nil || myWallet.Identity == "" {
if wErr != nil || myWallet == nil || myWallet.Identity == "" {
return nil, errcode.ErrNotFound(404, "wallet")
}
paymentRecrod := models.WalletPayment{
WalletIdentity: myWallet.Identity,
Type: 2, //1充值，2为订单
OrderNo: in.OrderNo,
PayChannel: int8(in.PayChannel),
PayType: in.PayType,
Amount: amount,
}
paymentRecrod.Identity = utils.UUID()
paymentRecrod.PassportID = auth.ID
paymentRecrod.PassportIdentity = auth.Identity
@@ -109,28 +110,34 @@ func ByOrder(ctx context.Context, in *pb.OrderRequest) (reply *pb.PaymentReply,
replyResult["prepay_id"] = res.PrepayId
case 2:
var result string
var (
result string
productCode string
)
switch in.PayType {
case "WAP":
productCode = "QUICK_WAP_WAY"
case "APP":
productCode = "QUICK_MSECURITY_PAY"
default:
return nil, excode.ErrPayType
}
alipay, err := alipay.NewAlipay()
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayInit
}
alipay.SetBody(payBodyAttach.String(), in.OrderNo, amount)
switch in.PayType {
case "WAP":
result, err = alipay.TradeWapPay()
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayGetResp
}
case "APP":
alipay.SetBody(payBodyAttach.String(), in.OrderNo, amount, productCode)
if productCode == "QUICK_MSECURITY_PAY" {
result, err = alipay.TradeAppPay()
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayGetResp
}
default:
return nil, excode.ErrPayType
} else {
result, err = alipay.TradeWapPay()
}
if err != nil {
printer.Error(err.Error())
return nil, excode.ErrAlipayGetResp
}
replyResult["payUrl"] = result
@@ -138,11 +145,12 @@ func ByOrder(ctx context.Context, in *pb.OrderRequest) (reply *pb.PaymentReply,
case 3:
walletSrv, err := basic.NewWallet(auth.Identity, in.Password, amount)
if err != nil {
return nil, errcode.ErrDB
printer.Error(err.Error())
return nil, err
}
err = walletSrv.TradeConsum(amount)
if err != nil {
return nil, excode.ErrBalanceNotEnough
if err = walletSrv.TradeConsum(amount); err != nil {
printer.Error(err.Error())
return nil, err
}
default:
return nil, excode.ErrPayChannel

15
module/finance/wallet/internal/logic/payment/callback.go
View File

@@ -12,6 +12,9 @@ import (
)
// 回调更新支付的结果和状态
// 注意：支付成功只能由渠道回调（如 Wechat.WxCallback 验签解密后）写入。
// 本接口仅允许调用方把自己名下的待支付单标记为取消/失败，
// 不再接受调用方传入的成功状态，避免客户端自证支付成功。
func Callback(ctx context.Context, in *pb.CallbackRequest) (reply *pb.StatusReply, err error) {
auth, ok := service.ParseMetaCtx(ctx, nil)
if ok != nil {
@@ -22,19 +25,19 @@ func Callback(ctx context.Context, in *pb.CallbackRequest) (reply *pb.StatusRepl
return nil, errcode.ErrInvalidArgument
}
var status int8 = 0
// 拒绝由调用方直接把支付单置为支付成功
if in.CallbackStatus {
status = 2
} else {
status = -1
return nil, errcode.ErrPermissionDenied
}
err = models.UpsetWalletPaymentByIdentity(auth.Identity, in.Identity, status, in.CallbackMsg)
// 仅允许「创建(0)/支付中(1)」流转到「失败(-1)」，重复调用保持幂等
err = models.MarkPaymentFailed(auth.Identity, in.Identity, in.CallbackMsg)
if err != nil {
return nil, err
}
return &pb.StatusReply{
Message: vars.OK,
Timeseq: time.Now().UnixMilli(),
}, nil
}