diff --git a/app/main/api/desc/front/agent.api b/app/main/api/desc/front/agent.api index fb26380..c3dbaeb 100644 --- a/app/main/api/desc/front/agent.api +++ b/app/main/api/desc/front/agent.api @@ -15,7 +15,6 @@ service main { // 获取推广二维码海报 @handler GetAgentPromotionQrcode get /promotion/qrcode (GetAgentPromotionQrcodeReq) - } type ( @@ -250,6 +249,9 @@ service main { @handler ActivateAgentMembership post /membership/activate (AgentActivateMembershipReq) returns (AgentActivateMembershipResp) + + @handler GetAgentWithdrawalTaxExemption + get /withdrawal/tax/exemption (GetWithdrawalTaxExemptionReq) returns (GetWithdrawalTaxExemptionResp) } type ( @@ -349,6 +351,14 @@ type ( AgentActivateMembershipResp { Id string `json:"id"` } + GetWithdrawalTaxExemptionReq { + } + GetWithdrawalTaxExemptionResp { + TotalExemptionAmount float64 `json:"total_exemption_amount"` + UsedExemptionAmount float64 `json:"used_exemption_amount"` + RemainingExemptionAmount float64 `json:"remaining_exemption_amount"` + TaxRate float64 `json:"tax_rate"` + } ) @server ( diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml index 3529eba..abebae8 100644 --- a/app/main/api/etc/main.dev.yaml +++ b/app/main/api/etc/main.dev.yaml @@ -82,3 +82,6 @@ AdminConfig: RefreshAfter: 302400 AdminPromotion: URLDomain: "https://quannengcha.com/p" +TaxConfig: + TaxRate: 0.2 + TaxExemptionAmount: 800.00 diff --git a/app/main/api/etc/main.yaml b/app/main/api/etc/main.yaml index 3a1e9ab..3075b17 100644 --- a/app/main/api/etc/main.yaml +++ b/app/main/api/etc/main.yaml @@ -83,3 +83,6 @@ AdminConfig: RefreshAfter: 302400 AdminPromotion: URLDomain: "https://quannengcha.com/p" +TaxConfig: + TaxRate: 0.2 + TaxExemptionAmount: 800.00 diff --git a/app/main/api/internal/config/config.go b/app/main/api/internal/config/config.go index c2055b7..94b1ebb 100644 --- a/app/main/api/internal/config/config.go +++ b/app/main/api/internal/config/config.go @@ -25,6 +25,7 @@ type Config struct { Query QueryConfig AdminConfig AdminConfig AdminPromotion AdminPromotion + TaxConfig TaxConfig } // JwtAuth 用于 JWT 鉴权配置 @@ -124,3 +125,7 @@ type AdminConfig struct { type AdminPromotion struct { URLDomain string } +type TaxConfig struct { + TaxRate float64 + TaxExemptionAmount float64 +} diff --git a/app/main/api/internal/handler/agent/getagentwithdrawaltaxexemptionhandler.go b/app/main/api/internal/handler/agent/getagentwithdrawaltaxexemptionhandler.go new file mode 100644 index 0000000..81dcb39 --- /dev/null +++ b/app/main/api/internal/handler/agent/getagentwithdrawaltaxexemptionhandler.go @@ -0,0 +1,29 @@ +package agent + +import ( + "net/http" + + "github.com/zeromicro/go-zero/rest/httpx" + "qnc-server/app/main/api/internal/logic/agent" + "qnc-server/app/main/api/internal/svc" + "qnc-server/app/main/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" +) + +func GetAgentWithdrawalTaxExemptionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.GetWithdrawalTaxExemptionReq + if err := httpx.Parse(r, &req); err != nil { + result.ParamErrorResult(r, w, err) + return + } + if err := validator.Validate(req); err != nil { + result.ParamValidateErrorResult(r, w, err) + return + } + l := agent.NewGetAgentWithdrawalTaxExemptionLogic(r.Context(), svcCtx) + resp, err := l.GetAgentWithdrawalTaxExemption(&req) + result.HttpResult(r, w, resp, err) + } +} diff --git a/app/main/api/internal/handler/routes.go b/app/main/api/internal/handler/routes.go index 39301fc..e8e9670 100644 --- a/app/main/api/internal/handler/routes.go +++ b/app/main/api/internal/handler/routes.go @@ -631,6 +631,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/withdrawal", Handler: agent.AgentWithdrawalHandler(serverCtx), }, + { + Method: http.MethodGet, + Path: "/withdrawal/tax/exemption", + Handler: agent.GetAgentWithdrawalTaxExemptionHandler(serverCtx), + }, }..., ), rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret), diff --git a/app/main/api/internal/logic/agent/agentwithdrawallogic.go b/app/main/api/internal/logic/agent/agentwithdrawallogic.go index e64bcea..9c8ef95 100644 --- a/app/main/api/internal/logic/agent/agentwithdrawallogic.go +++ b/app/main/api/internal/logic/agent/agentwithdrawallogic.go @@ -2,6 +2,7 @@ package agent import ( "context" + "database/sql" "fmt" "qnc-server/app/main/model" "qnc-server/common/ctxdata" @@ -53,16 +54,18 @@ func (l *AgentWithdrawalLogic) AgentWithdrawal(req *types.WithdrawalReq) (*types outBizNo string withdrawRes = &types.WithdrawalResp{} ) - + var finalWithdrawAmount float64 // 实际到账金额 // 使用事务处理核心操作 err := l.svcCtx.AgentModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error { userID, err := ctxdata.GetUidFromCtx(l.ctx) if err != nil { return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户ID失败: %v", err) } + + // 查询代理信息 agentModel, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID) if err != nil { - return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询代理信息失败: %v", err) + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败: %v", err) } agentRealName, err := l.svcCtx.AgentRealNameModel.FindOneByAgentId(l.ctx, agentModel.Id) if err != nil { @@ -77,7 +80,6 @@ func (l *AgentWithdrawalLogic) AgentWithdrawal(req *types.WithdrawalReq) (*types if agentRealName.Name != req.PayeeName { return errors.Wrapf(xerr.NewErrMsg("您的实名认证信息不匹配, 无法提现"), "您的实名认证信息不匹配") } - // 查询钱包 agentWallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(l.ctx, agentModel.Id) if err != nil { @@ -92,16 +94,82 @@ func (l *AgentWithdrawalLogic) AgentWithdrawal(req *types.WithdrawalReq) (*types // 生成交易号 outBizNo = "W_" + l.svcCtx.AlipayService.GenerateOutTradeNo() - // 创建提现记录（初始状态为处理中） - if err = l.createWithdrawalRecord(session, agentModel.Id, req, outBizNo); err != nil { - return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建提现记录失败: %v", err) - } - // 冻结资金（事务内操作） if err = l.freezeFunds(session, agentWallet, req.Amount); err != nil { return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "资金冻结失败: %v", err) } + yearMonth := int64(time.Now().Year()*100 + int(time.Now().Month())) + // 计算税务额度 + taxExemption, err := l.svcCtx.AgentWithdrawalTaxExemptionModel.FindOneByAgentIdYearMonth(l.ctx, agentModel.Id, yearMonth) + if err != nil { + if errors.Is(err, model.ErrNotFound) { + taxExemption, err = l.createMonthlyExemption(session, agentModel.Id, yearMonth) + if err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建代理税务额度失败: %v", err) + } + } else { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理税务额度失败: %v", err) + } + } + var taxAmount float64 // 应缴税费 + var taxDeductionPart float64 // 应税金额 + var TaxStatus int64 // 扣税状态 + var exemptionAmount float64 // 免税金额 + taxRate := l.svcCtx.Config.TaxConfig.TaxRate + if taxExemption.RemainingExemptionAmount < req.Amount { + // 超过免税额度需要扣税 + exemptionAmount = taxExemption.RemainingExemptionAmount // 免税金额 = 剩余免税额度 + TaxStatus = model.TaxStatusPending // 扣税状态 = 待扣税 + taxDeductionPart = req.Amount - taxExemption.RemainingExemptionAmount // 应税金额 = 提现金额 - 剩余免税额度 + taxAmount = taxDeductionPart * taxRate // 应缴税费 = 应税金额 * 税率 + finalWithdrawAmount = req.Amount - taxAmount // 实际到账金额 = 提现金额 - 应缴税费 + + taxExemption.UsedExemptionAmount += exemptionAmount // 已使用免税额度 = 已使用免税额度 + 免税金额 + taxExemption.RemainingExemptionAmount -= exemptionAmount // 剩余免税额度 = 剩余免税额度 - 免税金额 + err = l.svcCtx.AgentWithdrawalTaxExemptionModel.UpdateWithVersion(l.ctx, session, taxExemption) + if err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新代理税务额度失败: %v", err) + } + } else { + // 未超过免税额度，免税 + exemptionAmount = req.Amount // 免税金额 = 提现金额 + TaxStatus = model.TaxStatusExempt // 扣税状态 = 免税 + taxDeductionPart = 0 // 应税金额 = 0 + finalWithdrawAmount = req.Amount // 实际到账金额 = 提现金额 + taxAmount = 0 // 应缴税费 = 0 + taxExemption.UsedExemptionAmount += exemptionAmount // 已使用免税额度 = 已使用免税额度 + 免税金额 + taxExemption.RemainingExemptionAmount -= exemptionAmount // 剩余免税额度 = 剩余免税额度 - 免税金额 + err = l.svcCtx.AgentWithdrawalTaxExemptionModel.UpdateWithVersion(l.ctx, session, taxExemption) + if err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新代理税务额度失败: %v", err) + } + } + + // 创建提现记录（初始状态为处理中） + withdrawalID, err := l.createWithdrawalRecord(session, agentModel.Id, req.PayeeAccount, req.Amount, finalWithdrawAmount, taxAmount, outBizNo) + if err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建提现记录失败: %v", err) + } + // 扣税记录 + taxModel := &model.AgentWithdrawalTax{ + AgentId: agentModel.Id, + YearMonth: yearMonth, + WithdrawalId: withdrawalID, + WithdrawalAmount: req.Amount, + ExemptionAmount: exemptionAmount, + TaxableAmount: taxDeductionPart, + TaxRate: taxRate, + TaxAmount: taxAmount, + ActualAmount: finalWithdrawAmount, + TaxStatus: TaxStatus, + Remark: sql.NullString{String: "提现成功自动扣税", Valid: true}, + ExemptionRecordId: taxExemption.Id, + } + _, err = l.svcCtx.AgentWithdrawalTaxModel.Insert(ctx, session, taxModel) + if err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建扣税记录失败: %v", err) + } return nil }) @@ -110,8 +178,9 @@ func (l *AgentWithdrawalLogic) AgentWithdrawal(req *types.WithdrawalReq) (*types } // 同步调用支付宝转账 - transferResp, err := l.svcCtx.AlipayService.AliTransfer(l.ctx, req.PayeeAccount, req.PayeeName, req.Amount, "代理提现", outBizNo) + transferResp, err := l.svcCtx.AlipayService.AliTransfer(l.ctx, req.PayeeAccount, req.PayeeName, finalWithdrawAmount, "代理提现", outBizNo) if err != nil { + l.Logger.Errorf("【支付宝转账失败】outBizNo:%s error:%v", outBizNo, err) l.handleTransferError(outBizNo, err, "支付宝接口调用失败") return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "支付宝接口调用失败: %v", err) } @@ -179,17 +248,22 @@ func (l *AgentWithdrawalLogic) mapAlipayError(code string) string { } // 创建提现记录（事务内操作） -func (l *AgentWithdrawalLogic) createWithdrawalRecord(session sqlx.Session, agentID int64, req *types.WithdrawalReq, outBizNo string) error { +func (l *AgentWithdrawalLogic) createWithdrawalRecord(session sqlx.Session, agentID int64, payeeAccount string, amount float64, finalWithdrawAmount float64, taxAmount float64, outBizNo string) (int64, error) { record := &model.AgentWithdrawal{ AgentId: agentID, WithdrawNo: outBizNo, - PayeeAccount: req.PayeeAccount, - Amount: req.Amount, + PayeeAccount: payeeAccount, + Amount: amount, + ActualAmount: finalWithdrawAmount, + TaxAmount: taxAmount, Status: StatusProcessing, } - _, err := l.svcCtx.AgentWithdrawalModel.Insert(l.ctx, session, record) - return err + result, err := l.svcCtx.AgentWithdrawalModel.Insert(l.ctx, session, record) + if err != nil { + return 0, err + } + return result.LastInsertId() } // 冻结资金（事务内操作） @@ -264,7 +338,6 @@ func (l *AgentWithdrawalLogic) updateWithdrawalStatus(outBizNo string, status in if _, err = l.svcCtx.AgentWithdrawalModel.Update(ctx, session, record); err != nil { return err } - // 失败时解冻资金 if status == StatusFailed { wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(ctx, record.AgentId) @@ -277,6 +350,27 @@ func (l *AgentWithdrawalLogic) updateWithdrawalStatus(outBizNo string, status in if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet); err != nil { return err } + taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id) + if err != nil { + return err + } + if taxModel.TaxStatus == model.TaxStatusPending { + taxModel.TaxStatus = model.TaxStatusFailed // 扣税状态 = 失败 + taxModel.TaxTime = sql.NullTime{Time: time.Now(), Valid: true} + if err := l.svcCtx.AgentWithdrawalTaxModel.UpdateWithVersion(ctx, session, taxModel); err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新扣税记录失败: %v", err) + } + } + + taxExemption, err := l.svcCtx.AgentWithdrawalTaxExemptionModel.FindOne(ctx, taxModel.ExemptionRecordId) + if err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理税务额度失败: %v", err) + } + taxExemption.UsedExemptionAmount -= taxModel.ExemptionAmount + taxExemption.RemainingExemptionAmount += taxModel.ExemptionAmount + if err := l.svcCtx.AgentWithdrawalTaxExemptionModel.UpdateWithVersion(ctx, session, taxExemption); err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新代理税务额度失败: %v", err) + } } if status == StatusSuccess { wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(ctx, record.AgentId) @@ -288,6 +382,17 @@ func (l *AgentWithdrawalLogic) updateWithdrawalStatus(outBizNo string, status in if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet); err != nil { return err } + taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id) + if err != nil { + return err + } + if taxModel.TaxStatus == model.TaxStatusPending { + taxModel.TaxStatus = model.TaxStatusSuccess // 扣税状态 = 成功 + taxModel.TaxTime = sql.NullTime{Time: time.Now(), Valid: true} + if err := l.svcCtx.AgentWithdrawalTaxModel.UpdateWithVersion(ctx, session, taxModel); err != nil { + return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新扣税记录失败: %v", err) + } + } } return nil }) @@ -311,7 +416,6 @@ func (l *AgentWithdrawalLogic) handleTransferFailure(outBizNo string, rsp interf } l.updateWithdrawalStatus(outBizNo, StatusFailed, errorMsg) l.Logger.Errorf("提现失败 outBizNo:%s reason:%s", outBizNo, errorMsg) - l.Logger.Errorf("错误响应 rsp:%+v", rsp) } // 超时处理 @@ -325,3 +429,22 @@ func (l *AgentWithdrawalLogic) handleTransferError(outBizNo string, err error, c l.updateWithdrawalStatus(outBizNo, StatusFailed, "系统处理异常") l.Logger.Errorf("%s outBizNo:%s error:%v", contextMsg, outBizNo, err) } + +func (l *AgentWithdrawalLogic) createMonthlyExemption(session sqlx.Session, agentId int64, yearMonth int64) (*model.AgentWithdrawalTaxExemption, error) { + exemption := &model.AgentWithdrawalTaxExemption{ + AgentId: agentId, + YearMonth: yearMonth, + TotalExemptionAmount: l.svcCtx.Config.TaxConfig.TaxExemptionAmount, + UsedExemptionAmount: 0.00, + RemainingExemptionAmount: l.svcCtx.Config.TaxConfig.TaxExemptionAmount, + } + + result, err := l.svcCtx.AgentWithdrawalTaxExemptionModel.Insert(l.ctx, session, exemption) + if err != nil { + return nil, err + } + + id, _ := result.LastInsertId() + exemption.Id = id + return exemption, nil +} diff --git a/app/main/api/internal/logic/agent/applyforagentlogic.go b/app/main/api/internal/logic/agent/applyforagentlogic.go index 3b6af04..4afcc3e 100644 --- a/app/main/api/internal/logic/agent/applyforagentlogic.go +++ b/app/main/api/internal/logic/agent/applyforagentlogic.go @@ -69,6 +69,9 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 读取数据库获取用户失败, mobile: %s, err: %+v", encryptedMobile, err) } if user == nil { + if claims != nil && claims.UserType == model.UserTypeNormal { + return errors.Wrapf(xerr.NewErrMsg("当前用户已注册，请输入注册的手机号"), "代理申请, 当前用户已注册") + } userID, err = l.svcCtx.UserService.RegisterUser(l.ctx, encryptedMobile) if err != nil { return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "代理申请, 注册用户失败: %+v", err) @@ -150,6 +153,12 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type if insertAgentWalletModelErr != nil { return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 新增代理钱包失败: %+v", insertAgentWalletModelErr) } + // 新增代理扣税免税额度 + var agentWithdrawalTaxExemption model.AgentWithdrawalTaxExemption + agentWithdrawalTaxExemption.AgentId = agentID + agentWithdrawalTaxExemption.TotalExemptionAmount = l.svcCtx.Config.TaxConfig.TaxExemptionAmount + agentWithdrawalTaxExemption.UsedExemptionAmount = 0 + agentWithdrawalTaxExemption.RemainingExemptionAmount = l.svcCtx.Config.TaxConfig.TaxExemptionAmount return nil }) if transErr != nil { diff --git a/app/main/api/internal/logic/agent/getagentwithdrawaltaxexemptionlogic.go b/app/main/api/internal/logic/agent/getagentwithdrawaltaxexemptionlogic.go new file mode 100644 index 0000000..4836bbf --- /dev/null +++ b/app/main/api/internal/logic/agent/getagentwithdrawaltaxexemptionlogic.go @@ -0,0 +1,78 @@ +package agent + +import ( + "context" + "time" + + "qnc-server/app/main/api/internal/svc" + "qnc-server/app/main/api/internal/types" + "qnc-server/app/main/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/logx" +) + +type GetAgentWithdrawalTaxExemptionLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewGetAgentWithdrawalTaxExemptionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetAgentWithdrawalTaxExemptionLogic { + return &GetAgentWithdrawalTaxExemptionLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *GetAgentWithdrawalTaxExemptionLogic) GetAgentWithdrawalTaxExemption(req *types.GetWithdrawalTaxExemptionReq) (resp *types.GetWithdrawalTaxExemptionResp, err error) { + userID, err := ctxdata.GetUidFromCtx(l.ctx) + if err != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户ID失败: %+v", err) + } + agent, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID) + if err != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理ID失败: %+v", err) + } + yearMonth := int64(time.Now().Year()*100 + int(time.Now().Month())) + + agentWithdrawalTaxExemption, err := l.svcCtx.AgentWithdrawalTaxExemptionModel.FindOneByAgentIdYearMonth(l.ctx, agent.Id, yearMonth) + if err != nil { + if errors.Is(err, model.ErrNotFound) { + agentWithdrawalTaxExemption, err = l.createMonthlyExemption(agent.Id, yearMonth) + if err != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建代理税务额度失败: %v", err) + } + } else { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理税务额度失败: %+v", err) + } + } + + return &types.GetWithdrawalTaxExemptionResp{ + TotalExemptionAmount: agentWithdrawalTaxExemption.TotalExemptionAmount, + UsedExemptionAmount: agentWithdrawalTaxExemption.UsedExemptionAmount, + RemainingExemptionAmount: agentWithdrawalTaxExemption.RemainingExemptionAmount, + TaxRate: l.svcCtx.Config.TaxConfig.TaxRate, + }, nil +} +func (l *GetAgentWithdrawalTaxExemptionLogic) createMonthlyExemption(agentId int64, yearMonth int64) (*model.AgentWithdrawalTaxExemption, error) { + exemption := &model.AgentWithdrawalTaxExemption{ + AgentId: agentId, + YearMonth: yearMonth, + TotalExemptionAmount: l.svcCtx.Config.TaxConfig.TaxExemptionAmount, + UsedExemptionAmount: 0.00, + RemainingExemptionAmount: l.svcCtx.Config.TaxConfig.TaxExemptionAmount, + } + + result, err := l.svcCtx.AgentWithdrawalTaxExemptionModel.Insert(l.ctx, nil, exemption) + if err != nil { + return nil, err + } + + id, _ := result.LastInsertId() + exemption.Id = id + return exemption, nil +} diff --git a/app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go b/app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go index 21a5d1b..1c6d460 100644 --- a/app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go +++ b/app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go @@ -70,7 +70,7 @@ func (l *WechatPayRefundCallbackLogic) handleQueryOrderRefund(orderNo string, st } if err := l.svcCtx.OrderModel.UpdateWithVersion(ctx, session, order); err != nil { return errors.Wrapf(err, "更新查询订单状态失败: %s", orderNo) - } + } } // 更新退款记录状态 diff --git a/app/main/api/internal/svc/servicecontext.go b/app/main/api/internal/svc/servicecontext.go index 009ef4c..05b8a48 100644 --- a/app/main/api/internal/svc/servicecontext.go +++ b/app/main/api/internal/svc/servicecontext.go @@ -60,6 +60,8 @@ type ServiceContext struct { AgentPlatformDeductionModel model.AgentPlatformDeductionModel AgentActiveStatModel model.AgentActiveStatModel AgentWithdrawalModel model.AgentWithdrawalModel + AgentWithdrawalTaxModel model.AgentWithdrawalTaxModel + AgentWithdrawalTaxExemptionModel model.AgentWithdrawalTaxExemptionModel AgentRealNameModel model.AgentRealNameModel // 管理后台相关模型 @@ -174,6 +176,8 @@ type agentModels struct { AgentPlatformDeductionModel model.AgentPlatformDeductionModel AgentActiveStatModel model.AgentActiveStatModel AgentWithdrawalModel model.AgentWithdrawalModel + AgentWithdrawalTaxModel model.AgentWithdrawalTaxModel + AgentWithdrawalTaxExemptionModel model.AgentWithdrawalTaxExemptionModel AgentRealNameModel model.AgentRealNameModel } @@ -195,6 +199,8 @@ func initAgentModels(db sqlx.SqlConn, redis cache.CacheConf) agentModels { AgentPlatformDeductionModel: model.NewAgentPlatformDeductionModel(db, redis), AgentActiveStatModel: model.NewAgentActiveStatModel(db, redis), AgentWithdrawalModel: model.NewAgentWithdrawalModel(db, redis), + AgentWithdrawalTaxModel: model.NewAgentWithdrawalTaxModel(db, redis), + AgentWithdrawalTaxExemptionModel: model.NewAgentWithdrawalTaxExemptionModel(db, redis), AgentRealNameModel: model.NewAgentRealNameModel(db, redis), } } @@ -403,6 +409,8 @@ func NewServiceContext(c config.Config) *ServiceContext { AgentPlatformDeductionModel: agentModels.AgentPlatformDeductionModel, AgentActiveStatModel: agentModels.AgentActiveStatModel, AgentWithdrawalModel: agentModels.AgentWithdrawalModel, + AgentWithdrawalTaxModel: agentModels.AgentWithdrawalTaxModel, + AgentWithdrawalTaxExemptionModel: agentModels.AgentWithdrawalTaxExemptionModel, AgentRealNameModel: agentModels.AgentRealNameModel, // 管理后台相关模型 diff --git a/app/main/api/internal/types/types.go b/app/main/api/internal/types/types.go index f9f042f..66cefaa 100644 --- a/app/main/api/internal/types/types.go +++ b/app/main/api/internal/types/types.go @@ -1284,6 +1284,16 @@ type GetWithdrawalResp struct { List []Withdrawal `json:"list"` // 查询列表 } +type GetWithdrawalTaxExemptionReq struct { +} + +type GetWithdrawalTaxExemptionResp struct { + TotalExemptionAmount float64 `json:"total_exemption_amount"` + UsedExemptionAmount float64 `json:"used_exemption_amount"` + RemainingExemptionAmount float64 `json:"remaining_exemption_amount"` + TaxRate float64 `json:"tax_rate"` +} + type HealthCheckResp struct { Status string `json:"status"` // 服务状态 Message string `json:"message"` // 状态信息 diff --git a/app/main/model/agentWithdrawalModel_gen.go b/app/main/model/agentWithdrawalModel_gen.go index f9b8b1e..5dd42de 100644 --- a/app/main/model/agentWithdrawalModel_gen.go +++ b/app/main/model/agentWithdrawalModel_gen.go @@ -57,11 +57,13 @@ type ( AgentWithdrawal struct { Id int64 `db:"id"` - AgentId int64 `db:"agent_id"` // 代理ID - WithdrawNo string `db:"withdraw_no"` // 提现单号 - Amount float64 `db:"amount"` // 提现金额 - Status int64 `db:"status"` // 状态:1-申请中,2-成功,3-失败 - PayeeAccount string `db:"payeeAccount"` // 收款人账号 + AgentId int64 `db:"agent_id"` // 代理ID + WithdrawNo string `db:"withdraw_no"` // 提现单号 + Amount float64 `db:"amount"` // 提现金额 + ActualAmount float64 `db:"actual_amount"` // 实际到账金额（扣税后） + TaxAmount float64 `db:"tax_amount"` // 扣税金额 + Status int64 `db:"status"` // 状态:1-申请中,2-成功,3-失败 + PayeeAccount string `db:"payeeAccount"` // 收款人账号 Remark sql.NullString `db:"remark"` CreateTime time.Time `db:"create_time"` // 创建时间 UpdateTime time.Time `db:"update_time"` // 更新时间 @@ -83,11 +85,11 @@ func (m *defaultAgentWithdrawalModel) Insert(ctx context.Context, session sqlx.S qncAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, data.Id) qncAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWithdrawalRowsExpectAutoSet) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWithdrawalRowsExpectAutoSet) if session != nil { - return session.ExecCtx(ctx, query, data.AgentId, data.WithdrawNo, data.Amount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) + return session.ExecCtx(ctx, query, data.AgentId, data.WithdrawNo, data.Amount, data.ActualAmount, data.TaxAmount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) } - return conn.ExecCtx(ctx, query, data.AgentId, data.WithdrawNo, data.Amount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) + return conn.ExecCtx(ctx, query, data.AgentId, data.WithdrawNo, data.Amount, data.ActualAmount, data.TaxAmount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) } @@ -138,9 +140,9 @@ func (m *defaultAgentWithdrawalModel) Update(ctx context.Context, session sqlx.S return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentWithdrawalRowsWithPlaceHolder) if session != nil { - return session.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) + return session.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.ActualAmount, newData.TaxAmount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } - return conn.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) + return conn.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.ActualAmount, newData.TaxAmount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) } @@ -161,9 +163,9 @@ func (m *defaultAgentWithdrawalModel) UpdateWithVersion(ctx context.Context, ses sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentWithdrawalRowsWithPlaceHolder) if session != nil { - return session.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) + return session.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.ActualAmount, newData.TaxAmount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } - return conn.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) + return conn.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.ActualAmount, newData.TaxAmount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) if err != nil { return err diff --git a/app/main/model/agentWithdrawalTaxExemptionModel.go b/app/main/model/agentWithdrawalTaxExemptionModel.go new file mode 100644 index 0000000..8709870 --- /dev/null +++ b/app/main/model/agentWithdrawalTaxExemptionModel.go @@ -0,0 +1,27 @@ +package model + +import ( + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlx" +) + +var _ AgentWithdrawalTaxExemptionModel = (*customAgentWithdrawalTaxExemptionModel)(nil) + +type ( + // AgentWithdrawalTaxExemptionModel is an interface to be customized, add more methods here, + // and implement the added methods in customAgentWithdrawalTaxExemptionModel. + AgentWithdrawalTaxExemptionModel interface { + agentWithdrawalTaxExemptionModel + } + + customAgentWithdrawalTaxExemptionModel struct { + *defaultAgentWithdrawalTaxExemptionModel + } +) + +// NewAgentWithdrawalTaxExemptionModel returns a model for the database table. +func NewAgentWithdrawalTaxExemptionModel(conn sqlx.SqlConn, c cache.CacheConf) AgentWithdrawalTaxExemptionModel { + return &customAgentWithdrawalTaxExemptionModel{ + defaultAgentWithdrawalTaxExemptionModel: newAgentWithdrawalTaxExemptionModel(conn, c), + } +} diff --git a/app/main/model/agentWithdrawalTaxExemptionModel_gen.go b/app/main/model/agentWithdrawalTaxExemptionModel_gen.go new file mode 100644 index 0000000..0c1e637 --- /dev/null +++ b/app/main/model/agentWithdrawalTaxExemptionModel_gen.go @@ -0,0 +1,410 @@ +// Code generated by goctl. DO NOT EDIT! + +package model + +import ( + "context" + "database/sql" + "fmt" + "strings" + + "time" + + "github.com/Masterminds/squirrel" + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" + "qnc-server/common/globalkey" +) + +var ( + agentWithdrawalTaxExemptionFieldNames = builder.RawFieldNames(&AgentWithdrawalTaxExemption{}) + agentWithdrawalTaxExemptionRows = strings.Join(agentWithdrawalTaxExemptionFieldNames, ",") + agentWithdrawalTaxExemptionRowsExpectAutoSet = strings.Join(stringx.Remove(agentWithdrawalTaxExemptionFieldNames, "`id`", "`create_time`", "`update_time`"), ",") + agentWithdrawalTaxExemptionRowsWithPlaceHolder = strings.Join(stringx.Remove(agentWithdrawalTaxExemptionFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" + + cacheQncAgentWithdrawalTaxExemptionIdPrefix = "cache:qnc:agentWithdrawalTaxExemption:id:" + cacheQncAgentWithdrawalTaxExemptionAgentIdYearMonthPrefix = "cache:qnc:agentWithdrawalTaxExemption:agentId:yearMonth:" +) + +type ( + agentWithdrawalTaxExemptionModel interface { + Insert(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTaxExemption) (sql.Result, error) + FindOne(ctx context.Context, id int64) (*AgentWithdrawalTaxExemption, error) + FindOneByAgentIdYearMonth(ctx context.Context, agentId int64, yearMonth int64) (*AgentWithdrawalTaxExemption, error) + Update(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTaxExemption) (sql.Result, error) + UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTaxExemption) error + Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error + SelectBuilder() squirrel.SelectBuilder + DeleteSoft(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTaxExemption) error + FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder, field string) (float64, error) + FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder, field string) (int64, error) + FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*AgentWithdrawalTaxExemption, error) + FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTaxExemption, error) + FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTaxExemption, int64, error) + FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AgentWithdrawalTaxExemption, error) + FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AgentWithdrawalTaxExemption, error) + Delete(ctx context.Context, session sqlx.Session, id int64) error + } + + defaultAgentWithdrawalTaxExemptionModel struct { + sqlc.CachedConn + table string + } + + AgentWithdrawalTaxExemption struct { + Id int64 `db:"id"` + CreateTime time.Time `db:"create_time"` + UpdateTime time.Time `db:"update_time"` + DeleteTime sql.NullTime `db:"delete_time"` // 删除时间 + DelState int64 `db:"del_state"` + Version int64 `db:"version"` // 版本号 + YearMonth int64 `db:"year_month"` // 年月标识，格式：202401 + TotalExemptionAmount float64 `db:"total_exemption_amount"` // 月度免税总额度 + UsedExemptionAmount float64 `db:"used_exemption_amount"` // 已使用免税额度 + RemainingExemptionAmount float64 `db:"remaining_exemption_amount"` // 剩余免税额度 + AgentId int64 `db:"agent_id"` // 关联到代理用户表的id + } +) + +func newAgentWithdrawalTaxExemptionModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentWithdrawalTaxExemptionModel { + return &defaultAgentWithdrawalTaxExemptionModel{ + CachedConn: sqlc.NewConn(conn, c), + table: "`agent_withdrawal_tax_exemption`", + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) Insert(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTaxExemption) (sql.Result, error) { + data.DelState = globalkey.DelStateNo + qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentWithdrawalTaxExemptionAgentIdYearMonthPrefix, data.AgentId, data.YearMonth) + qncAgentWithdrawalTaxExemptionIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxExemptionIdPrefix, data.Id) + return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWithdrawalTaxExemptionRowsExpectAutoSet) + if session != nil { + return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.YearMonth, data.TotalExemptionAmount, data.UsedExemptionAmount, data.RemainingExemptionAmount, data.AgentId) + } + return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.YearMonth, data.TotalExemptionAmount, data.UsedExemptionAmount, data.RemainingExemptionAmount, data.AgentId) + }, qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey, qncAgentWithdrawalTaxExemptionIdKey) +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindOne(ctx context.Context, id int64) (*AgentWithdrawalTaxExemption, error) { + qncAgentWithdrawalTaxExemptionIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxExemptionIdPrefix, id) + var resp AgentWithdrawalTaxExemption + err := m.QueryRowCtx(ctx, &resp, qncAgentWithdrawalTaxExemptionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWithdrawalTaxExemptionRows, m.table) + return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) + }) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindOneByAgentIdYearMonth(ctx context.Context, agentId int64, yearMonth int64) (*AgentWithdrawalTaxExemption, error) { + qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentWithdrawalTaxExemptionAgentIdYearMonthPrefix, agentId, yearMonth) + var resp AgentWithdrawalTaxExemption + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + query := fmt.Sprintf("select %s from %s where `agent_id` = ? and `year_month` = ? and del_state = ? limit 1", agentWithdrawalTaxExemptionRows, m.table) + if err := conn.QueryRowCtx(ctx, &resp, query, agentId, yearMonth, globalkey.DelStateNo); err != nil { + return nil, err + } + return resp.Id, nil + }, m.queryPrimary) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) Update(ctx context.Context, session sqlx.Session, newData *AgentWithdrawalTaxExemption) (sql.Result, error) { + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return nil, err + } + qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentWithdrawalTaxExemptionAgentIdYearMonthPrefix, data.AgentId, data.YearMonth) + qncAgentWithdrawalTaxExemptionIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxExemptionIdPrefix, data.Id) + return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentWithdrawalTaxExemptionRowsWithPlaceHolder) + if session != nil { + return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.YearMonth, newData.TotalExemptionAmount, newData.UsedExemptionAmount, newData.RemainingExemptionAmount, newData.AgentId, newData.Id) + } + return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.YearMonth, newData.TotalExemptionAmount, newData.UsedExemptionAmount, newData.RemainingExemptionAmount, newData.AgentId, newData.Id) + }, qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey, qncAgentWithdrawalTaxExemptionIdKey) +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentWithdrawalTaxExemption) error { + + oldVersion := newData.Version + newData.Version += 1 + + var sqlResult sql.Result + var err error + + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return err + } + qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentWithdrawalTaxExemptionAgentIdYearMonthPrefix, data.AgentId, data.YearMonth) + qncAgentWithdrawalTaxExemptionIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxExemptionIdPrefix, data.Id) + sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentWithdrawalTaxExemptionRowsWithPlaceHolder) + if session != nil { + return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.YearMonth, newData.TotalExemptionAmount, newData.UsedExemptionAmount, newData.RemainingExemptionAmount, newData.AgentId, newData.Id, oldVersion) + } + return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.YearMonth, newData.TotalExemptionAmount, newData.UsedExemptionAmount, newData.RemainingExemptionAmount, newData.AgentId, newData.Id, oldVersion) + }, qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey, qncAgentWithdrawalTaxExemptionIdKey) + if err != nil { + return err + } + updateCount, err := sqlResult.RowsAffected() + if err != nil { + return err + } + if updateCount == 0 { + return ErrNoRowsUpdate + } + + return nil +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) DeleteSoft(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTaxExemption) error { + data.DelState = globalkey.DelStateYes + data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} + if err := m.UpdateWithVersion(ctx, session, data); err != nil { + return errors.Wrapf(errors.New("delete soft failed "), "AgentWithdrawalTaxExemptionModel delete err : %+v", err) + } + return nil +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindSum(ctx context.Context, builder squirrel.SelectBuilder, field string) (float64, error) { + + if len(field) == 0 { + return 0, errors.Wrapf(errors.New("FindSum Least One Field"), "FindSum Least One Field") + } + + builder = builder.Columns("IFNULL(SUM(" + field + "),0)") + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() + if err != nil { + return 0, err + } + + var resp float64 + err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return 0, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindCount(ctx context.Context, builder squirrel.SelectBuilder, field string) (int64, error) { + + if len(field) == 0 { + return 0, errors.Wrapf(errors.New("FindCount Least One Field"), "FindCount Least One Field") + } + + builder = builder.Columns("COUNT(" + field + ")") + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() + if err != nil { + return 0, err + } + + var resp int64 + err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return 0, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindAll(ctx context.Context, builder squirrel.SelectBuilder, orderBy string) ([]*AgentWithdrawalTaxExemption, error) { + + builder = builder.Columns(agentWithdrawalTaxExemptionRows) + + if orderBy == "" { + builder = builder.OrderBy("id DESC") + } else { + builder = builder.OrderBy(orderBy) + } + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTaxExemption + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindPageListByPage(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTaxExemption, error) { + + builder = builder.Columns(agentWithdrawalTaxExemptionRows) + + if orderBy == "" { + builder = builder.OrderBy("id DESC") + } else { + builder = builder.OrderBy(orderBy) + } + + if page < 1 { + page = 1 + } + offset := (page - 1) * pageSize + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTaxExemption + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindPageListByPageWithTotal(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTaxExemption, int64, error) { + + total, err := m.FindCount(ctx, builder, "id") + if err != nil { + return nil, 0, err + } + + builder = builder.Columns(agentWithdrawalTaxExemptionRows) + + if orderBy == "" { + builder = builder.OrderBy("id DESC") + } else { + builder = builder.OrderBy(orderBy) + } + + if page < 1 { + page = 1 + } + offset := (page - 1) * pageSize + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, total, err + } + + var resp []*AgentWithdrawalTaxExemption + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, total, nil + default: + return nil, total, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindPageListByIdDESC(ctx context.Context, builder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AgentWithdrawalTaxExemption, error) { + + builder = builder.Columns(agentWithdrawalTaxExemptionRows) + + if preMinId > 0 { + builder = builder.Where(" id < ? ", preMinId) + } + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id DESC").Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTaxExemption + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) FindPageListByIdASC(ctx context.Context, builder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AgentWithdrawalTaxExemption, error) { + + builder = builder.Columns(agentWithdrawalTaxExemptionRows) + + if preMaxId > 0 { + builder = builder.Where(" id > ? ", preMaxId) + } + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id ASC").Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTaxExemption + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) Trans(ctx context.Context, fn func(ctx context.Context, session sqlx.Session) error) error { + + return m.TransactCtx(ctx, func(ctx context.Context, session sqlx.Session) error { + return fn(ctx, session) + }) + +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) SelectBuilder() squirrel.SelectBuilder { + return squirrel.Select().From(m.table) +} +func (m *defaultAgentWithdrawalTaxExemptionModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { + data, err := m.FindOne(ctx, id) + if err != nil { + return err + } + + qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentWithdrawalTaxExemptionAgentIdYearMonthPrefix, data.AgentId, data.YearMonth) + qncAgentWithdrawalTaxExemptionIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxExemptionIdPrefix, id) + _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + if session != nil { + return session.ExecCtx(ctx, query, id) + } + return conn.ExecCtx(ctx, query, id) + }, qncAgentWithdrawalTaxExemptionAgentIdYearMonthKey, qncAgentWithdrawalTaxExemptionIdKey) + return err +} +func (m *defaultAgentWithdrawalTaxExemptionModel) formatPrimary(primary interface{}) string { + return fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxExemptionIdPrefix, primary) +} +func (m *defaultAgentWithdrawalTaxExemptionModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { + query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWithdrawalTaxExemptionRows, m.table) + return conn.QueryRowCtx(ctx, v, query, primary, globalkey.DelStateNo) +} + +func (m *defaultAgentWithdrawalTaxExemptionModel) tableName() string { + return m.table +} diff --git a/app/main/model/agentWithdrawalTaxModel.go b/app/main/model/agentWithdrawalTaxModel.go new file mode 100644 index 0000000..1b9ea2d --- /dev/null +++ b/app/main/model/agentWithdrawalTaxModel.go @@ -0,0 +1,27 @@ +package model + +import ( + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlx" +) + +var _ AgentWithdrawalTaxModel = (*customAgentWithdrawalTaxModel)(nil) + +type ( + // AgentWithdrawalTaxModel is an interface to be customized, add more methods here, + // and implement the added methods in customAgentWithdrawalTaxModel. + AgentWithdrawalTaxModel interface { + agentWithdrawalTaxModel + } + + customAgentWithdrawalTaxModel struct { + *defaultAgentWithdrawalTaxModel + } +) + +// NewAgentWithdrawalTaxModel returns a model for the database table. +func NewAgentWithdrawalTaxModel(conn sqlx.SqlConn, c cache.CacheConf) AgentWithdrawalTaxModel { + return &customAgentWithdrawalTaxModel{ + defaultAgentWithdrawalTaxModel: newAgentWithdrawalTaxModel(conn, c), + } +} diff --git a/app/main/model/agentWithdrawalTaxModel_gen.go b/app/main/model/agentWithdrawalTaxModel_gen.go new file mode 100644 index 0000000..1142c0e --- /dev/null +++ b/app/main/model/agentWithdrawalTaxModel_gen.go @@ -0,0 +1,418 @@ +// Code generated by goctl. DO NOT EDIT! + +package model + +import ( + "context" + "database/sql" + "fmt" + "strings" + + "time" + + "github.com/Masterminds/squirrel" + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" + "qnc-server/common/globalkey" +) + +var ( + agentWithdrawalTaxFieldNames = builder.RawFieldNames(&AgentWithdrawalTax{}) + agentWithdrawalTaxRows = strings.Join(agentWithdrawalTaxFieldNames, ",") + agentWithdrawalTaxRowsExpectAutoSet = strings.Join(stringx.Remove(agentWithdrawalTaxFieldNames, "`id`", "`create_time`", "`update_time`"), ",") + agentWithdrawalTaxRowsWithPlaceHolder = strings.Join(stringx.Remove(agentWithdrawalTaxFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" + + cacheQncAgentWithdrawalTaxIdPrefix = "cache:qnc:agentWithdrawalTax:id:" + cacheQncAgentWithdrawalTaxWithdrawalIdPrefix = "cache:qnc:agentWithdrawalTax:withdrawalId:" +) + +type ( + agentWithdrawalTaxModel interface { + Insert(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTax) (sql.Result, error) + FindOne(ctx context.Context, id int64) (*AgentWithdrawalTax, error) + FindOneByWithdrawalId(ctx context.Context, withdrawalId int64) (*AgentWithdrawalTax, error) + Update(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTax) (sql.Result, error) + UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTax) error + Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error + SelectBuilder() squirrel.SelectBuilder + DeleteSoft(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTax) error + FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder, field string) (float64, error) + FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder, field string) (int64, error) + FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*AgentWithdrawalTax, error) + FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTax, error) + FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTax, int64, error) + FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AgentWithdrawalTax, error) + FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AgentWithdrawalTax, error) + Delete(ctx context.Context, session sqlx.Session, id int64) error + } + + defaultAgentWithdrawalTaxModel struct { + sqlc.CachedConn + table string + } + + AgentWithdrawalTax struct { + Id int64 `db:"id"` + CreateTime time.Time `db:"create_time"` + UpdateTime time.Time `db:"update_time"` + DeleteTime sql.NullTime `db:"delete_time"` // 删除时间 + DelState int64 `db:"del_state"` + Version int64 `db:"version"` // 版本号 + WithdrawalAmount float64 `db:"withdrawal_amount"` // 提现金额 + ExemptionAmount float64 `db:"exemption_amount"` // 免税金额 + TaxableAmount float64 `db:"taxable_amount"` // 应税金额 + TaxRate float64 `db:"tax_rate"` // 税率，如：0.2000表示20% + TaxAmount float64 `db:"tax_amount"` // 应缴税费 + ActualAmount float64 `db:"actual_amount"` // 实际到账金额 + YearMonth int64 `db:"year_month"` // 所属年月，格式：202401 + TaxStatus int64 `db:"tax_status"` // 扣税状态：0-待扣税，1-已扣税，2-免税，3-扣税失败 + TaxTime sql.NullTime `db:"tax_time"` // 扣税时间 + Remark sql.NullString `db:"remark"` // 备注信息 + AgentId int64 `db:"agent_id"` // 关联到代理用户表的id + WithdrawalId int64 `db:"withdrawal_id"` // 关联提现记录表的id + ExemptionRecordId int64 `db:"exemption_record_id"` // 关联到免税额度记录的id + } +) + +func newAgentWithdrawalTaxModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentWithdrawalTaxModel { + return &defaultAgentWithdrawalTaxModel{ + CachedConn: sqlc.NewConn(conn, c), + table: "`agent_withdrawal_tax`", + } +} + +func (m *defaultAgentWithdrawalTaxModel) Insert(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTax) (sql.Result, error) { + data.DelState = globalkey.DelStateNo + qncAgentWithdrawalTaxIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxIdPrefix, data.Id) + qncAgentWithdrawalTaxWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxWithdrawalIdPrefix, data.WithdrawalId) + return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWithdrawalTaxRowsExpectAutoSet) + if session != nil { + return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.WithdrawalAmount, data.ExemptionAmount, data.TaxableAmount, data.TaxRate, data.TaxAmount, data.ActualAmount, data.YearMonth, data.TaxStatus, data.TaxTime, data.Remark, data.AgentId, data.WithdrawalId, data.ExemptionRecordId) + } + return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.WithdrawalAmount, data.ExemptionAmount, data.TaxableAmount, data.TaxRate, data.TaxAmount, data.ActualAmount, data.YearMonth, data.TaxStatus, data.TaxTime, data.Remark, data.AgentId, data.WithdrawalId, data.ExemptionRecordId) + }, qncAgentWithdrawalTaxIdKey, qncAgentWithdrawalTaxWithdrawalIdKey) +} + +func (m *defaultAgentWithdrawalTaxModel) FindOne(ctx context.Context, id int64) (*AgentWithdrawalTax, error) { + qncAgentWithdrawalTaxIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxIdPrefix, id) + var resp AgentWithdrawalTax + err := m.QueryRowCtx(ctx, &resp, qncAgentWithdrawalTaxIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWithdrawalTaxRows, m.table) + return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) + }) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindOneByWithdrawalId(ctx context.Context, withdrawalId int64) (*AgentWithdrawalTax, error) { + qncAgentWithdrawalTaxWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxWithdrawalIdPrefix, withdrawalId) + var resp AgentWithdrawalTax + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentWithdrawalTaxWithdrawalIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + query := fmt.Sprintf("select %s from %s where `withdrawal_id` = ? and del_state = ? limit 1", agentWithdrawalTaxRows, m.table) + if err := conn.QueryRowCtx(ctx, &resp, query, withdrawalId, globalkey.DelStateNo); err != nil { + return nil, err + } + return resp.Id, nil + }, m.queryPrimary) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) Update(ctx context.Context, session sqlx.Session, newData *AgentWithdrawalTax) (sql.Result, error) { + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return nil, err + } + qncAgentWithdrawalTaxIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxIdPrefix, data.Id) + qncAgentWithdrawalTaxWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxWithdrawalIdPrefix, data.WithdrawalId) + return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentWithdrawalTaxRowsWithPlaceHolder) + if session != nil { + return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.WithdrawalAmount, newData.ExemptionAmount, newData.TaxableAmount, newData.TaxRate, newData.TaxAmount, newData.ActualAmount, newData.YearMonth, newData.TaxStatus, newData.TaxTime, newData.Remark, newData.AgentId, newData.WithdrawalId, newData.ExemptionRecordId, newData.Id) + } + return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.WithdrawalAmount, newData.ExemptionAmount, newData.TaxableAmount, newData.TaxRate, newData.TaxAmount, newData.ActualAmount, newData.YearMonth, newData.TaxStatus, newData.TaxTime, newData.Remark, newData.AgentId, newData.WithdrawalId, newData.ExemptionRecordId, newData.Id) + }, qncAgentWithdrawalTaxIdKey, qncAgentWithdrawalTaxWithdrawalIdKey) +} + +func (m *defaultAgentWithdrawalTaxModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentWithdrawalTax) error { + + oldVersion := newData.Version + newData.Version += 1 + + var sqlResult sql.Result + var err error + + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return err + } + qncAgentWithdrawalTaxIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxIdPrefix, data.Id) + qncAgentWithdrawalTaxWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxWithdrawalIdPrefix, data.WithdrawalId) + sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentWithdrawalTaxRowsWithPlaceHolder) + if session != nil { + return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.WithdrawalAmount, newData.ExemptionAmount, newData.TaxableAmount, newData.TaxRate, newData.TaxAmount, newData.ActualAmount, newData.YearMonth, newData.TaxStatus, newData.TaxTime, newData.Remark, newData.AgentId, newData.WithdrawalId, newData.ExemptionRecordId, newData.Id, oldVersion) + } + return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.WithdrawalAmount, newData.ExemptionAmount, newData.TaxableAmount, newData.TaxRate, newData.TaxAmount, newData.ActualAmount, newData.YearMonth, newData.TaxStatus, newData.TaxTime, newData.Remark, newData.AgentId, newData.WithdrawalId, newData.ExemptionRecordId, newData.Id, oldVersion) + }, qncAgentWithdrawalTaxIdKey, qncAgentWithdrawalTaxWithdrawalIdKey) + if err != nil { + return err + } + updateCount, err := sqlResult.RowsAffected() + if err != nil { + return err + } + if updateCount == 0 { + return ErrNoRowsUpdate + } + + return nil +} + +func (m *defaultAgentWithdrawalTaxModel) DeleteSoft(ctx context.Context, session sqlx.Session, data *AgentWithdrawalTax) error { + data.DelState = globalkey.DelStateYes + data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} + if err := m.UpdateWithVersion(ctx, session, data); err != nil { + return errors.Wrapf(errors.New("delete soft failed "), "AgentWithdrawalTaxModel delete err : %+v", err) + } + return nil +} + +func (m *defaultAgentWithdrawalTaxModel) FindSum(ctx context.Context, builder squirrel.SelectBuilder, field string) (float64, error) { + + if len(field) == 0 { + return 0, errors.Wrapf(errors.New("FindSum Least One Field"), "FindSum Least One Field") + } + + builder = builder.Columns("IFNULL(SUM(" + field + "),0)") + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() + if err != nil { + return 0, err + } + + var resp float64 + err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return 0, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindCount(ctx context.Context, builder squirrel.SelectBuilder, field string) (int64, error) { + + if len(field) == 0 { + return 0, errors.Wrapf(errors.New("FindCount Least One Field"), "FindCount Least One Field") + } + + builder = builder.Columns("COUNT(" + field + ")") + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() + if err != nil { + return 0, err + } + + var resp int64 + err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return 0, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindAll(ctx context.Context, builder squirrel.SelectBuilder, orderBy string) ([]*AgentWithdrawalTax, error) { + + builder = builder.Columns(agentWithdrawalTaxRows) + + if orderBy == "" { + builder = builder.OrderBy("id DESC") + } else { + builder = builder.OrderBy(orderBy) + } + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTax + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindPageListByPage(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTax, error) { + + builder = builder.Columns(agentWithdrawalTaxRows) + + if orderBy == "" { + builder = builder.OrderBy("id DESC") + } else { + builder = builder.OrderBy(orderBy) + } + + if page < 1 { + page = 1 + } + offset := (page - 1) * pageSize + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTax + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindPageListByPageWithTotal(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentWithdrawalTax, int64, error) { + + total, err := m.FindCount(ctx, builder, "id") + if err != nil { + return nil, 0, err + } + + builder = builder.Columns(agentWithdrawalTaxRows) + + if orderBy == "" { + builder = builder.OrderBy("id DESC") + } else { + builder = builder.OrderBy(orderBy) + } + + if page < 1 { + page = 1 + } + offset := (page - 1) * pageSize + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, total, err + } + + var resp []*AgentWithdrawalTax + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, total, nil + default: + return nil, total, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindPageListByIdDESC(ctx context.Context, builder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AgentWithdrawalTax, error) { + + builder = builder.Columns(agentWithdrawalTaxRows) + + if preMinId > 0 { + builder = builder.Where(" id < ? ", preMinId) + } + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id DESC").Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTax + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) FindPageListByIdASC(ctx context.Context, builder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AgentWithdrawalTax, error) { + + builder = builder.Columns(agentWithdrawalTaxRows) + + if preMaxId > 0 { + builder = builder.Where(" id > ? ", preMaxId) + } + + query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id ASC").Limit(uint64(pageSize)).ToSql() + if err != nil { + return nil, err + } + + var resp []*AgentWithdrawalTax + err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) + switch err { + case nil: + return resp, nil + default: + return nil, err + } +} + +func (m *defaultAgentWithdrawalTaxModel) Trans(ctx context.Context, fn func(ctx context.Context, session sqlx.Session) error) error { + + return m.TransactCtx(ctx, func(ctx context.Context, session sqlx.Session) error { + return fn(ctx, session) + }) + +} + +func (m *defaultAgentWithdrawalTaxModel) SelectBuilder() squirrel.SelectBuilder { + return squirrel.Select().From(m.table) +} +func (m *defaultAgentWithdrawalTaxModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { + data, err := m.FindOne(ctx, id) + if err != nil { + return err + } + + qncAgentWithdrawalTaxIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxIdPrefix, id) + qncAgentWithdrawalTaxWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxWithdrawalIdPrefix, data.WithdrawalId) + _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + if session != nil { + return session.ExecCtx(ctx, query, id) + } + return conn.ExecCtx(ctx, query, id) + }, qncAgentWithdrawalTaxIdKey, qncAgentWithdrawalTaxWithdrawalIdKey) + return err +} +func (m *defaultAgentWithdrawalTaxModel) formatPrimary(primary interface{}) string { + return fmt.Sprintf("%s%v", cacheQncAgentWithdrawalTaxIdPrefix, primary) +} +func (m *defaultAgentWithdrawalTaxModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { + query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWithdrawalTaxRows, m.table) + return conn.QueryRowCtx(ctx, v, query, primary, globalkey.DelStateNo) +} + +func (m *defaultAgentWithdrawalTaxModel) tableName() string { + return m.table +} diff --git a/app/main/model/vars.go b/app/main/model/vars.go index 5bef461..275626d 100644 --- a/app/main/model/vars.go +++ b/app/main/model/vars.go @@ -108,3 +108,9 @@ const ( AgentStatusNo = 0 // 非代理 AgentStatusYes = 1 // 是代理 ) +const ( + TaxStatusPending = 0 // 待扣税 + TaxStatusSuccess = 1 // 已扣税 + TaxStatusExempt = 2 // 免税 + TaxStatusFailed = 3 // 扣税失败 +) diff --git a/common/jwt/jwtx_test.go b/common/jwt/jwtx_test.go new file mode 100644 index 0000000..bc89b5c --- /dev/null +++ b/common/jwt/jwtx_test.go @@ -0,0 +1,296 @@ +package jwtx + +import ( + "fmt" + "qnc-server/app/main/model" + "testing" + "time" + + "github.com/golang-jwt/jwt/v4" + "github.com/stretchr/testify/assert" +) + +func TestParseJwtToken(t *testing.T) { + secret := "WUvoIwL-FK0qnlxhvxR9tV6SjfOpeJMpKmY2QvT99lA" + tokenStr, err := GenerateJwtToken(JwtClaims{ + UserId: 123, + AgentId: 0, + Platform: "wxh5", + UserType: 0, + IsAgent: 0, + }, secret, 3600) + assert.NoError(t, err) + tests := []struct { + name string + tokenStr string + secret string + expectError bool + expectClaims *JwtClaims + }{ + { + name: "无效的token字符串", + tokenStr: "invalid-token", + secret: secret, + expectError: true, + }, + { + name: "空token字符串", + tokenStr: "", + secret: secret, + expectError: true, + }, + { + name: "错误的密钥", + tokenStr: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHRyYSI6eyJ1c2VySWQiOjEyMywiYWdlbnRJZCI6NDU2LCJwbGF0Zm9ybSI6InRlc3QiLCJ1c2VyVHlwZSI6MSwiaXNBZ2VudCI6MH0sImV4cCI6MTczNTY4MDAwMCwiaWF0IjoxNzM1Njc5OTAwfQ.invalid-signature", + secret: "wrong-secret", + expectError: true, + }, + { + name: "缺少extra字段", + tokenStr: createTokenWithoutExtra(secret), + secret: secret, + expectError: true, + }, + { + name: "正常解析token", + tokenStr: tokenStr, + secret: secret, + expectError: false, + expectClaims: &JwtClaims{ + UserId: 123, + AgentId: 456, + Platform: "test", + UserType: 1, + IsAgent: 0, + }, + }, + { + name: "解析临时用户token", + tokenStr: createTempUserToken(secret), + secret: secret, + expectError: false, + expectClaims: &JwtClaims{ + UserId: 789, + AgentId: 0, + Platform: "mobile", + UserType: 0, + IsAgent: 0, + }, + }, + { + name: "解析代理用户token", + tokenStr: createAgentUserToken(secret), + secret: secret, + expectError: false, + expectClaims: &JwtClaims{ + UserId: 999, + AgentId: 888, + Platform: "web", + UserType: 1, + IsAgent: 1, + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + claims, err := ParseJwtToken(tt.tokenStr, tt.secret) + fmt.Printf("name: %s\n", tt.name) + fmt.Printf("claims: %+v\n", claims) + if tt.name == "正常解析token" { + fmt.Printf("claims.UserType bool: %v\n", claims.UserType == model.UserTypeTemp) + } + if tt.expectError { + assert.Error(t, err) + assert.Nil(t, claims) + } else { + assert.NoError(t, err) + assert.NotNil(t, claims) + assert.Equal(t, tt.expectClaims.UserId, claims.UserId) + assert.Equal(t, tt.expectClaims.AgentId, claims.AgentId) + assert.Equal(t, tt.expectClaims.Platform, claims.Platform) + assert.Equal(t, tt.expectClaims.UserType, claims.UserType) + assert.Equal(t, tt.expectClaims.IsAgent, claims.IsAgent) + } + }) + } +} + +func TestParseJwtToken_Integration(t *testing.T) { + secret := "integration-test-secret" + + // 测试生成和解析的集成 + originalClaims := JwtClaims{ + UserId: 12345, + AgentId: 67890, + Platform: "integration-test", + UserType: 1, + IsAgent: 1, + } + + // 生成token + tokenStr, err := GenerateJwtToken(originalClaims, secret, 3600) + assert.NoError(t, err) + assert.NotEmpty(t, tokenStr) + + // 解析token + parsedClaims, err := ParseJwtToken(tokenStr, secret) + assert.NoError(t, err) + assert.NotNil(t, parsedClaims) + + // 验证解析结果 + assert.Equal(t, originalClaims.UserId, parsedClaims.UserId) + assert.Equal(t, originalClaims.AgentId, parsedClaims.AgentId) + assert.Equal(t, originalClaims.Platform, parsedClaims.Platform) + assert.Equal(t, originalClaims.UserType, parsedClaims.UserType) + assert.Equal(t, originalClaims.IsAgent, parsedClaims.IsAgent) +} + +func TestParseJwtToken_EdgeCases(t *testing.T) { + secret := "edge-case-secret" + + t.Run("过期的token", func(t *testing.T) { + // 创建一个已过期的token + expiredToken := createExpiredToken(secret) + claims, err := ParseJwtToken(expiredToken, secret) + assert.Error(t, err) + assert.Nil(t, claims) + }) + + t.Run("extra字段为nil", func(t *testing.T) { + // 创建一个extra字段为nil的token + nilExtraToken := createTokenWithNilExtra(secret) + claims, err := ParseJwtToken(nilExtraToken, secret) + assert.Error(t, err) + assert.Nil(t, claims) + }) + + t.Run("extra字段类型错误", func(t *testing.T) { + // 创建一个extra字段类型错误的token + wrongTypeToken := createTokenWithWrongExtraType(secret) + claims, err := ParseJwtToken(wrongTypeToken, secret) + assert.Error(t, err) + assert.Nil(t, claims) + }) +} + +// 辅助函数：创建有效的token +func createValidToken(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now + 3600, + "iat": now, + "userId": 123, + ExtraKey: map[string]interface{}{ + "userId": 123, + "agentId": 456, + "platform": "test", + "userType": 1, + "isAgent": 0, + }, + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} + +// 辅助函数：创建临时用户token +func createTempUserToken(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now + 3600, + "iat": now, + "userId": 789, + ExtraKey: map[string]interface{}{ + "userId": 789, + "agentId": 0, + "platform": "mobile", + "userType": 0, + "isAgent": 0, + }, + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} + +// 辅助函数：创建代理用户token +func createAgentUserToken(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now + 3600, + "iat": now, + "userId": 999, + ExtraKey: map[string]interface{}{ + "userId": 999, + "agentId": 888, + "platform": "web", + "userType": 1, + "isAgent": 1, + }, + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} + +// 辅助函数：创建缺少extra字段的token +func createTokenWithoutExtra(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now + 3600, + "iat": now, + "userId": 123, + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} + +// 辅助函数：创建已过期的token +func createExpiredToken(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now - 3600, // 已过期 + "iat": now - 7200, + "userId": 123, + ExtraKey: map[string]interface{}{ + "userId": 123, + "agentId": 456, + "platform": "test", + "userType": 1, + "isAgent": 0, + }, + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} + +// 辅助函数：创建extra字段为nil的token +func createTokenWithNilExtra(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now + 3600, + "iat": now, + "userId": 123, + ExtraKey: nil, + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} + +// 辅助函数：创建extra字段类型错误的token +func createTokenWithWrongExtraType(secret string) string { + now := time.Now().Unix() + claims := jwt.MapClaims{ + "exp": now + 3600, + "iat": now, + "userId": 123, + ExtraKey: "wrong-type", // 应该是map[string]interface{} + } + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + tokenStr, _ := token.SignedString([]byte(secret)) + return tokenStr +} diff --git a/deploy/script/gen_models.ps1 b/deploy/script/gen_models.ps1 index 4d64131..ea6f8b6 100644 --- a/deploy/script/gen_models.ps1 +++ b/deploy/script/gen_models.ps1 @@ -22,7 +22,9 @@ $tables = @( # "agent_product_config", # "agent_rewards", # "agent_wallet", - # "agent_withdrawal", + "agent_withdrawal" + "agent_withdrawal_tax" + "agent_withdrawal_tax_exemption" # "agent_real_name" # "feature", # "global_notifications" @@ -36,7 +38,7 @@ $tables = @( # "query_cleanup_config" # "user" # "user_auth" - "user_temp" + # "user_temp" # "example" # "authorization" # "authorization_face" diff --git a/go.mod b/go.mod index 2c2d2f4..601ed93 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/smartwalle/alipay/v3 v3.2.23 github.com/sony/sonyflake v1.2.0 + github.com/stretchr/testify v1.10.0 github.com/tidwall/gjson v1.18.0 github.com/wechatpay-apiv3/wechatpay-go v0.2.20 github.com/zeromicro/go-zero v1.7.3 @@ -51,6 +52,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/clbanning/mxj/v2 v2.5.5 // indirect github.com/cloudwego/base64x v0.1.5 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/color v1.17.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect @@ -74,6 +76,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect @@ -111,4 +114,5 @@ require ( google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/pkg/lzkit/crypto/ecb_test.go b/pkg/lzkit/crypto/ecb_test.go index 9e7f421..a25e4e9 100644 --- a/pkg/lzkit/crypto/ecb_test.go +++ b/pkg/lzkit/crypto/ecb_test.go @@ -9,7 +9,7 @@ import ( func TestAesEcbMobileEncryption(t *testing.T) { // 测试手机号加密 - mobile := "18889793585" + mobile := "13930867138" keyStr := "ff83609b2b24fc73196aac3d3dfb874f" // 测试加密 @@ -17,7 +17,7 @@ func TestAesEcbMobileEncryption(t *testing.T) { if err != nil { t.Fatalf("手机号加密失败: %v", err) } - fmt.Println(encrypted) + fmt.Printf("encrypted: %s\n", encrypted) jmstr := "m9EEeW9ZBBJmi1hx1k1uIQ==" // 测试解密 decrypted, err := DecryptMobile(jmstr, keyStr)