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
fb73aa6e
Commit
fb73aa6e
authored
Sep 16, 2020
by
王勇飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gyq
parent
74a8c79f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletions
+17
-1
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
+3
-0
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
+11
-0
tx-fi-tax/app/base/utils/toFtClient.js
+3
-1
No files found.
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
fb73aa6e
...
@@ -93,6 +93,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -93,6 +93,7 @@ class DeliverybillCtl extends CtlBase {
* @param {*} req
* @param {*} req
*/
*/
async
setupBill
(
pobj
,
qobj
,
req
)
{
async
setupBill
(
pobj
,
qobj
,
req
)
{
console
.
log
(
"deliveryCtl:setupBill:pobj--------------------------------"
+
JSON
.
stringify
(
pobj
));
try
{
try
{
if
(
!
pobj
.
deliverId
)
{
if
(
!
pobj
.
deliverId
)
{
throw
new
Error
(
"deliverId 不能为空"
);
throw
new
Error
(
"deliverId 不能为空"
);
...
@@ -101,8 +102,10 @@ class DeliverybillCtl extends CtlBase {
...
@@ -101,8 +102,10 @@ class DeliverybillCtl extends CtlBase {
throw
new
Error
(
"参数不能为空"
);
throw
new
Error
(
"参数不能为空"
);
}
}
const
rs
=
await
this
.
service
.
setupBill
(
pobj
);
const
rs
=
await
this
.
service
.
setupBill
(
pobj
);
console
.
log
(
"deliveryCtl:setupBill:rs--------------------------------"
+
JSON
.
stringify
(
rs
));
return
system
.
getResult
(
rs
);
return
system
.
getResult
(
rs
);
}
catch
(
err
)
{
}
catch
(
err
)
{
console
.
log
(
"deliveryCtl:setupBill:err--------------------------------"
+
err
);
return
system
.
getResult
(
null
,
err
.
message
)
return
system
.
getResult
(
null
,
err
.
message
)
}
}
}
}
...
...
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
View file @
fb73aa6e
...
@@ -29,6 +29,7 @@ class DeliverybillService extends ServiceBase {
...
@@ -29,6 +29,7 @@ class DeliverybillService extends ServiceBase {
if
(
!
deliverData
.
delivery_info
.
companyName
)
{
if
(
!
deliverData
.
delivery_info
.
companyName
)
{
throw
new
Error
(
"查不到对应公司名称"
);
throw
new
Error
(
"查不到对应公司名称"
);
}
}
let
updateResult
=
{};
let
updateResult
=
{};
let
{
delivery_info
}
=
deliverData
;
let
{
delivery_info
}
=
deliverData
;
if
(
pobj
.
orderStaus
===
true
)
{
if
(
pobj
.
orderStaus
===
true
)
{
...
@@ -75,6 +76,8 @@ class DeliverybillService extends ServiceBase {
...
@@ -75,6 +76,8 @@ class DeliverybillService extends ServiceBase {
}
}
async
setupBill
(
pobj
)
{
async
setupBill
(
pobj
)
{
try
{
console
.
log
(
"deliverySve:setupBill:pobj----------------------------------------"
,
JSON
.
stringify
(
pobj
));
let
deliverData
=
await
this
.
dao
.
findOne
({
let
deliverData
=
await
this
.
dao
.
findOne
({
id
:
pobj
.
deliverId
id
:
pobj
.
deliverId
});
});
...
@@ -104,8 +107,16 @@ class DeliverybillService extends ServiceBase {
...
@@ -104,8 +107,16 @@ class DeliverybillService extends ServiceBase {
},
{
},
{
id
:
pobj
.
deliverId
id
:
pobj
.
deliverId
});
});
console
.
log
(
"deliverySve:setupBill:SUCCESS----------------------------------------SUCCESS"
);
return
"SUCCESS"
return
"SUCCESS"
}
}
catch
(
error
)
{
console
.
log
(
"deliverySve:setupBill:error----------------------------------------"
+
error
);
return
error
;
}
}
async
deliverInfo
(
pobj
)
{
async
deliverInfo
(
pobj
)
{
let
result
=
{};
let
result
=
{};
...
...
tx-fi-tax/app/base/utils/toFtClient.js
View file @
fb73aa6e
...
@@ -59,7 +59,9 @@ const postToFtBySign = async (url, data, headers = {}) => {
...
@@ -59,7 +59,9 @@ const postToFtBySign = async (url, data, headers = {}) => {
let
tenantInfo
=
await
getChannelCompany
(
data
.
companyId
);
let
tenantInfo
=
await
getChannelCompany
(
data
.
companyId
);
data
.
companyId
=
tenantInfo
.
id
;
data
.
companyId
=
tenantInfo
.
id
;
let
sign
=
system
.
signValid
(
data
,
tenantInfo
.
signSecret
);
let
sign
=
system
.
signValid
(
data
,
tenantInfo
.
signSecret
);
return
postRequest
(
`
${
ftConfig
.
url
}${
url
}
`
,
{
...
data
,
sign
},
headers
=
{})
var
res
=
postRequest
(
`
${
ftConfig
.
url
}${
url
}
`
,
{
...
data
,
sign
},
headers
=
{});
console
.
log
(
"postToFtBySign:res--------------------------------------"
+
JSON
.
stringify
(
res
));
return
res
;
}
}
/**
/**
...
...
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