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
cb90f682
Commit
cb90f682
authored
Oct 20, 2020
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
阿里直购创建需求方案
parent
4a145b04
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
32 deletions
+43
-32
center-order/app/base/service/impl/dbneed/needsolutionSve.js
+43
-32
No files found.
center-order/app/base/service/impl/dbneed/needsolutionSve.js
View file @
cb90f682
...
...
@@ -118,7 +118,7 @@ class NeedsolutionService extends ServiceBase {
needObj
=
{
id
:
needinfo
.
id
,
followManUserId
:
user
.
id
,
//跟进人id
followManName
:
user
.
channel_username
,
//跟进人姓名
followManName
:
user
.
channel_username
,
//跟进人姓名
followManMobile
:
user
.
mobile
,
//跟进人手机号(合伙人)
followManOnlyCode
:
user
.
channel_userid
};
...
...
@@ -485,37 +485,48 @@ class NeedsolutionService extends ServiceBase {
if
(
!
app
||
!
app
.
uapp_id
)
{
return
system
.
getResultFail
(
-
100
,
"未知渠道"
);
}
if
(
!
ab
.
channelSolutionNo
)
{
return
system
.
getResultFail
(
-
101
,
"渠道方案编号不能为空"
);
}
// if(!ab.status){
// return system.getResultFail(-102,"状态不能为空");
// }
var
needsolutioninfo
=
await
this
.
dao
.
model
.
findOne
({
attributes
:[
"id"
,
"solutionContent"
,
"status"
,
"orderNo"
],
where
:
{
channelSolutionNo
:
ab
.
channelSolutionNo
,
isInvalid
:
0
},
raw
:
true
});
if
(
!
needsolutioninfo
||
!
needsolutioninfo
.
id
)
{
return
system
.
getResultFail
(
-
400
,
"未知方案"
);
}
var
solutionContent
=
needsolutioninfo
.
solutionContent
;
if
(
ab
.
orderPrice
)
{
// solutionContent = JSON.parse(solutionContent);
solutionContent
[
"totalSum"
]
=
Number
(
ab
.
orderPrice
||
"0"
);
}
// 2020 1017 lin 新增去掉status的判断,生成订单这个方案才算完成,所以没必要再判断,另一个原因网文2.3每个状态都有不同status,所以不能以来有没有status来决定方案完成情况。
// if (ab.status) {
// needsolutioninfo.status = "ywc";
// }
if
(
ab
.
orderNo
)
{
needsolutioninfo
.
orderNo
=
ab
.
orderNo
;
needsolutioninfo
.
status
=
"ywc"
;
var
ns
if
(
ab
.
isDirectBuy
){
//直购先创建空方案
var
solutionNo
=
await
this
.
getBusUid
(
"ns"
);
ns
=
await
this
.
create
({
solutionNo
,
...
ab
,
status
:
"ywc"
,
solutionContent
:
JSON
.
stringify
({
totalSum
:
Number
(
ab
.
orderPrice
||
"0"
)})
})
}
else
{
if
(
!
ab
.
channelSolutionNo
)
{
return
system
.
getResultFail
(
-
101
,
"渠道方案编号不能为空"
);
}
// if(!ab.status){
// return system.getResultFail(-102,"状态不能为空");
// }
var
needsolutioninfo
=
await
this
.
dao
.
model
.
findOne
({
attributes
:
[
"id"
,
"solutionContent"
,
"status"
,
"orderNo"
],
where
:
{
channelSolutionNo
:
ab
.
channelSolutionNo
,
isInvalid
:
0
},
raw
:
true
});
if
(
!
needsolutioninfo
||
!
needsolutioninfo
.
id
)
{
return
system
.
getResultFail
(
-
400
,
"未知方案"
);
}
var
solutionContent
=
needsolutioninfo
.
solutionContent
;
if
(
ab
.
orderPrice
)
{
// solutionContent = JSON.parse(solutionContent);
solutionContent
[
"totalSum"
]
=
Number
(
ab
.
orderPrice
||
"0"
);
}
// 2020 1017 lin 新增去掉status的判断,生成订单这个方案才算完成,所以没必要再判断,另一个原因网文2.3每个状态都有不同status,所以不能以来有没有status来决定方案完成情况。
// if (ab.status) {
// needsolutioninfo.status = "ywc";
// }
if
(
ab
.
orderNo
)
{
needsolutioninfo
.
orderNo
=
ab
.
orderNo
;
needsolutioninfo
.
status
=
"ywc"
;
}
needsolutioninfo
.
solutionContent
=
JSON
.
stringify
(
solutionContent
);
await
this
.
dao
.
update
(
needsolutioninfo
);
ns
=
await
this
.
dao
.
model
.
findOne
({
where
:
{
id
:
needsolutioninfo
.
id
},
raw
:
true
});
}
needsolutioninfo
.
solutionContent
=
JSON
.
stringify
(
solutionContent
);
await
this
.
dao
.
update
(
needsolutioninfo
);
var
ns
=
await
this
.
dao
.
model
.
findOne
({
where
:
{
id
:
needsolutioninfo
.
id
},
raw
:
true
});
return
system
.
getResultSuccess
(
ns
);
}
...
...
@@ -688,7 +699,7 @@ class NeedsolutionService extends ServiceBase {
needObj
=
{
id
:
needinfo
.
id
,
followManUserId
:
user
.
id
,
//跟进人id
followManName
:
user
.
channel_username
,
//跟进人姓名
followManName
:
user
.
channel_username
,
//跟进人姓名
followManMobile
:
user
.
mobile
,
//跟进人手机号(合伙人)
followManOnlyCode
:
user
.
channel_userid
};
...
...
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