allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 3c6b1bfa84ad8c806e65a8c6350dd54a662c567b 2 个父辈 54160d27 c721a49f

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

内嵌 并排对比
正在显示 20 个修改的文件 包含 95 行增加 和 77 行删除
... ... @@ -2,6 +2,7 @@ package command
import (
"fmt"
"github.com/beego/beego/v2/core/validation"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
)
... ... @@ -14,8 +15,8 @@ type CreditAccountPayCommand struct {
// 账期结算实付金额
ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"`
// 备注
Remarks string `cname:"备注" json:"remark"`
Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件
Remarks string `cname:"备注" json:"remark"`
Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
}
func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) {
... ...
... ... @@ -29,37 +29,26 @@ type CreateCooperationContractCommand struct {
} `json:"cooperationContract"`
// 业绩分红激励规则列表
DividendsIncentivesRules []struct {
// 关联的项目合约编号
CooperationContractNumber string `json:"cooperationContractNumber"`
// 推荐人抽成比例
ReferrerPercentage float64 `json:"referrerPercentage"`
// 业务员抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"`
// 分红规则激励百分点
DividendsPercentage float64 `json:"dividendsPercentage"`
// 分红规则激励阶段，
DividendsStage int `json:"dividendsStage"`
// 分红规则激励阶段结束
DividendsStageEnd int `json:"dividendsStageEnd"`
// 分红规则激励阶段开始
DividendsStageStart int `json:"dividendsStageStart"`
} `json:"dividendsIncentivesRules"`
// 金额激励规则列表
CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的项目合约编号
ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
DividendsPercentage float64 `json:"dividendsPercentage"` // 分红规则激励百分点
DividendsStage int `json:"dividendsStage"` // 分红规则激励阶段，
DividendsStageEnd int `json:"dividendsStageEnd"` // 分红规则激励阶段结束
DividendsStageStart int `json:"dividendsStageStart"` // 分红规则激励阶段开始
Remarks string `json:"remarks"`
} `json:"dividendsIncentivesRules"` // 金额激励规则列表
MoneyIncentivesRules []struct {
// 金额激励规则ID
MoneyIncentivesRuleId int64 `json:"moneyIncentivesRuleId,string,"`
// 关联的共创合约编号
CooperationContractNumber string `json:"cooperationContractNumber"`
// 激励金额
MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"`
// 金额激励阶段
MoneyIncentivesStage int `json:"moneyIncentivesStage"`
// 金额激励规则时间
MoneyIncentivesTime int `json:"moneyIncentivesTime"`
// 推荐人抽成比例
ReferrerPercentage float64 `json:"referrerPercentage"`
// 业务员抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"`
// MoneyIncentivesRuleId int64 `json:"moneyIncentivesRuleId,string,"`
CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的共创合约编号
MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"` // 激励金额
MoneyIncentivesStage int `json:"moneyIncentivesStage"` // 金额激励阶段
MoneyIncentivesTime int `json:"moneyIncentivesTime"` // 金额激励规则时间
ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
Remarks string `json:"remarks"`
} `json:"moneyIncentivesRules"`
// 承接方列表
Undertakers []struct {
... ... @@ -70,7 +59,7 @@ type CreateCooperationContractCommand struct {
Attachment []domain.Attachment `json:"attachment"`
} `json:"undertakers"`
//关联业务员
RelevantIds []string `json:"relevantIds"`
RelationUser []string `json:"relationUser"`
}
func (createCooperationContractCommand *CreateCooperationContractCommand) Valid(validation *validation.Validation) {
... ...
... ... @@ -45,7 +45,8 @@ type UpdateCooperationContractCommand struct {
// 分红规则激励阶段结束
DividendsStageEnd int `json:"dividendsStageEnd"`
// 分红规则激励阶段开始
DividendsStageStart int `json:"dividendsStageStart"`
DividendsStageStart int `json:"dividendsStageStart"`
Remarks string `json:"remarks"`
} `json:"dividendsIncentivesRules"`
// 金额激励规则列表
MoneyIncentivesRules []struct {
... ... @@ -63,6 +64,7 @@ type UpdateCooperationContractCommand struct {
ReferrerPercentage float64 `json:"referrerPercentage"`
// 业务员抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"`
Remarks string `json:"remarks"`
} `json:"moneyIncentivesRules"`
// 承接方列表
Undertakers []struct {
... ... @@ -73,7 +75,7 @@ type UpdateCooperationContractCommand struct {
Attachment []domain.Attachment `json:"attachment"`
} `json:"undertakers"`
//关联业务员
RelevantIds []string `json:"relevantIds"`
RelationUser []string `json:"relationUser"`
}
func (updateCooperationContractCommand *UpdateCooperationContractCommand) Valid(validation *validation.Validation) {
... ...
... ... @@ -65,6 +65,7 @@ type MoneyIncentivesRule struct {
MoneyIncentivesTime int64 `json:"moneyIncentivesTime"` // 金额激励规则时间
ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
Remarks string `json:"remarks"`
}
type DividendsIncentivesRule struct {
... ... @@ -76,10 +77,11 @@ type DividendsIncentivesRule struct {
DividendsStage int `json:"dividendsStage"` // 分红规则激励阶段，
DividendsStageEnd int64 `json:"dividendsStageEnd"` // 分红规则激励阶段结束
DividendsStageStart int64 `json:"dividendsStageStart"` // 分红规则激励阶段开始
Remarks string `json:"remarks"`
}
type Relevant struct {
UserId int `json:"userId"`
UserId int `json:"userId,string"`
UserInfo domain.UserInfo `json:"userInfo"`
Department domain.Department `json:"department"`
}
... ... @@ -120,9 +122,10 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
r := Relevant{
UserId: int(v.UserId),
UserInfo: domain.UserInfo{
UsersName: v.UserInfo.UsersName,
UsersId: v.UserInfo.UsersId,
UsersName: v.UserInfo.UserName,
UsersId: int(v.UserId),
UserCode: v.UserInfo.UserCode,
Phone: v.UserInfo.UserPhone,
},
Department: domain.Department{
DepartmentNumber: v.Department.DepartmentNumber,
... ... @@ -142,6 +145,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
DividendsStage: v.DividendsIncentivesStage,
DividendsStageEnd: v.DividendsIncentivesStageEnd.UnixNano() / 1e6,
DividendsStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6,
Remarks: v.Remarks,
}
dividendsIncentivesRules = append(dividendsIncentivesRules, r)
}
... ... @@ -155,6 +159,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
MoneyIncentivesTime: v.MoneyIncentivesTime.UnixNano() / 1e6,
ReferrerPercentage: v.ReferrerPercentage,
SalesmanPercentage: v.SalesmanPercentage,
Remarks: v.Remarks,
}
moneyIncentivesRules = append(moneyIncentivesRules, r)
}
... ...
... ... @@ -11,7 +11,7 @@ type GetCooperationContractQuery struct {
//操作人
Operator domain.Operator `json:"-"`
// 共创合约ID
CooperationContractId int `json:"cooperationContractId,string" valid:"Required"`
CooperationContractId int `json:"cooperationContractId,string"`
}
func (getCooperationContractQuery *GetCooperationContractQuery) Valid(validation *validation.Validation) {
... ...
... ... @@ -30,6 +30,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
DividendsIncentivesStage: v.DividendsStage,
DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsStageEnd/1e3), 0),
DividendsIncentivesStageStart: time.Unix(int64(v.DividendsStageStart/1e3), 0),
Remarks: v.Remarks,
}
rules1 = append(rules1, r)
}
... ... @@ -43,6 +44,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime/1e3), 0),
ReferrerPercentage: v.ReferrerPercentage,
SalesmanPercentage: v.SalesmanPercentage,
Remarks: v.Remarks,
}
rules2 = append(rules2, r)
}
... ... @@ -61,7 +63,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
MoneyIncentivesRules: rules2,
DividendsIncentivesRules: rules1,
Undertakers: underTakers,
RelevantIds: createCooperationContractCommand.RelevantIds,
RelevantIds: createCooperationContractCommand.RelationUser,
CooperationContractDescription: createCooperationContractCommand.CooperationContract.CooperationContractDescription,
CooperationProjectNumber: createCooperationContractCommand.CooperationContract.CooperationProjectNumber,
DepartmentId: createCooperationContractCommand.CooperationContract.DepartmentId,
... ... @@ -181,13 +183,13 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
underTakers = append(underTakers, u)
}
result, err := creationCooperationGateway.CooperationContractUpdate(allied_creation_cooperation.ReqCooperationContractUpdate{
CooperationContractId: updateCooperationContractCommand.CooperationContract.CooperationContractId,
MoneyIncentivesRules: rules2,
DividendsIncentivesRules: rules1,
Undertakers: underTakers,
RelevantIds: updateCooperationContractCommand.RelevantIds,
CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,
CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber,
CooperationContractId: updateCooperationContractCommand.CooperationContract.CooperationContractId,
MoneyIncentivesRules: rules2,
DividendsIncentivesRules: rules1,
Undertakers: underTakers,
RelevantIds: updateCooperationContractCommand.RelationUser,
CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,
// CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber,
CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber,
DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId,
CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType,
... ...
... ... @@ -84,6 +84,8 @@ type CooperationApplicationItem struct {
Org domain.Org `json:"org"`
UserBaseID int `json:"userBaseId,string"`
UserID int `json:"userId,string"`
UserName string `json:"userName"`
UserCode string `json:"userCode"`
UserInfo domain.UserInfo `json:"userInfo"`
UserType int `json:"userType"`
} `json:"cooperationApplicationApplicant"` //申请人
... ... @@ -113,6 +115,8 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation
data.CooperationApplicationApplicant.Org.OrgID = param.Org.OrgID
data.CooperationApplicationApplicant.Org.OrgName = param.Org.OrgName
data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID
data.CooperationApplicationApplicant.UserName = param.CooperationApplicationApplicant.UserInfo.UserName
data.CooperationApplicationApplicant.UserCode = param.CooperationApplicationApplicant.UserInfo.UserCode
//data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant.
data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone
data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName
... ...
... ... @@ -3,9 +3,9 @@ package command
import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
type PayCreditAccountCommand struct {
Operator domain.Operator `json:"-"` //操作人
CreditAccountId int `json:"creditAccountId,string"` //账期结算id
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额
Remarks string `json:"remarks"` //备注
Attachment domain.Attachment `json:"attachment"` //附件
Operator domain.Operator `json:"-"` //操作人
CreditAccountId int `json:"creditAccountId,string"` //账期结算id
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额
Remarks string `json:"remarks"` //备注
Attachment []domain.Attachment `json:"attachment"` //附件
}
... ...
... ... @@ -8,7 +8,8 @@ type GetDividendsOrderQuery struct {
//操作人
Operator domain.Operator `json:"-"`
// 分红订单ID
DividendsOrderId int `json:"dividendsOrderId,string" valid:"Required"`
DividendsOrderId int `json:"dividendsOrderId,string" valid:"Required"`
DividendsOrderNumber string `json:"dividendsOrderNumber"`
}
// func (getDividendsOrderQuery *GetDividendsOrderQuery) Valid(validation *validation.Validation) {
... ...
... ... @@ -55,12 +55,10 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
// 返回分红订单实体对象
func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividendsOrderQuery *query.GetDividendsOrderQuery) (interface{}, error) {
// if err := getDividendsOrderQuery.ValidateQuery(); err != nil {
// return nil, application.ThrowError(application.ARG_ERROR, err.Error())
// }
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getDividendsOrderQuery.Operator)
result, err := creationCooperationGateway.DividendsOrderGet(allied_creation_cooperation.ReqDividendsOrderGet{
DividendsOrderId: getDividendsOrderQuery.DividendsOrderId,
DividendsOrderId: getDividendsOrderQuery.DividendsOrderId,
DividendsOrderNumber: getDividendsOrderQuery.DividendsOrderNumber,
})
if err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ...
... ... @@ -19,7 +19,7 @@ type CreateDividendsReturnedOrderCommand struct {
OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量
} `json:"orderGoods"` //货品
DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
OrderDate int64 `json:"orderDate"` //订单日期
OrderTime int64 `json:"orderTime"` //订单日期
Remarks string `json:"remarks"` //
RegionName string `json:"regionName"`
}
... ...
... ... @@ -20,7 +20,7 @@ type UpdateDividendsReturnedOrderCommand struct {
OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量
} `json:"orderGoods"` //货品
DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
OrderDate int64 `json:"orderDate"` //订单日期
OrderTime int64 `json:"orderTime"` //订单日期
Remarks string `json:"remarks"` //
RegionName string `json:"regionName"`
... ...
... ... @@ -19,7 +19,7 @@ type DividendsReturnedOrderService struct {
func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) {
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator)
dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate/1e3, 0)
orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderTime/1e3, 0)
var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood
for _, v := range createDividendsReturnedOrderCommand.OrderGoods {
good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{
... ... @@ -38,7 +38,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
OriginalOrderNum: createDividendsReturnedOrderCommand.OriginalOrderNum,
OrderGoods: orderGooods,
DividendsReturnedDate: dividendsReturnedDate,
OrderData: orderDate,
OrderTime: orderDate,
OrgId: int(createDividendsReturnedOrderCommand.Operator.OrgId),
Remarks: createDividendsReturnedOrderCommand.Remarks,
RegionName: createDividendsReturnedOrderCommand.RegionName,
... ... @@ -97,7 +97,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) {
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator)
dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate/1e3, 0)
orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderTime/1e3, 0)
var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood
for _, v := range updateDividendsReturnedOrderCommand.OrderGoods {
good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{
... ... @@ -107,7 +107,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
OrderGoodPrice: v.OrderGoodPrice,
OrderGoodQuantity: v.OrderGoodQuantity,
}
good.OrderGoodPrice = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
orderGooods = append(orderGooods, good)
}
_, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{
... ... @@ -117,7 +117,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
OriginalOrderNum: updateDividendsReturnedOrderCommand.OriginalOrderNum,
OrderGoods: orderGooods,
DividendsReturnedDate: dividendsReturnedDate,
OrderData: orderDate,
OrderTime: orderDate,
OrgId: int(updateDividendsReturnedOrderCommand.Operator.OrgId),
Remarks: updateDividendsReturnedOrderCommand.Remarks,
RegionName: updateDividendsReturnedOrderCommand.RegionName,
... ...
... ... @@ -203,6 +203,9 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderGet(param ReqDivid
url := gateway.baseUrL + "/dividends-orders/" + strconv.Itoa(param.DividendsOrderId)
method := "GET"
req := gateway.CreateRequest(url, method)
if len(param.DividendsOrderNumber) > 0 {
req.Param("dividendsOrderNumber", param.DividendsOrderNumber)
}
log.Logger.Debug("向业务模块请求数据：返回分红订单详情。", map[string]interface{}{
"api": method + ":" + url,
"param": param,
... ...
... ... @@ -113,7 +113,14 @@ type CooperationContract struct {
OrgId int64 `json:"orgId,string,"` // 组织机构ID
OrgName string `json:"orgName"` // 组织名称
} `json:"org"`
UserInfo domain.UserInfo `json:"userInfo"`
UserInfo struct {
UserAvatar string `json:"userAvatar"`
UserEmail string `json:"userEmail"`
UserName string `json:"userName"`
UserPhone string `json:"userPhone"`
UserAccount string `json:"userAccount"`
UserCode string `json:"userCode"`
} `json:"userInfo"`
Department struct {
DepartmentId int64 `json:"departmentId,string,"` // 部门ID
DepartmentName string `json:"departmentName"` // 部门名称
... ... @@ -138,6 +145,7 @@ type (
DividendsIncentivesStage int `json:"dividendsIncentivesStage"` // 分红规则激励阶段，
DividendsIncentivesStageEnd time.Time `json:"dividendsIncentivesStageEnd"` // 分红规则激励阶段结束
DividendsIncentivesStageStart time.Time `json:"dividendsIncentivesStageStart"` // 分红规则激励阶段开始
Remarks string `json:"remarks"`
}
//金额激励规则
MoneyIncentivesRule struct {
... ... @@ -148,6 +156,7 @@ type (
MoneyIncentivesTime time.Time `json:"moneyIncentivesTime"` // 金额激励规则时间
ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
Remarks string `json:"remarks"`
}
//合约承接方
... ... @@ -160,8 +169,8 @@ type (
}
ReqCooperationContractAdd struct {
CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述
CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述
// CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号，
DepartmentId string `json:"departmentId"` // 共创合约发起部门id
CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象，1员工，2共创用户，3公开
... ... @@ -186,9 +195,9 @@ type (
//更新共创合约
type (
ReqCooperationContractUpdate struct {
CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id
CooperationContractDescription string `json:"cooperationContractDescription"` //共创
CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id
CooperationContractDescription string `json:"cooperationContractDescription"` //共创
// CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号，
DepartmentId string `json:"departmentId"` // 共创合约发起部门id
CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象，1员工，2共创用户，3公开
... ...
... ... @@ -144,7 +144,7 @@ type (
CooperationModeIds []string `json:"cooperationModeIds"`
}
DataCooperationModeBatchRemove struct {
DataCooperationModeBatchRemove []struct {
}
)
... ...
... ... @@ -53,10 +53,10 @@ type CreditAccount struct {
//支付账期结算
type (
ReqCreditAccountsPay struct {
CreditAccountId int `json:"creditAccountId,string"`
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额
Remarks string `json:"remarks"`
Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件
CreditAccountId int `json:"creditAccountId,string"`
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额
Remarks string `json:"remarks"`
Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
}
DataCreditAccountsPay struct {
... ...
... ... @@ -172,7 +172,8 @@ type (
//返回分红订单详情
type (
ReqDividendsOrderGet struct {
DividendsOrderId int `json:"dividendsOrderId"`
DividendsOrderId int `json:"dividendsOrderId"`
DividendsOrderNumber string `json:"dividendsOrderNumber"`
}
DataDividendsOrderGet struct {
... ...
... ... @@ -11,6 +11,7 @@ type (
OrderGoodName string `json:"orderGoodName"` //订单产品名称
OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量
OrderGoodDividendsStatus int `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
}
DividendsReturnedOrder struct {
... ... @@ -61,7 +62,7 @@ type (
OriginalOrderNum string `json:"originalOrderNum"`
OrderGoods []ReqDividendsReturnedOrderGood `json:"orderGoods"`
DividendsReturnedDate time.Time `json:"dividendsReturnedDate"`
OrderData time.Time `json:"orderData"`
OrderTime time.Time `json:"orderTime"`
OrgId int `json:"orgId"`
Remarks string `json:"remarks"`
RegionName string `json:"regionName"`
... ... @@ -81,7 +82,7 @@ type (
OriginalOrderNum string `json:"originalOrderNum"`
OrderGoods []ReqDividendsReturnedOrderGood `json:"orderGoods"`
DividendsReturnedDate time.Time `json:"dividendsReturnedDate"`
OrderData time.Time `json:"orderData"`
OrderTime time.Time `json:"orderTime"`
OrgId int `json:"orgId"`
Remarks string `json:"remarks"`
RegionName string `json:"regionName"`
... ...
... ... @@ -60,7 +60,9 @@ func (controller *DividendsOrderController) GetDividendsOrder() {
dividendsOrderService := service.NewDividendsOrderService(nil)
getDividendsOrderQuery := &query.GetDividendsOrderQuery{}
orderId, _ := controller.GetInt(":orderId")
dividendsOrderNumber := controller.GetString("dividendsOrderNumber")
getDividendsOrderQuery.DividendsOrderId = orderId
getDividendsOrderQuery.DividendsOrderNumber = dividendsOrderNumber
getDividendsOrderQuery.Operator = controller.GetOperator()
data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery)
controller.Response(data, err)
... ...