csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

先短暂去除限制,上传迁移脚本
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m51s
Details

Browse Source
This commit is contained in:
break
2026-07-09 18:23:29 +09:00
parent 346156ee9b
commit b38df737e1
4 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/handler/app/client_wallet.go
View File

@@ -279,17 +279,17 @@ func (h *ClientWalletHandler) CreateRecharge(c *fiber.Ctx) error {
return err
}
// 第三方支付方式与资产类型必须匹配：单卡只允许支付宝，设备只允许微信
switch resolved.Asset.AssetType {
case "card":
if req.PaymentMethod != constants.RechargeMethodAlipay {
return errors.New(errors.CodeInvalidParam, "单卡资产只支持支付宝充值")
}
case "device":
if req.PaymentMethod != constants.RechargeMethodWechat {
return errors.New(errors.CodeInvalidParam, "设备资产只支持微信充值")
}
}
// 第三方支付方式与资产类型必须匹配：单卡只允许支付宝，设备只允许微信（已暂时注释）
// switch resolved.Asset.AssetType {
// case "card":
// if req.PaymentMethod != constants.RechargeMethodAlipay {
// return errors.New(errors.CodeInvalidParam, "单卡资产只支持支付宝充值")
// }
// case "device":
// if req.PaymentMethod != constants.RechargeMethodWechat {
// return errors.New(errors.CodeInvalidParam, "设备资产只支持微信充值")
// }
// }
config, err := h.wechatConfigService.GetActiveConfig(resolved.SkipPermissionCtx)
if err != nil {

48
internal/service/client_order/service.go
View File

@@ -229,17 +229,17 @@ func (s *Service) CreateOrder(ctx context.Context, customerID uint, req *dto.Cli
}()
if forceRecharge.NeedForceRecharge {
// 强充第三方支付方式与资产类型必须匹配：单卡只允许支付宝，设备只允许微信
switch assetInfo.AssetType {
case "card":
if req.PaymentMethod != model.PaymentMethodAlipay {
return nil, errors.New(errors.CodeInvalidParam, "单卡资产强充只支持支付宝支付")
}
case constants.ResourceTypeDevice:
if req.PaymentMethod == model.PaymentMethodAlipay {
return nil, errors.New(errors.CodeInvalidParam, "设备资产强充只支持微信支付")
}
}
// 强充第三方支付方式与资产类型必须匹配：单卡只允许支付宝，设备只允许微信（已暂时注释）
// switch assetInfo.AssetType {
// case "card":
// if req.PaymentMethod != model.PaymentMethodAlipay {
// return nil, errors.New(errors.CodeInvalidParam, "单卡资产强充只支持支付宝支付")
// }
// case constants.ResourceTypeDevice:
// if req.PaymentMethod == model.PaymentMethodAlipay {
// return nil, errors.New(errors.CodeInvalidParam, "设备资产强充只支持微信支付")
// }
// }
if req.PaymentMethod == model.PaymentMethodAlipay {
// 支付宝强充：不需要 app_type / OpenID
@@ -1253,19 +1253,19 @@ func (s *Service) PayOrder(ctx context.Context, customerID uint, orderID uint, r
return nil, errors.New(errors.CodeNeedRealname)
}
// 第三方支付方式与资产类型必须匹配：单卡只允许支付宝，设备只允许微信
if req.PaymentMethod == model.PaymentMethodWechat || req.PaymentMethod == model.PaymentMethodAlipay {
switch order.OrderType {
case model.OrderTypeSingleCard:
if req.PaymentMethod != model.PaymentMethodAlipay {
return nil, errors.New(errors.CodeInvalidParam, "单卡资产只支持支付宝支付")
}
case model.OrderTypeDevice:
if req.PaymentMethod != model.PaymentMethodWechat {
return nil, errors.New(errors.CodeInvalidParam, "设备资产只支持微信支付")
}
}
}
// 第三方支付方式与资产类型必须匹配：单卡只允许支付宝，设备只允许微信（已暂时注释）
// if req.PaymentMethod == model.PaymentMethodWechat || req.PaymentMethod == model.PaymentMethodAlipay {
// switch order.OrderType {
// case model.OrderTypeSingleCard:
// if req.PaymentMethod != model.PaymentMethodAlipay {
// return nil, errors.New(errors.CodeInvalidParam, "单卡资产只支持支付宝支付")
// }
// case model.OrderTypeDevice:
// if req.PaymentMethod != model.PaymentMethodWechat {
// return nil, errors.New(errors.CodeInvalidParam, "设备资产只支持微信支付")
// }
// }
// }
switch req.PaymentMethod {
case model.PaymentMethodWallet: