Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
58cbb11d
Commit
58cbb11d
authored
Aug 01, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 渠道
parent
201c6aff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
icp-deliver/app/base/controller/impl/delivery/materialCtl.js
+2
-2
icp-deliver/app/base/service/impl/delivery/deliverSve.js
+4
-4
No files found.
icp-deliver/app/base/controller/impl/delivery/materialCtl.js
View file @
58cbb11d
...
@@ -16,13 +16,13 @@ class MaterialCtl extends CtlBase {
...
@@ -16,13 +16,13 @@ class MaterialCtl extends CtlBase {
},
[
},
[
{
{
model
:
this
.
db
.
models
.
deliver
,
model
:
this
.
db
.
models
.
deliver
,
attributes
:
[
"product_code"
,
"source_name"
],
attributes
:
[
"product_code"
,
"source_name"
,
"source_number"
],
}
}
]);
]);
// 组装数据
// 组装数据
return
system
.
getResult
(
rs
.
map
(
item
=>
{
return
system
.
getResult
(
rs
.
map
(
item
=>
{
const
type
=
item
.
deliver
.
product_code
;
const
type
=
item
.
deliver
.
product_code
;
const
channel
=
item
.
deliver
.
source_n
ame
;
const
channel
=
item
.
deliver
.
source_n
umber
;
const
{
proposerInfo
,
otherMaterialsInfo
,
implementationPlanInfo
,
safetyInfo
,
shareholderData
}
=
item
;
const
{
proposerInfo
,
otherMaterialsInfo
,
implementationPlanInfo
,
safetyInfo
,
shareholderData
}
=
item
;
const
{
businessLicense
,
businessInformation
,
principalInfo
,
contactInfo
}
=
proposerInfo
;
const
{
businessLicense
,
businessInformation
,
principalInfo
,
contactInfo
}
=
proposerInfo
;
const
{
webApp
,
targetUser
,
profitableWay
,
specialApproval
,
serviceProjectEdi
,
serviceProjectIcp
}
=
implementationPlanInfo
;
const
{
webApp
,
targetUser
,
profitableWay
,
specialApproval
,
serviceProjectEdi
,
serviceProjectIcp
}
=
implementationPlanInfo
;
...
...
icp-deliver/app/base/service/impl/delivery/deliverSve.js
View file @
58cbb11d
...
@@ -60,7 +60,7 @@ class DeliverService extends ServiceBase {
...
@@ -60,7 +60,7 @@ class DeliverService extends ServiceBase {
await
this
.
cacheinfoDao
.
createOrUpdate
(
pobj
,
t
);
await
this
.
cacheinfoDao
.
createOrUpdate
(
pobj
,
t
);
await
this
.
materialDao
.
createOrUpdate
(
pobj
,
t
);
await
this
.
materialDao
.
createOrUpdate
(
pobj
,
t
);
if
(
deliverData
.
source_n
ame
===
"tencentCloud"
)
{
if
(
deliverData
.
source_n
umber
===
"tencentCloud"
)
{
if
(
deliverData
.
delivery_status
===
system
.
SERVERSESTATUS
.
COLLECTING
)
{
if
(
deliverData
.
delivery_status
===
system
.
SERVERSESTATUS
.
COLLECTING
)
{
await
this
.
dao
.
updateByWhere
({
await
this
.
dao
.
updateByWhere
({
delivery_status
:
system
.
SERVERSESTATUS
.
SUBMITING
delivery_status
:
system
.
SERVERSESTATUS
.
SUBMITING
...
@@ -77,7 +77,7 @@ class DeliverService extends ServiceBase {
...
@@ -77,7 +77,7 @@ class DeliverService extends ServiceBase {
}
}
}
}
if
(
deliverData
.
source_n
ame
===
"aliCloud"
)
{
if
(
deliverData
.
source_n
umber
===
"aliCloud"
)
{
if
([
system
.
SERVERSESTATUS
.
COLLECTING
,
system
.
SERVERSESTATUS
.
USERCONFIRMATIONREJECT
].
includes
(
deliverData
.
delivery_status
))
{
if
([
system
.
SERVERSESTATUS
.
COLLECTING
,
system
.
SERVERSESTATUS
.
USERCONFIRMATIONREJECT
].
includes
(
deliverData
.
delivery_status
))
{
await
this
.
dao
.
updateByWhere
({
await
this
.
dao
.
updateByWhere
({
delivery_status
:
system
.
SERVERSESTATUS
.
USERCONFIRMATIONWAIT
delivery_status
:
system
.
SERVERSESTATUS
.
USERCONFIRMATIONWAIT
...
@@ -378,7 +378,7 @@ class DeliverService extends ServiceBase {
...
@@ -378,7 +378,7 @@ class DeliverService extends ServiceBase {
throw
new
Error
(
"交付单不可查看"
);
throw
new
Error
(
"交付单不可查看"
);
}
}
if
(
result
.
source_n
ame
===
"tencentCloud"
)
{
if
(
result
.
source_n
umber
===
"tencentCloud"
)
{
if
(
!
result
.
qualification
)
{
if
(
!
result
.
qualification
)
{
throw
new
Error
(
"请先上传资质信息"
);
throw
new
Error
(
"请先上传资质信息"
);
}
}
...
@@ -406,7 +406,7 @@ class DeliverService extends ServiceBase {
...
@@ -406,7 +406,7 @@ class DeliverService extends ServiceBase {
id
:
material
.
id
id
:
material
.
id
},
t
);
},
t
);
if
(
result
.
source_n
ame
===
"tencentCloud"
)
{
if
(
result
.
source_n
umber
===
"tencentCloud"
)
{
await
this
.
dao
.
updateByWhere
({
await
this
.
dao
.
updateByWhere
({
delivery_status
:
system
.
SERVERSESTATUS
.
POSTING
,
delivery_status
:
system
.
SERVERSESTATUS
.
POSTING
,
},
{
},
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment