fix version 1

module/finance/wallet/internal/logic/basic/wallet.go

@@ -4,12 +4,13 @@ package basic
 import (
 	"context"
 
-	"bsm/full/module/finance/wallet/internal/config"
 	"bsm/full/module/finance/wallet/internal/excode"
 	"bsm/full/module/finance/wallet/internal/impl"
 	"bsm/full/module/finance/wallet/internal/models"
 	"git.apinb.com/bsm-sdk/core/errcode"
 	"git.apinb.com/bsm-sdk/core/utils"
+	"golang.org/x/crypto/bcrypt"
+	"gorm.io/gorm"
 )
 
 // WalletPay 钱包支付结构体
@@ -32,12 +33,16 @@ func NewWallet(passportIdentity, pwd string, amount int64) (*WalletPay, error) {
 		return nil, errcode.ErrPermissionDenied
 	}
 
-	// 验证支付密码
-	encPassword := EncodePassword(pwd, passportIdentity)
-	if encPassword != wallet.PayPassword {
+	// 校验支付密码
+	if !VerifyPayPassword(wallet.PayPassword, pwd) {
 		return nil, errcode.ErrPassword
 	}
 
+	// 检查金额合法性
+	if amount <= 0 {
+		return nil, excode.ErrAmount
+	}
+
 	// 检查余额是否足够
 	if amount > wallet.Balance {
 		return nil, excode.ErrBalanceNotEnough
@@ -49,21 +54,60 @@ func NewWallet(passportIdentity, pwd string, amount int64) (*WalletPay, error) {
 }
 
 // TradeConsum 执行交易消费
-// 扣除钱包余额和可提现余额
+// 使用单条条件更新原子扣减余额与可提现余额，避免"读后写"造成的并发双花；
+// 余额变更与消费流水写入放在同一事务内，保证账实一致。
 func (srv *WalletPay) TradeConsum(amount int64) error {
-	data := map[string]interface{}{
-		"balance":            srv.Body.Balance - amount,
-		"withdrawal_balance": srv.Body.WithdrawalBalance - amount,
+	if amount <= 0 {
+		return excode.ErrAmount
 	}
-	err := impl.DBService.Model(&models.WalletBasic{}).Where("identity=?", srv.Body.Identity).UpdateColumns(data).Error
-	if err != nil {
-		return err
-	}
-	return nil
+
+	return impl.DBService.Transaction(func(tx *gorm.DB) error {
+		// 条件更新：余额与可提现余额均充足且钱包未禁用时才扣减
+		res := tx.Model(&models.WalletBasic{}).
+			Where("identity = ? AND status <> -1 AND balance >= ? AND withdrawal_balance >= ?", srv.Body.Identity, amount, amount).
+			UpdateColumns(map[string]interface{}{
+				"balance":            gorm.Expr("balance - ?", amount),
+				"withdrawal_balance": gorm.Expr("withdrawal_balance - ?", amount),
+			})
+		if res.Error != nil {
+			return res.Error
+		}
+		if res.RowsAffected == 0 {
+			return excode.ErrBalanceNotEnough
+		}
+
+		// 同一事务内写入消费流水
+		record := &models.WalletRecord{
+			WalletIdentity: srv.Body.Identity,
+			TransType:      -1, // 支出
+			InTradeNo:      utils.UUID(),
+			Money:          amount,
+			TradeType:      3,         // 消费
+			PayChannel:     3,         // 钱包余额
+			PayType:        "BALANCE", // 余额支付
+		}
+		record.Identity = utils.UUID()
+		record.PassportID = srv.Body.PassportID
+		record.PassportIdentity = srv.Body.PassportIdentity
+		models.FillRecordYmd(record)
+		return tx.Create(record).Error
+	})
 }
 
-// EncodePassword 加密支付密码
-// 使用SHA256算法对密码进行加密
-func EncodePassword(pwd, passportIdentity string) string {
-	return utils.Sha256(pwd, passportIdentity+config.Spec.Wallet.PublicKey)
+// EncodePassword 使用 bcrypt 生成支付密码哈希
+func EncodePassword(pwd string) (string, error) {
+	hashed, err := bcrypt.GenerateFromPassword([]byte(pwd), bcrypt.DefaultCost)
+	if err != nil {
+		return "", err
+	}
+	return string(hashed), nil
+}
+
+// VerifyPayPassword 校验支付密码
+// 仅接受 bcrypt 哈希；历史 SHA256 摘要无法校验，需通过重置流程重新设置。
+func VerifyPayPassword(hashed, pwd string) bool {
+	if hashed == "" || pwd == "" {
+		return false
+	}
+	return bcrypt.CompareHashAndPassword([]byte(hashed), []byte(pwd)) == nil
 }