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
29aa74a5
Commit
29aa74a5
authored
Aug 29, 2020
by
王勇飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gyq
parent
05e8e12d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
16 deletions
+11
-16
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
+9
-14
tx-fi-tax/app/base/db/impl/bizchance/bizoptDao.js
+1
-1
tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js
+1
-1
No files found.
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
29aa74a5
...
@@ -402,10 +402,10 @@ class DeliverybillCtl extends CtlBase {
...
@@ -402,10 +402,10 @@ class DeliverybillCtl extends CtlBase {
var
deliverInfo
=
await
this
.
service
.
findByClientId
({
"vftClientId"
:
pobj
.
customer_id
});
var
deliverInfo
=
await
this
.
service
.
findByClientId
({
"vftClientId"
:
pobj
.
customer_id
});
if
(
deliverInfo
)
{
if
(
deliverInfo
)
{
var
param
=
{
var
param
=
{
bizNo
:
pobj
.
customer_id
,
//需要根据客户id获取服务示例号
"bizNo"
:
pobj
.
customer_id
,
//需要根据客户id获取服务示例号
accountDate
:
pobj
.
current_period
,
"accountDate"
:
pobj
.
current_period
,
status
:
pobj
.
status
,
"status"
:
pobj
.
status
,
errorStatus
:
-
1
"errorStatus"
:
-
1
}
}
if
(
pobj
.
remark
)
{
if
(
pobj
.
remark
)
{
param
.
remark
=
pobj
.
remark
;
param
.
remark
=
pobj
.
remark
;
...
@@ -414,13 +414,13 @@ class DeliverybillCtl extends CtlBase {
...
@@ -414,13 +414,13 @@ class DeliverybillCtl extends CtlBase {
}
}
}
}
var
pushObj
=
{
var
pushObj
=
{
pushUrl
:
this
.
rysUrl
+
"service/paperPost/confirm"
,
"pushUrl"
:
this
.
rysUrl
+
"service/paperPost/confirm"
,
actionType
:
"confirm"
,
"actionType"
:
"confirm"
,
messageBody
:
param
,
"messageBody"
:
param
,
headData
:
{
"headData"
:
{
'Source'
:
'GSB'
'Source'
:
'GSB'
},
},
requestId
:
uuidv4
()
"requestId"
:
uuidv4
()
}
}
return
system
.
queueOper
(
pushObj
);
return
system
.
queueOper
(
pushObj
);
}
}
...
@@ -431,8 +431,4 @@ class DeliverybillCtl extends CtlBase {
...
@@ -431,8 +431,4 @@ class DeliverybillCtl extends CtlBase {
}
}
}
module
.
exports
=
DeliverybillCtl
;
module
.
exports
=
DeliverybillCtl
;
\ No newline at end of file
tx-fi-tax/app/base/db/impl/bizchance/bizoptDao.js
View file @
29aa74a5
...
@@ -117,7 +117,7 @@ class BizoptDao extends Dao {
...
@@ -117,7 +117,7 @@ class BizoptDao extends Dao {
obj
.
business_info
.
requestId
=
qobj
.
requestId
;
obj
.
business_info
.
requestId
=
qobj
.
requestId
;
}
}
if
(
qobj
.
mobile
&&
qobj
.
mobile
!=
'undefined'
)
{
if
(
qobj
.
mobile
&&
qobj
.
mobile
!=
'undefined'
)
{
obj
.
business_info
.
contactsPhone
=
qobj
.
mobile
;
//已经加密
obj
.
business_info
.
contactsPhone
=
qobj
.
mobile
;
}
}
//bussiness_info END
//bussiness_info END
//other
//other
...
...
tx-fi-tax/app/base/db/impl/bizchance/deliverybillDao.js
View file @
29aa74a5
...
@@ -53,7 +53,7 @@ class DeliverybillDao extends Dao {
...
@@ -53,7 +53,7 @@ class DeliverybillDao extends Dao {
filters
.
push
({
filters
.
push
({
delivery_status
:
{
delivery_status
:
{
$in
:
[
$in
:
[
system
.
SERVERSESTATUS
.
RECEIVED
,
system
.
SERVERSESTATUS
.
WAITUSERCONFIRM
system
.
SERVERSESTATUS
.
RECEIVED
,
system
.
SERVERSESTATUS
.
WAITUSERCONFIRM
,
system
.
SERVERSESTATUS
.
INSERVICE
]
]
}
}
});
});
...
...
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