diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml index d69b2e5..8b80871 100644 --- a/app/main/api/etc/main.dev.yaml +++ b/app/main/api/etc/main.dev.yaml @@ -14,7 +14,7 @@ VerifyCode: AccessKeyID: "LTAI5tKGB3TVJbMHSoZN3yr9" AccessKeySecret: "OCQ30GWp4yENMjmfOAaagksE18bp65" EndpointURL: "dysmsapi.aliyuncs.com" - SignName: "天远数据" + SignName: "海南海宇大数据" TemplateCode: "SMS_302641455" ValidTime: 300 Encrypt: diff --git a/app/main/api/internal/logic/agent/getagentcommissionlogic.go b/app/main/api/internal/logic/agent/getagentcommissionlogic.go index 50e9aad..aa51456 100644 --- a/app/main/api/internal/logic/agent/getagentcommissionlogic.go +++ b/app/main/api/internal/logic/agent/getagentcommissionlogic.go @@ -2,8 +2,11 @@ package agent import ( "context" + "encoding/hex" + "encoding/json" "tydata-server/common/ctxdata" "tydata-server/common/xerr" + "tydata-server/pkg/lzkit/crypto" "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" @@ -61,6 +64,29 @@ func (l *GetAgentCommissionLogic) GetAgentCommission(req *types.GetCommissionReq } commission.CreateTime = agentCommissionModel.CreateTime.Format("2006-01-02 15:04:05") commission.ProductName = product.ProductName + + queryModel, queryErr := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, agentCommissionModel.OrderId) + if queryErr == nil && queryModel != nil { + + key := l.svcCtx.Config.Encrypt.SecretKey + keyBytes, decodeErr := hex.DecodeString(key) + if decodeErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取代理佣金列表, %v", err) + } + // 根据订单号查询query表获取query_params + decryptedData, decryptErr := crypto.AesDecrypt(queryModel.QueryParams, keyBytes) + if decryptErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取代理佣金列表, %v", err) + } + // 解析query_params,从JSON字符串转换为map + if queryModel.QueryParams != "" { + + var queryParamsMap map[string]interface{} + if unmarshalErr := json.Unmarshal(decryptedData, &queryParamsMap); unmarshalErr == nil { + commission.QueryParams = queryParamsMap + } + } + } list = append(list, commission) } } diff --git a/app/main/api/internal/types/types.go b/app/main/api/internal/types/types.go index 21801c1..2d6aea0 100644 --- a/app/main/api/internal/types/types.go +++ b/app/main/api/internal/types/types.go @@ -1156,9 +1156,10 @@ type BindMobileResp struct { } type Commission struct { - ProductName string `json:"product_name"` - Amount float64 `json:"amount"` - CreateTime string `json:"create_time"` + ProductName string `json:"product_name"` + Amount float64 `json:"amount"` + CreateTime string `json:"create_time"` + QueryParams map[string]interface{} `json:"query_params,omitempty"` } type CreateMenuReq struct { diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 888a0cd..4866b89 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,5 +1,4 @@ services: - mysql: image: mysql:8.0.34 container_name: tydata_mysql diff --git a/go.sum b/go.sum index 5595819..0fa02f5 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/tydata-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= -github.com/tydata-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw=