作者 陈志颖

fix:根据分红单ID查找分红单详情

... ... @@ -10,7 +10,7 @@ import (
type GetDividendsOrderQuery struct {
// 分红订单ID
DividendsOrderId int64 `cname:"分红订单ID" json:"dividendsOrderId" valid:"Required"`
DividendsOrderId int64 `cname:"分红订单ID" json:"dividendsOrderId,omitempty"`
// 分红订单编号
DividendsOrderNumber string `cname:"分红订单编号" json:"dividendsOrderNumber,omitempty"`
// 公司ID,通过集成REST上下文获取
... ... @@ -20,7 +20,7 @@ type GetDividendsOrderQuery struct {
// 用户ID,通过集成REST上下文获取,可翻译成发起人、承接人、推荐人、业务员
UserId int64 `cname:"用户ID" json:"userId" valid:"Required"`
// 用户基础数据id
UserBaseId int64 `canme:"用户基础数据ID" json:"userBaseId" valid:"Required"`
UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId" valid:"Required"`
}
func (getDividendsOrderQuery *GetDividendsOrderQuery) Valid(validation *validation.Validation) {
... ...
... ... @@ -447,7 +447,10 @@ func (repository *DividendsOrderRepository) FindOne(queryOptions map[string]inte
tx := repository.transactionContext.PgTx
dividendsOrderModel := new(models.DividendsOrder)
query := sqlbuilder.BuildQuery(tx.Model(dividendsOrderModel), queryOptions)
query.SetWhereByQueryOption("dividends_order.dividends_order_id = ?", "dividendsOrderId")
//query.SetWhereByQueryOption("dividends_order.dividends_order_id = ?", "dividendsOrderId")
if dividendsOrderId, ok := queryOptions["dividendsOrderId"]; ok && dividendsOrderId.(int64) != 0 {
query.Where("dividends_order.dividends_order_id = ?", dividendsOrderId)
}
if dividendsOrderNumber, ok := queryOptions["dividendsOrderNumber"]; ok && dividendsOrderNumber != "" {
query.Where("dividends_order.dividends_order_number = ?", dividendsOrderNumber)
}
... ...