account freeze

cflyt · Jan 7, 2022 · c006a76 · c006a76
1 parent aa5ae7f
commit c006a76
Show file tree

Hide file tree

Showing 23 changed files with 1,330 additions and 839 deletions.
diff --git a/core/domain/interface/member/account.go b/core/domain/interface/member/account.go
@@ -55,7 +55,7 @@ const (
 )
 
 const (
-	StatusOK                = 1
+	StatusOK = 1
 )
 
 const (
@@ -92,7 +92,7 @@ type (
 		Charge(account AccountType, title string, amount int, outerNo string, remark string) error
 
 		// CarryTo 入账,freeze是否先冻结, procedureFee手续费; 返回日志ID
-		CarryTo(account AccountType,d AccountOperateData,freeze bool,procedureFee int)(int,error)
+		CarryTo(account AccountType, d AccountOperateData, freeze bool, procedureFee int) (int, error)
 
 		// Consume 消耗
 		Consume(account AccountType, title string, amount int, outerNo string, remark string) error
@@ -106,25 +106,18 @@ type (
 		// Refund 退款
 		Refund(account AccountType, title string, amount int, outerNo string, remark string) error
 
-		// Freeze 冻结账户
-		Freeze(account AccountType, p AccountOperateData, relateUser int64) error
+		// Freeze 账户冻结
+		Freeze(account AccountType, p AccountOperateData, relateUser int64) (int, error)
 
-		// Unfreeze 解冻金额
-		Unfreeze(title string, outerNo string, amount int, relateUser int64) error
-
-		// UnfreezeWallet 解冻赠送金额
-		UnfreezeWallet(title string, outerNo string, amount int, relateUser int64) error
+		// Unfreeze 账户解冻
+		Unfreeze(account AccountType, p AccountOperateData, relateUser int64) error
 
 		// PaymentDiscount 支付单抵扣消费,tradeNo为支付单单号
 		PaymentDiscount(tradeNo string, amount int, remark string) error
 
-		// UnfreezesIntegral 解冻积分
-		UnfreezesIntegral(title string, value int) error
-
 		// FreezeExpired 将冻结金额标记为失效
 		FreezeExpired(account AccountType, amount int, remark string) error
 
-
 		// GetWalletLog 获取钱包账户日志
 		GetWalletLog(id int64) wallet.WalletLog
 
@@ -226,6 +219,8 @@ type (
 		OuterNo string `db:"outer_no"`
 		// 积分值
 		Value int `db:"value"`
+		// 余额
+		Balance int `db:"-"`
 		// 备注
 		Remark string `db:"remark"`
 		// 关联用户
@@ -249,6 +244,8 @@ type (
 		Title string `db:"title"`
 		// 金额
 		Amount int64 `db:"amount"`
+		// 余额
+		Balance int `db:"-"`
 		// 手续费
 		ProcedureFee int64 `db:"csn_fee"`
 		// 关联操作人,仅在客服操作时,记录操作人

diff --git a/core/domain/interface/registry/keys.go b/core/domain/interface/registry/keys.go
@@ -169,7 +169,6 @@ var (
 	// MemberAccountTransferProcedureRate 会员转账手续费费率
 	MemberAccountTransferProcedureRate = KeyFormat("MemberAccountTransferProcedureRate")
 
-
 	// 活动账户转为赠送可提现奖金手续费费率
 	MemberFlowAccountConvertCsn = KeyFormat("MemberFlowAccountConvertCsn")
 	/* 经验值 */

diff --git a/core/domain/interface/wallet/wallet.go b/core/domain/interface/wallet/wallet.go
@@ -24,82 +24,82 @@ const (
 )
 
 const (
-	// 抵扣
+	// FlagDiscount 抵扣
 	FlagDiscount = 1 << iota
-	// 充值
+	// FlagCharge 充值
 	FlagCharge
 )
 
 const (
-	// 正常
+	// StatNormal 正常
 	StatNormal = 1
-	// 已禁用
+	// StatDisabled 已禁用
 	StatDisabled = 2
-	// 已封停
+	// StatClosed 已封停
 	StatClosed = 3
 )
 
 const (
 	// 未设置
 	ReviewNotSet = 0
-	// 等待审核
+	// ReviewAwaiting 等待审核
 	ReviewAwaiting = 1
-	// 审核失败
+	// ReviewReject 审核失败
 	ReviewReject = 2
-	// 审核成功
+	// ReviewPass 审核成功
 	ReviewPass = 3
-	// 已确认
+	// ReviewConfirm 已确认
 	ReviewConfirm = 4
-	// 审核终止
+	// ReviewAbort 审核终止
 	ReviewAbort = 5
 )
 
 const (
-	// 用户充值
+	// CUserCharge 用户充值
 	CUserCharge = 1
-	// 系统自动充值
+	// CSystemCharge 系统自动充值
 	CSystemCharge = 2
-	// 客服充值
+	// CServiceAgentCharge 客服充值
 	CServiceAgentCharge = 3
-	// 退款充值
+	// CRefundCharge 退款充值
 	CRefundCharge = 4
 )
 
 const (
-	// 赠送金额
+	// KCharge 赠送金额
 	KCharge = 1
-	// 钱包收入
+	// KCarry 钱包收入
 	KCarry = 2
-	// 失效
+	// KExpired 失效
 	KExpired = 3
-	// 客服调整
+	// KAdjust 客服调整
 	KAdjust = 4
-	// 消费
+	// KConsume 消费
 	KConsume = 5
-	// 扣除
+	// KDiscount 扣除
 	KDiscount = 6
-	// 转入
+	// KTransferIn 转入
 	KTransferIn = 7
-	// 转出
+	// KTransferOut 转出
 	KTransferOut = 8
 
-	// 冻结
+	// KFreeze 冻结
 	KFreeze = 9
-	// 解冻
+	// KUnfreeze 解冻
 	KUnfreeze = 10
 
-	// 转账退款
+	// KTransferRefund 转账退款
 	KTransferRefund = 11
-	// 提现退还到银行卡
+	// KWithdrawRefund 提现退还到银行卡
 	KWithdrawRefund = 12
-	// 支付单退款
+	// KPaymentOrderRefund 支付单退款
 	KPaymentOrderRefund = 13
 
-	// 提现并兑换到余额
+	// KWithdrawExchange 提现并兑换到余额
 	KWithdrawExchange int = 21
-	// 提现到银行卡(人工提现)
+	// KWithdrawToBankCard 提现到银行卡(人工提现)
 	KWithdrawToBankCard = 22
-	// 提现到第三方
+	// KWithdrawToThirdPart 提现到第三方
 	KWithdrawToThirdPart = 23
 )
 
@@ -130,8 +130,8 @@ type (
 		OuterNo string
 		Remark  string
 	}
-	Operator struct{
-		OperatorUid int
+	Operator struct {
+		OperatorUid  int
 		OperatorName string
 	}
 
@@ -167,8 +167,8 @@ type (
 		// Discount 抵扣,must是否必须大于0
 		Discount(amount int, title, outerNo string, must bool) error
 
-		// Freeze 冻结余额
-		Freeze(data OperateData,operator Operator) error
+		// Freeze 冻结余额,返回LogId
+		Freeze(data OperateData, operator Operator) (int, error)
 
 		// Unfreeze 解冻金额
 		Unfreeze(amount int, title, outerNo string, operatorUid int, operatorName string) error
@@ -177,7 +177,7 @@ type (
 		FreezeExpired(amount int, remark string) error
 
 		// CarryTo 收入/入账, freeze是否先冻结, procedureFee手续费; 返回日志ID
-		CarryTo(d OperateData,freeze bool,procedureFee int) (int,error)
+		CarryTo(d OperateData, freeze bool, procedureFee int) (int, error)
 
 		// Charge 充值,kind: 业务类型
 		Charge(value int, kind int, title, outerNo string, remark string, operatorUid int, operatorName string) error