切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
yangfu
3 years ago
提交
43dc5a27eee3c8334ebb186e94616e92bb416640
2 个父辈
fdf59e26
32ddaff3
Merge branch 'dev' of
http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway
into dev
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
15 行增加
和
10 行删除
pkg/application/background/dictionary/command/update_dictionary.go
pkg/application/web/dividendsEstimate/dto/dto.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/module_dividends_order.go
pkg/port/beego/controllers/backgroud_client/dictionary_controller.go
pkg/port/beego/controllers/web_client/excel_data_controller.go
pkg/application/background/dictionary/command/update_dictionary.go
查看文件 @
43dc5a2
...
...
@@ -7,6 +7,10 @@ import (
type
UpdateDictionaryCommand
struct
{
//操作人
Operator
domain
.
Operator
`json:"-"`
allied_creation_basic
.
ReqDictionaryUpdate
Operator
domain
.
Operator
`json:"-"`
DictionaryId
int64
`json:"-"`
// 字典编号 主键
DictCode
string
`json:"dictCode"`
// 字典编码
DictName
string
`json:"dictName"`
// 字典名称
Describe
string
`json:"describe"`
// 备注信息
DictItems
[]
allied_creation_basic
.
DictionaryItem
`json:"dictItems"`
// 字典值列表
}
...
...
pkg/application/web/dividendsEstimate/dto/dto.go
查看文件 @
43dc5a2
...
...
@@ -27,10 +27,11 @@ func ToDividendsEstimateDividendItem(param *allied_creation_cooperation.DataDivi
CustomerName
:
v
.
CustomerName
,
DividendsIncentivesAmount
:
v
.
OrderAmount
,
OrderOrReturnedOrderNum
:
v
.
OrderNumber
,
OrderTime
:
v
.
OrderDate
.
UnixNano
()
/
1e6
,
OriginalOrderNum
:
v
.
OriginalOrderNum
,
RegionName
:
v
.
RegionName
,
OriginalOrderNum
:
v
.
OriginalOrderNum
,
RegionName
:
v
.
RegionName
,
}
item
.
OrderTime
=
v
.
OrderDate
.
UnixNano
()
/
1e6
listdata
=
append
(
listdata
,
item
)
}
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/module_dividends_order.go
查看文件 @
43dc5a2
...
...
@@ -44,7 +44,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderAdd(param ReqDivid
// DividendsOrderUpdate 更新分红订单
func
(
gateway
HttplibAlliedCreationCooperation
)
DividendsOrderUpdate
(
param
ReqDividendsOrderUpdate
)
(
*
DataDividendsOrderUpdate
,
error
)
{
param
.
SalesmanUid
=
"1"
//TODO 调试用删除
url
:=
gateway
.
baseUrL
+
"/dividends-orders/"
+
strconv
.
Itoa
(
param
.
DividendsOrderId
)
method
:=
"PUT"
req
:=
gateway
.
CreateRequest
(
url
,
method
)
...
...
pkg/port/beego/controllers/backgroud_client/dictionary_controller.go
查看文件 @
43dc5a2
...
...
@@ -31,7 +31,7 @@ func (controller *DictionaryController) UpdateDictionary() {
if
err
!=
nil
{
log
.
Logger
.
Debug
(
"json err:"
+
err
.
Error
())
}
dictionaryId
,
_
:=
controller
.
GetInt64
(
":
:
dictionaryId"
)
dictionaryId
,
_
:=
controller
.
GetInt64
(
":dictionaryId"
)
updateCommand
.
Operator
=
controller
.
GetOperator
()
updateCommand
.
DictionaryId
=
dictionaryId
data
,
err
:=
dictionaryService
.
UpdateDictionay
(
updateCommand
)
...
...
@@ -54,7 +54,7 @@ func (controller *DictionaryController) GetDictionary() {
dictionaryService
:=
service
.
NewDictionayService
(
nil
)
getQuery
:=
&
query
.
GetDictionaryQuery
{}
dictionaryId
,
_
:=
controller
.
GetInt64
(
":
:
dictionaryId"
)
dictionaryId
,
_
:=
controller
.
GetInt64
(
":dictionaryId"
)
getQuery
.
DictionaryId
=
int
(
dictionaryId
)
getQuery
.
Operator
=
controller
.
GetOperator
()
data
,
err
:=
dictionaryService
.
GetDictionay
(
getQuery
)
...
...
pkg/port/beego/controllers/web_client/excel_data_controller.go
查看文件 @
43dc5a2
...
...
@@ -135,7 +135,7 @@ func (controller ExcelDataController) ImportDividendsOrder() {
for
_
,
v
:=
range
excelData
{
if
allEmpty
:=
controller
.
fieldValueAllEmpty
(
v
);
allEmpty
{
//以全字段空跳过
continue
break
}
//TODO 按需转化
item
:=
allied_creation_cooperation
.
ImportDividendsOrderData
{
...
...
@@ -200,7 +200,7 @@ func (controller ExcelDataController) ImportDividendsReturnedOrder() {
for
_
,
v
:=
range
excelData
{
if
allEmpty
:=
controller
.
fieldValueAllEmpty
(
v
);
allEmpty
{
//以全字段空跳过
continue
break
}
//TODO 按需转化
item
:=
allied_creation_cooperation
.
ImportDividendsReturnedOrderData
{
...
...
请
注册
或
登录
后发表评论