切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
yangfu
3 years ago
提交
14c9c4f5b8cf04c68ad0684a750a718a1957298f
2 个父辈
44bbc73b
cfb4076d
Merge branch 'dev' of
http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway
into dev
隐藏空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
15 行增加
和
8 行删除
pkg/application/mobile/cooperation/command/cp_list_cooperation_project.go
pkg/application/mobile/cooperation/service/cooperation_projects.go
pkg/application/web/dividendsOrder/service/dividends_order.go
pkg/application/web/dividendsReturnedOrder/command/update_dividends_returned_order.go
pkg/application/web/dividendsReturnedOrder/service/dividends_returned_order.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_project.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_dividends_returned_order.go
pkg/application/mobile/cooperation/command/cp_list_cooperation_project.go
查看文件 @
14c9c4f
...
...
@@ -48,5 +48,6 @@ type PersonSearchCooperationProjectQuery struct {
// 查询限制
PageSize
int
`json:"pageSize" valid:"Required"`
//
OrgId
int64
`json:"orgId"`
OrgId
int64
`json:"orgId"`
Keyword
string
`json:"keyword"`
}
...
...
pkg/application/mobile/cooperation/service/cooperation_projects.go
查看文件 @
14c9c4f
...
...
@@ -111,6 +111,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
PageSize
:
projectQuery
.
PageSize
,
OrgId
:
projectQuery
.
OrgId
,
Status
:
1
,
//搜索状态为“招标中”项目
Keyword
:
projectQuery
.
Keyword
,
//UserBaseId: projectQuery.Operator.UserBaseId,
})
if
err
!=
nil
{
...
...
pkg/application/web/dividendsOrder/service/dividends_order.go
查看文件 @
14c9c4f
...
...
@@ -28,8 +28,8 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
OrderGoodPrice
:
v
.
OrderGoodPrice
,
OrderGoodQuantity
:
v
.
OrderGoodQuantity
,
}
orderGoodAmount
:=
v
.
OrderGoodPrice
*
float64
(
v
.
OrderGoodQuantity
)
-
v
.
OrderGoodExpense
good
.
OrderGoodAmount
=
orderGoodAmount
// orderGoodAmount := v.OrderGoodPrice*float64(v.OrderGoodQuantity) - v.OrderGoodExpense
// good.OrderGoodAmount = orderGoodAmount
orderGoods
=
append
(
orderGoods
,
good
)
}
creationCooperationGateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
createDividendsOrderCommand
.
Operator
)
...
...
@@ -114,8 +114,8 @@ func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateD
OrderGoodPrice
:
v
.
OrderGoodPrice
,
OrderGoodQuantity
:
v
.
OrderGoodQuantity
,
}
orderGoodAmount
:=
v
.
OrderGoodPrice
*
float64
(
v
.
OrderGoodQuantity
)
-
v
.
OrderGoodExpense
good
.
OrderGoodAmount
=
orderGoodAmount
// orderGoodAmount := v.OrderGoodPrice*float64(v.OrderGoodQuantity) - v.OrderGoodExpense
// good.OrderGoodAmount = orderGoodAmount
orderGoods
=
append
(
orderGoods
,
good
)
}
creationCooperationGateway
:=
allied_creation_cooperation
.
NewHttplibAlliedCreationCooperation
(
updateDividendsOrderCommand
.
Operator
)
...
...
pkg/application/web/dividendsReturnedOrder/command/update_dividends_returned_order.go
查看文件 @
14c9c4f
...
...
@@ -12,7 +12,7 @@ type UpdateDividendsReturnedOrderCommand struct {
DividendsOrderNumber
string
`json:"dividendsOrderNumber"`
//分红单号
OriginalOrderNum
string
`json:"originalOrderNum"`
//源单号
OrderGoods
[]
struct
{
OrderGoodId
int
64
`json:"orderGoodId,string"`
// 订单产品id
OrderGoodId
int
`json:"orderGoodId,string"`
// 订单产品id
CooperationContractNumber
string
`json:"cooperationContractNumber"`
//关联的共创合约编号
// OrderGoodAmount float64 `json:"orderGoodAmount"` //订单产品金额
OrderGoodName
string
`json:"orderGoodName"`
//订单产品名称
...
...
pkg/application/web/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @
14c9c4f
...
...
@@ -21,13 +21,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
var
orderGooods
[]
allied_creation_cooperation
.
ReqDividendsReturnedOrderGood
for
_
,
v
:=
range
createDividendsReturnedOrderCommand
.
OrderGoods
{
good
:=
allied_creation_cooperation
.
ReqDividendsReturnedOrderGood
{
OrderGoodId
:
"0"
,
CooperationContractNumber
:
v
.
CooperationContractNumber
,
OrderGoodAmount
:
0
,
OrderGoodName
:
v
.
OrderGoodName
,
OrderGoodPrice
:
v
.
OrderGoodPrice
,
OrderGoodQuantity
:
v
.
OrderGoodQuantity
,
}
good
.
OrderGoodAmount
=
good
.
OrderGoodPrice
*
float64
(
good
.
OrderGoodQuantity
)
//
good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
orderGooods
=
append
(
orderGooods
,
good
)
}
result
,
err
:=
creationCooperationGateway
.
DividendsReturnedOrderAdd
(
allied_creation_cooperation
.
ReqDividendsReturnedOrderAdd
{
...
...
@@ -97,13 +98,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
var
orderGooods
[]
allied_creation_cooperation
.
ReqDividendsReturnedOrderGood
for
_
,
v
:=
range
updateDividendsReturnedOrderCommand
.
OrderGoods
{
good
:=
allied_creation_cooperation
.
ReqDividendsReturnedOrderGood
{
OrderGoodId
:
strconv
.
Itoa
(
v
.
OrderGoodId
),
CooperationContractNumber
:
v
.
CooperationContractNumber
,
OrderGoodAmount
:
0
,
OrderGoodName
:
v
.
OrderGoodName
,
OrderGoodPrice
:
v
.
OrderGoodPrice
,
OrderGoodQuantity
:
v
.
OrderGoodQuantity
,
}
good
.
OrderGoodAmount
=
good
.
OrderGoodPrice
*
float64
(
good
.
OrderGoodQuantity
)
//
good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
orderGooods
=
append
(
orderGooods
,
good
)
}
_
,
err
:=
creationCooperationGateway
.
DividendsReturnedOrderUpdate
(
allied_creation_cooperation
.
ReqDividendsReturnedOrderUpdate
{
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_project.go
查看文件 @
14c9c4f
...
...
@@ -156,6 +156,8 @@ type (
CooperationProjectName
string
`json:"cooperationProjectName"`
// 共创项目状态,1招标中,2结束 0 全部
Status
int
`json:"status"`
// 关键字搜索
Keyword
string
`cname:"关键字" json:"keyword"`
// 组织机构ID
OrgId
int64
`cname:"组织机构ID" json:"orgId"`
OrgIds
[]
int64
`json:"orgIds"`
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_dividends_returned_order.go
查看文件 @
14c9c4f
...
...
@@ -50,6 +50,7 @@ type (
//
ReqDividendsReturnedOrderGood
struct
{
OrderGoodId
string
`json:"orderGoodId"`
CooperationContractNumber
string
`json:"cooperationContractNumber"`
//关联的共创合约编号
OrderGoodAmount
float64
`json:"orderGoodAmount"`
//订单产品金额
OrderGoodName
string
`json:"orderGoodName"`
//订单产品名称
...
...
请
注册
或
登录
后发表评论