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
3f5dd4ee
Commit
3f5dd4ee
authored
Mar 26, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
05bec39f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
center-order/app/base/service/impl/dbcorder/orderinfoSve.js
+8
-5
No files found.
center-order/app/base/service/impl/dbcorder/orderinfoSve.js
View file @
3f5dd4ee
...
...
@@ -178,9 +178,6 @@ class OrderInfoService extends ServiceBase {
if
(
!
actionBody
.
deliveryData
||
Object
.
keys
(
actionBody
.
deliveryData
).
length
==
0
)
{
return
system
.
getResult
(
null
,
"交付数据不能为空,20135"
);
}
if
(
Number
(
actionBody
.
totalSum
)
<
300
)
{
return
system
.
getResult
(
null
,
"总价有误,总价不能小于300,20140"
);
}
var
deliveryData
=
actionBody
.
deliveryData
;
if
(
!
deliveryData
.
nclones
)
{
return
system
.
getResult
(
null
,
"商品/服务项不能为空,20150"
);
...
...
@@ -272,11 +269,17 @@ class OrderInfoService extends ServiceBase {
return
system
.
getResult
(
null
,
"没有查询到附加购买项目信息,20336"
);
}
//重新计算尼斯官费
var
totalNclPublicExpense
=
0
;
for
(
let
g
=
0
;
g
<
deliveryData
.
nclones
.
length
;
g
++
)
{
const
nclThree
=
deliveryData
.
nclones
[
g
].
nclThree
;
deliveryData
.
nclones
[
g
].
nclPublicExpense
=
Number
(
deliveryData
.
nclones
[
g
].
nclPublicExpense
)
+
(
nclThree
.
length
-
10
)
*
Number
(
actionBody
.
product_info
.
price_additions_item
.
public_expense
);
var
tmpNclPublicExpense
=
Number
(
deliveryData
.
nclones
[
g
].
nclPublicExpense
)
+
(
nclThree
.
length
-
10
)
*
Number
(
actionBody
.
product_info
.
price_additions_item
.
public_expense
);
totalNclPublicExpense
=
totalNclPublicExpense
+
tmpNclPublicExpense
;
deliveryData
.
nclones
[
g
].
nclPublicExpense
=
tmpNclPublicExpense
;
}
}
if
(
Number
(
actionBody
.
totalSum
)
<
Number
(
totalNclPublicExpense
))
{
return
system
.
getResult
(
null
,
"总价有误,总价不能小于"
+
totalNclPublicExpense
+
",20140"
);
}
pobj
.
actionBody
.
deliveryData
.
deliveryStatus
=
deliveryStatus
;
pobj
.
actionBody
.
deliveryData
.
deliveryStatusName
=
deliveryStatusName
;
pobj
.
actionBody
.
deliveryData
.
deliveryStatusList
=
deliveryStatusList
;
...
...
@@ -743,7 +746,7 @@ class OrderInfoService extends ServiceBase {
async
getPayOrderInfo
(
pobj
,
actionBody
)
{
var
productItem
=
await
this
.
orderproductDao
.
getItemByOrderNo
(
actionBody
.
orderNo
,
pobj
.
appInfo
.
uapp_id
);
if
(
!
productItem
)
{
return
system
.
getResult
(
null
,
"订单产品数据
异常
,30090"
);
return
system
.
getResult
(
null
,
"订单产品数据
为空
,30090"
);
}
var
item
=
await
this
.
orderReceiptVoucherDao
.
getItemByOrderNo
(
actionBody
.
orderNo
,
pobj
.
appInfo
.
uapp_id
);
if
(
!
item
)
{
...
...
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