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
4eb4a17a
Commit
4eb4a17a
authored
Jul 21, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sy
parent
3dfa5a54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
brg-user-center/app/base/api/impl/action/need.js
+1
-1
brg-user-center/app/base/service/impl/common/txPushLogSve.js
+9
-9
No files found.
brg-user-center/app/base/api/impl/action/need.js
View file @
4eb4a17a
...
@@ -41,7 +41,7 @@ class Need extends APIBase {
...
@@ -41,7 +41,7 @@ class Need extends APIBase {
opResult
=
system
.
getResult
(
null
,
"验证码错误"
);
opResult
=
system
.
getResult
(
null
,
"验证码错误"
);
return
opResult
;
return
opResult
;
}
}
await
self
.
utilsMsgSendSve
.
removeVerificationCode
(
pobj
.
actionBody
.
Info
[
0
].
formInfo
.
contactsPhon
e
);
await
self
.
utilsMsgSendSve
.
removeVerificationCode
(
pobj
.
actionBody
.
ContactsMobil
e
);
}
}
switch
(
action_type
)
{
switch
(
action_type
)
{
case
"test"
:
//测试
case
"test"
:
//测试
...
...
brg-user-center/app/base/service/impl/common/txPushLogSve.js
View file @
4eb4a17a
...
@@ -31,7 +31,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -31,7 +31,7 @@ class TxPushLogService extends ServiceBase {
try
{
try
{
var
loginfo
=
await
this
.
findOne
({
deal_name
:
pobj
.
interface
.
para
.
dealName
,
push_action_type
:
"orderPayNotify"
});
var
loginfo
=
await
this
.
findOne
({
deal_name
:
pobj
.
interface
.
para
.
dealName
,
push_action_type
:
"orderPayNotify"
});
if
(
loginfo
)
{
if
(
loginfo
)
{
return
self
.
returnTX
(
1
,
"cgateway"
,
"ok"
,
{
"flowId"
:
loginfo
.
flow_id
,
"resourceIds"
:
[
pobj
.
interface
.
para
.
dealName
]
})
return
self
.
returnTX
(
0
,
"cgateway"
,
"ok"
,
{
"flowId"
:
loginfo
.
flow_id
,
"resourceIds"
:
[
pobj
.
interface
.
para
.
dealName
]
})
}
}
var
flow_id
=
await
this
.
getBusUid
(
"f"
);
var
flow_id
=
await
this
.
getBusUid
(
"f"
);
var
newobj
=
{
var
newobj
=
{
...
@@ -60,7 +60,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -60,7 +60,7 @@ class TxPushLogService extends ServiceBase {
};
};
var
a
=
await
this
.
execPostByTimeOut
(
req
,
pushobj
,
settings
.
opPushUrl
());
var
a
=
await
this
.
execPostByTimeOut
(
req
,
pushobj
,
settings
.
opPushUrl
());
return
self
.
returnTX
(
1
,
"cgateway"
,
"ok"
,
{
"flowId"
:
creatlog
.
flow_id
,
"resourceIds"
:
[
pobj
.
interface
.
para
.
dealName
]
})
return
self
.
returnTX
(
0
,
"cgateway"
,
"ok"
,
{
"flowId"
:
creatlog
.
flow_id
,
"resourceIds"
:
[
pobj
.
interface
.
para
.
dealName
]
})
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
execClient
.
execLogs
(
"txPushLogSve.js/createCbsInstance方法出现异常"
,
{
params
:
orderNum
},
"txPushLogSve_createCbsInstance_error"
,
null
,
e
.
stack
);
this
.
execClient
.
execLogs
(
"txPushLogSve.js/createCbsInstance方法出现异常"
,
{
params
:
orderNum
},
"txPushLogSve_createCbsInstance_error"
,
null
,
e
.
stack
);
return
this
.
returnTX
(
-
1
,
"cgateway"
,
"请求失败"
,
null
)
return
this
.
returnTX
(
-
1
,
"cgateway"
,
"请求失败"
,
null
)
...
@@ -86,7 +86,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -86,7 +86,7 @@ class TxPushLogService extends ServiceBase {
if
(
orderInfo
.
status
==
320
)
{
if
(
orderInfo
.
status
==
320
)
{
status
=
3
;
status
=
3
;
}
}
return
self
.
returnTX
(
1
,
"cgateway"
,
"ok"
,
{
"status"
:
status
})
return
self
.
returnTX
(
0
,
"cgateway"
,
"ok"
,
{
"status"
:
status
})
}
}
...
@@ -119,7 +119,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -119,7 +119,7 @@ class TxPushLogService extends ServiceBase {
}
}
resources
.
push
(
resource
);
resources
.
push
(
resource
);
}
}
return
self
.
returnTX
(
1
,
"cgateway"
,
"ok"
,
{
"resources"
:
resources
})
return
self
.
returnTX
(
0
,
"cgateway"
,
"ok"
,
{
"resources"
:
resources
})
}
}
//用户所有资源拉取
//用户所有资源拉取
...
@@ -159,7 +159,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -159,7 +159,7 @@ class TxPushLogService extends ServiceBase {
}
}
resources
.
push
(
resource
);
resources
.
push
(
resource
);
}
}
return
self
.
returnTX
(
1
,
"cgateway"
,
"ok"
,
{
"total"
:
orderProduct
.
count
,
"resources"
:
resources
})
return
self
.
returnTX
(
0
,
"cgateway"
,
"ok"
,
{
"total"
:
orderProduct
.
count
,
"resources"
:
resources
})
}
}
//隔离资源
//隔离资源
...
@@ -173,13 +173,13 @@ class TxPushLogService extends ServiceBase {
...
@@ -173,13 +173,13 @@ class TxPushLogService extends ServiceBase {
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"资源不存在"
,
null
)
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"资源不存在"
,
null
)
}
}
if
(
orderProduct
.
dataValues
.
status
==
2
)
{
if
(
orderProduct
.
dataValues
.
status
==
2
)
{
return
self
.
returnTX
(
1
,
"mall_logic"
,
"ok"
,
null
)
return
self
.
returnTX
(
0
,
"mall_logic"
,
"ok"
,
null
)
}
}
if
(
orderProduct
.
dataValues
.
status
==
3
)
{
if
(
orderProduct
.
dataValues
.
status
==
3
)
{
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"资源已销毁"
,
null
)
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"资源已销毁"
,
null
)
}
}
await
this
.
orderProductDao
.
update
({
id
:
orderProduct
.
dataValues
.
id
,
status
:
2
,
isolated_time
:
new
Date
()
});
await
this
.
orderProductDao
.
update
({
id
:
orderProduct
.
dataValues
.
id
,
status
:
2
,
isolated_time
:
new
Date
()
});
return
self
.
returnTX
(
1
,
"mall_logic"
,
"ok"
,
null
)
return
self
.
returnTX
(
0
,
"mall_logic"
,
"ok"
,
null
)
}
}
...
@@ -197,7 +197,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -197,7 +197,7 @@ class TxPushLogService extends ServiceBase {
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"资源未隔离"
,
null
)
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"资源未隔离"
,
null
)
}
}
if
(
orderProduct
.
dataValues
.
status
==
3
)
{
if
(
orderProduct
.
dataValues
.
status
==
3
)
{
return
self
.
returnTX
(
1
,
"mall_logic"
,
"资源已销毁"
,
null
)
return
self
.
returnTX
(
0
,
"mall_logic"
,
"资源已销毁"
,
null
)
}
}
var
flow_id
=
await
this
.
getBusUid
(
"f"
);
var
flow_id
=
await
this
.
getBusUid
(
"f"
);
var
newobj
=
{
var
newobj
=
{
...
@@ -214,7 +214,7 @@ class TxPushLogService extends ServiceBase {
...
@@ -214,7 +214,7 @@ class TxPushLogService extends ServiceBase {
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"请求错误"
,
null
)
return
self
.
returnTX
(
-
1
,
"mall_logic"
,
"请求错误"
,
null
)
}
}
await
this
.
orderProductDao
.
update
({
id
:
orderProduct
.
dataValues
.
id
,
status
:
3
});
await
this
.
orderProductDao
.
update
({
id
:
orderProduct
.
dataValues
.
id
,
status
:
3
});
return
self
.
returnTX
(
1
,
"mall_logic"
,
"ok"
,
{
flowId
:
flow_id
})
return
self
.
returnTX
(
0
,
"mall_logic"
,
"ok"
,
{
flowId
:
flow_id
})
}
}
...
...
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