team/jnc-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add count easypay

Browse Source
This commit is contained in:
liangzai
2026-01-09 14:04:33 +08:00
parent f079980608
commit 2ca14de27e
14 changed files with 211 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/api/internal/logic/admin_agent/AdminGetAgentRankingLogic.go
View File

@@ -6,7 +6,6 @@ import (
"jnc-server/app/main/api/internal/svc"
"jnc-server/app/main/api/internal/types"
"jnc-server/common/globalkey"
"jnc-server/pkg/lzkit/crypto"
"github.com/pkg/errors"
@@ -66,7 +65,6 @@ func (l *AdminGetAgentRankingLogic) AdminGetAgentRanking(req *types.AdminGetAgen
func (l *AdminGetAgentRankingLogic) queryCommissionRanking(limit int) ([]types.AgentRankingItem, error) {
// 1. Query all commissions
builder := l.svcCtx.AgentCommissionModel.SelectBuilder()
builder = builder.Where("del_state = ?", globalkey.DelStateNo)
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx, builder, "")
if err != nil {
@@ -111,7 +109,7 @@ func (l *AdminGetAgentRankingLogic) queryCommissionRanking(limit int) ([]types.A
}
agents, err := l.svcCtx.AgentModel.FindAll(l.ctx,
l.svcCtx.AgentModel.SelectBuilder().Where("del_state = ?", globalkey.DelStateNo), "")
l.svcCtx.AgentModel.SelectBuilder(), "")
if err != nil {
return nil, err
}
@@ -162,7 +160,6 @@ func (l *AdminGetAgentRankingLogic) queryCommissionRanking(limit int) ([]types.A
func (l *AdminGetAgentRankingLogic) queryOrdersRanking(limit int) ([]types.AgentRankingItem, error) {
// 1. Query all orders
builder := l.svcCtx.AgentOrderModel.SelectBuilder()
builder = builder.Where("del_state = ?", globalkey.DelStateNo)
orders, err := l.svcCtx.AgentOrderModel.FindAll(l.ctx, builder, "")
if err != nil {
@@ -207,7 +204,7 @@ func (l *AdminGetAgentRankingLogic) queryOrdersRanking(limit int) ([]types.Agent
}
agents, err := l.svcCtx.AgentModel.FindAll(l.ctx,
l.svcCtx.AgentModel.SelectBuilder().Where("del_state = ?", globalkey.DelStateNo), "")
l.svcCtx.AgentModel.SelectBuilder(), "")
if err != nil {
return nil, err
}

4
app/main/api/internal/logic/admin_agent/AdminGetProductDistributionLogic.go
View File

@@ -7,7 +7,6 @@ import (
"jnc-server/app/main/api/internal/svc"
"jnc-server/app/main/api/internal/types"
"jnc-server/app/main/model"
"jnc-server/common/globalkey"
"github.com/zeromicro/go-zero/core/logx"
)
@@ -29,7 +28,6 @@ func NewAdminGetProductDistributionLogic(ctx context.Context, svcCtx *svc.Servic
func (l *AdminGetProductDistributionLogic) AdminGetProductDistribution() (resp *types.AdminGetProductDistributionResp, err error) {
// 1. Query all commissions
builder := l.svcCtx.AgentCommissionModel.SelectBuilder()
builder = builder.Where("del_state = ?", globalkey.DelStateNo)
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx, builder, "")
if err != nil {
@@ -50,7 +48,7 @@ func (l *AdminGetProductDistributionLogic) AdminGetProductDistribution() (resp *
var products []*model.Product
if len(productIds) > 0 {
products, err = l.svcCtx.ProductModel.FindAll(l.ctx,
l.svcCtx.ProductModel.SelectBuilder().Where("del_state = ?", globalkey.DelStateNo), "")
l.svcCtx.ProductModel.SelectBuilder(), "")
if err != nil {
return nil, err
}

4
app/main/api/internal/logic/admin_agent/admingetagentorderlistlogic.go
View File

@@ -2,7 +2,6 @@ package admin_agent
import (
"context"
"jnc-server/common/globalkey"
"jnc-server/common/xerr"
"github.com/Masterminds/squirrel"
@@ -29,8 +28,7 @@ func NewAdminGetAgentOrderListLogic(ctx context.Context, svcCtx *svc.ServiceCont
}
func (l *AdminGetAgentOrderListLogic) AdminGetAgentOrderList(req *types.AdminGetAgentOrderListReq) (resp *types.AdminGetAgentOrderListResp, err error) {
builder := l.svcCtx.AgentOrderModel.SelectBuilder().
Where("del_state = ?", globalkey.DelStateNo)
builder := l.svcCtx.AgentOrderModel.SelectBuilder()
if req.AgentId != nil {
builder = builder.Where("agent_id = ?", *req.AgentId)

14
app/main/api/internal/logic/admin_agent/admingetagentorderslistlogic.go
View File

@@ -7,7 +7,6 @@ import (
"time"
"jnc-server/app/main/model"
"jnc-server/common/globalkey"
"jnc-server/common/xerr"
"jnc-server/pkg/lzkit/crypto"
@@ -188,8 +187,7 @@ func contains(str, substr string) bool {
// queryOrders 查询订单列表
func (l *AdminGetAgentOrdersListLogic) queryOrders(req *types.AdminGetAgentOrdersListReq) ([]*model.Order, int64, error) {
builder := l.svcCtx.OrderModel.SelectBuilder().
Where("`del_state` = ?", globalkey.DelStateNo)
builder := l.svcCtx.OrderModel.SelectBuilder()
// 订单筛选
if req.OrderNo != nil && *req.OrderNo != "" {
@@ -275,7 +273,7 @@ func (l *AdminGetAgentOrdersListLogic) queryCommissionsByOrderIds(orderIds []str
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx,
l.svcCtx.AgentCommissionModel.SelectBuilder().
Where(fmt.Sprintf("`order_id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(orderIds), globalkey.DelStateNo)...),
Where(fmt.Sprintf("`order_id` IN (%s)", inClause), stringsToInterfaces(orderIds)...),
"")
if err != nil {
@@ -319,7 +317,7 @@ func (l *AdminGetAgentOrdersListLogic) queryAgentsByAgentIds(agentIds []string)
agents, err := l.svcCtx.AgentModel.FindAll(l.ctx,
l.svcCtx.AgentModel.SelectBuilder().
Where(fmt.Sprintf("`id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(ids), globalkey.DelStateNo)...),
Where(fmt.Sprintf("`id` IN (%s)", inClause), stringsToInterfaces(ids)...),
"")
if err != nil {
@@ -363,7 +361,7 @@ func (l *AdminGetAgentOrdersListLogic) queryUsersByUserIds(userIds []string) map
users, err := l.svcCtx.UserModel.FindAll(l.ctx,
l.svcCtx.UserModel.SelectBuilder().
Where(fmt.Sprintf("`id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(ids), globalkey.DelStateNo)...),
Where(fmt.Sprintf("`id` IN (%s)", inClause), stringsToInterfaces(ids)...),
"")
if err != nil {
@@ -407,7 +405,7 @@ func (l *AdminGetAgentOrdersListLogic) queryProductsByProductIds(productIds []st
products, err := l.svcCtx.ProductModel.FindAll(l.ctx,
l.svcCtx.ProductModel.SelectBuilder().
Where(fmt.Sprintf("`id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(ids), globalkey.DelStateNo)...),
Where(fmt.Sprintf("`id` IN (%s)", inClause), stringsToInterfaces(ids)...),
"")
if err != nil {
@@ -436,7 +434,7 @@ func (l *AdminGetAgentOrdersListLogic) queryQueriesByOrderIds(orderIds []string)
queries, err := l.svcCtx.QueryModel.FindAll(l.ctx,
l.svcCtx.QueryModel.SelectBuilder().
Where(fmt.Sprintf("`order_id` IN (%s) AND `del_state` = ?", inClause), append(stringsToInterfaces(orderIds), globalkey.DelStateNo)...),
Where(fmt.Sprintf("`order_id` IN (%s)", inClause), stringsToInterfaces(orderIds)...),
"")
if err != nil {

6
app/main/api/internal/logic/admin_agent/admingetagentproductconfiglistlogic.go
View File

@@ -2,7 +2,6 @@ package admin_agent
import (
"context"
"jnc-server/common/globalkey"
"jnc-server/common/xerr"
"github.com/pkg/errors"
@@ -28,8 +27,7 @@ func NewAdminGetAgentProductConfigListLogic(ctx context.Context, svcCtx *svc.Ser
}
func (l *AdminGetAgentProductConfigListLogic) AdminGetAgentProductConfigList(req *types.AdminGetAgentProductConfigListReq) (resp *types.AdminGetAgentProductConfigListResp, err error) {
builder := l.svcCtx.AgentProductConfigModel.SelectBuilder().
Where("del_state = ?", globalkey.DelStateNo)
builder := l.svcCtx.AgentProductConfigModel.SelectBuilder()
// 如果提供了产品ID，直接过滤
if req.ProductId != nil {
@@ -38,7 +36,7 @@ func (l *AdminGetAgentProductConfigListLogic) AdminGetAgentProductConfigList(req
// 如果提供了产品名称，通过关联查询 product 表过滤
if req.ProductName != nil && *req.ProductName != "" {
builder = builder.Where("product_id IN (SELECT id FROM product WHERE product_name LIKE ? AND del_state = ?)", "%"+*req.ProductName+"%", globalkey.DelStateNo)
builder = builder.Where("product_id IN (SELECT id FROM product WHERE product_name LIKE ?)", "%"+*req.ProductName+"%")
}
// 分页查询