Merge branch 'yhg_20250327' into debug

internal/logic/credit_balance/create_credit_balance_logic.go

@@ -35,6 +35,10 @@ func (l *CreateCreditBalanceLogic) CreateCreditBalance(req *types.CreditBalanceI
 		return nil, errorx.NewInvalidArgumentError("参数非法")
 	}
 
+	if req.Balance == nil {
+		return nil, errorx.NewInvalidArgumentError("余额参数非法")
+	}
+
 	_, err := l.svcCtx.CoreRpc.GetDepartmentById(l.ctx, &core.IDReq{Id: *req.OrganizationId})
 	if err != nil {
 		return nil, errorx.NewAlreadyExistsError("租户不存在")
@@ -47,7 +51,7 @@ func (l *CreateCreditBalanceLogic) CreateCreditBalance(req *types.CreditBalanceI
 
 	old, err := tx.CreditBalance.Query().Where(creditbalance.OrganizationID(*req.OrganizationId)).First(l.ctx)
 	if err != nil && ent.IsNotFound(err) {
-		_, err = tx.CreditBalance.Create().
+		old, err = tx.CreditBalance.Create().
 			SetNotNilBalance(req.Balance).
 			SetNotNilOrganizationID(req.OrganizationId).
 			Save(l.ctx)
@@ -68,9 +72,14 @@ func (l *CreateCreditBalanceLogic) CreateCreditBalance(req *types.CreditBalanceI
 		}
 	}
 
+	var beforeNumber, afterNumber float32
+	beforeNumber = old.Balance
+	afterNumber = *req.Balance + old.Balance
 	_, err = tx.CreditUsage.Create().
 		SetNotNilStatus(req.Status).
 		SetNotNilNumber(req.Balance).
+		SetBeforeNumber(beforeNumber).
+		SetAfterNumber(afterNumber).
 		SetNtype(2).
 		SetTable("").
 		SetNotNilOrganizationID(req.OrganizationId).