Merge branch 'main' of http://1.117.67.95:3000/team/tyc-server-v2

app/main/api/internal/logic/admin_agent/admingetagentwithdrawallistlogic.go

@@ -65,6 +65,12 @@ func (l *AdminGetAgentWithdrawalListLogic) AdminGetAgentWithdrawalList(req *type
 			item.PayeeName = v.PayeeName.String
 		}
 
+		// 从扣税记录中取扣税比例
+		taxModel, taxErr := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(l.ctx, v.Id)
+		if taxErr == nil {
+			item.TaxRate = taxModel.TaxRate
+		}
+
 		items = append(items, item)
 	}
 	resp = &types.AdminGetAgentWithdrawalListResp{

app/main/api/internal/logic/admin_agent/adminreviewbankcardwithdrawallogic.go

@@ -3,6 +3,7 @@ package admin_agent
 import (
 	"context"
 	"database/sql"
+	"math"
 	"time"
 	"tyc-server/app/main/model"
 	"tyc-server/common/xerr"
@@ -85,9 +86,18 @@ func (l *AdminReviewBankCardWithdrawalLogic) AdminReviewBankCardWithdrawal(req *
 			return errors.Wrapf(xerr.NewErrMsg("提现类型不正确"), "提现类型验证失败")
 		}
 
+		// 确认时使用的扣税比例：请求中传入则用传入值，否则默认 6%
+		taxRate := 0.06
+		if req.Action == ReviewActionApprove && req.TaxRate != nil {
+			taxRate = *req.TaxRate
+			if taxRate < 0 || taxRate > 1 {
+				return errors.Wrapf(xerr.NewErrMsg("扣税比例必须在 0～100% 之间"), "扣税比例验证失败")
+			}
+		}
+
 		if req.Action == ReviewActionApprove {
-			// 确认提现
-			return l.approveWithdrawal(ctx, session, record)
+			// 确认提现（可带自定义扣税比例）
+			return l.approveWithdrawal(ctx, session, record, taxRate)
 		} else {
 			// 拒绝提现
 			return l.rejectWithdrawal(ctx, session, record, req.Remark)
@@ -102,11 +112,15 @@ func (l *AdminReviewBankCardWithdrawalLogic) AdminReviewBankCardWithdrawal(req *
 	return resp, nil
 }
 
-// 确认提现
-func (l *AdminReviewBankCardWithdrawalLogic) approveWithdrawal(ctx context.Context, session sqlx.Session, record *model.AgentWithdrawal) error {
+// 确认提现（taxRate 为扣税比例，如 0.06 表示 6%）
+func (l *AdminReviewBankCardWithdrawalLogic) approveWithdrawal(ctx context.Context, session sqlx.Session, record *model.AgentWithdrawal, taxRate float64) error {
+	// 按审核时选择的扣税比例重新计算并更新提现记录与扣税记录
+	if err := l.applyReviewTaxRate(ctx, session, record, taxRate); err != nil {
+		return err
+	}
 	// 根据提现类型执行不同的操作
 	if record.WithdrawType == WithdrawTypeAlipay {
-		// 支付宝提现：先调用支付宝转账接口
+		// 支付宝提现：按更新后的实际到账金额调用支付宝转账
 		return l.approveAlipayWithdrawal(ctx, session, record)
 	} else {
 		// 银行卡提现：直接更新状态为成功（线下转账）
@@ -114,6 +128,32 @@ func (l *AdminReviewBankCardWithdrawalLogic) approveWithdrawal(ctx context.Conte
 	}
 }
 
+// applyReviewTaxRate 按审核时选择的扣税比例更新提现记录与扣税记录
+func (l *AdminReviewBankCardWithdrawalLogic) applyReviewTaxRate(ctx context.Context, session sqlx.Session, record *model.AgentWithdrawal, taxRate float64) error {
+	// 金额保留两位小数，避免浮点误差并与前端/支付宝一致
+	newTaxAmount := math.Round(record.Amount*taxRate*100) / 100
+	newActualAmount := math.Round((record.Amount-newTaxAmount)*100) / 100
+
+	record.TaxAmount = newTaxAmount
+	record.ActualAmount = newActualAmount
+	if _, err := l.svcCtx.AgentWithdrawalModel.Update(ctx, session, record); err != nil {
+		return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新提现记录扣税金额失败: %v", err)
+	}
+
+	taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id)
+	if err != nil {
+		return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询扣税记录失败: %v", err)
+	}
+	taxModel.TaxRate = taxRate
+	taxModel.TaxAmount = newTaxAmount
+	taxModel.ActualAmount = newActualAmount
+	taxModel.TaxableAmount = record.Amount
+	if err := l.svcCtx.AgentWithdrawalTaxModel.UpdateWithVersion(ctx, session, taxModel); err != nil {
+		return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新扣税记录失败: %v", err)
+	}
+	return nil
+}
+
 // 确认支付宝提现
 func (l *AdminReviewBankCardWithdrawalLogic) approveAlipayWithdrawal(ctx context.Context, session sqlx.Session, record *model.AgentWithdrawal) error {
 	// 同步调用支付宝转账

app/main/api/internal/logic/admin_query/admingetquerydetailbyorderidlogic.go

@@ -72,7 +72,8 @@ func (l *AdminGetQueryDetailByOrderIdLogic) AdminGetQueryDetailByOrderId(req *ty
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告查询, 获取商品信息失败, %v", err)
 	}
 	query.ProductName = product.ProductName
-	return &types.AdminGetQueryDetailByOrderIdResp{
+
+	resp = &types.AdminGetQueryDetailByOrderIdResp{
 		Id:          query.Id,
 		OrderId:     query.OrderId,
 		UserId:      query.UserId,
@@ -82,7 +83,23 @@ func (l *AdminGetQueryDetailByOrderIdLogic) AdminGetQueryDetailByOrderId(req *ty
 		CreateTime:  query.CreateTime,
 		UpdateTime:  query.UpdateTime,
 		QueryState:  query.QueryState,
-	}, nil
+	}
+	// 从订单表补充：商户订单号、支付订单号、支付状态、支付时间、退款时间
+	orderModel, orderErr := l.svcCtx.OrderModel.FindOne(l.ctx, req.OrderId)
+	if orderErr == nil && orderModel != nil {
+		resp.OrderNo = orderModel.OrderNo
+		if orderModel.PlatformOrderId.Valid {
+			resp.PlatformOrderId = orderModel.PlatformOrderId.String
+		}
+		resp.PaymentStatus = orderModel.Status
+		if orderModel.PayTime.Valid {
+			resp.PayTime = orderModel.PayTime.Time.Format("2006-01-02 15:04:05")
+		}
+		if orderModel.RefundTime.Valid {
+			resp.RefundTime = orderModel.RefundTime.Time.Format("2006-01-02 15:04:05")
+		}
+	}
+	return resp, nil
 }
 
 // ProcessQueryData 解密和反序列化 QueryData

app/main/api/internal/logic/agent/getagentwithdrawallogic.go

@@ -56,6 +56,11 @@ func (l *GetAgentWithdrawalLogic) GetAgentWithdrawal(req *types.GetWithdrawalReq
 				return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取代理提现列表, %v", err)
 			}
 			withdrawal.CreateTime = agentWithdrawalModel.CreateTime.Format("2006-01-02 15:04:05")
+			// 从扣税记录中取扣税比例，供前端展示“扣了几个点”
+			taxModel, taxErr := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(l.ctx, agentWithdrawalModel.Id)
+			if taxErr == nil {
+				withdrawal.TaxRate = taxModel.TaxRate
+			}
 			list = append(list, withdrawal)
 		}
 	}