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
31cc6c98
Commit
31cc6c98
authored
Apr 15, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
b8d8896d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
+2
-2
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
+1
-4
No files found.
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
View file @
31cc6c98
...
...
@@ -489,11 +489,11 @@ class UtilsOrderService extends AppServiceBase {
// productId: outTradeInfo.length == 3 ? outTradeInfo[2] : 0
// }
// opResult.data = {
// orderNo: "TM362020041
42002tEl6
",
// orderNo: "TM362020041
50927UPmE
",
// uappId: 36,
// productId: 42
// };
//获取充值业务锁
//
//
获取充值业务锁
// await this.cacheManager["TlPayLocker"].init(opResult.data.orderNo);//---测试时放开
var
locker
=
await
this
.
cacheManager
[
"TlPayLocker"
].
enter
(
opResult
.
data
.
orderNo
);
if
(
!
locker
||
locker
!=
"1"
)
{
...
...
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
View file @
31cc6c98
...
...
@@ -255,7 +255,7 @@ class UtilsTmAliyunService extends AppServiceBase {
}
var
params
=
{
action
:
"BindApplicant"
,
reqbody
:
{
ApplicantId
:
applicantId
,
AuthorizationOssKey
:
authorizationOssKey
},
reqbody
:
{
ApplicantId
:
applicantId
,
AuthorizationOssKey
:
authorizationOssKey
,
BizId
:
"trademark_register-cn-4591lzry16c"
},
rpcParam
:
rpcParam
}
//TODO:BizId-----报 BizId is mandatory for this action--BizId是此操作的强制命令
...
...
@@ -376,9 +376,6 @@ class UtilsTmAliyunService extends AppServiceBase {
}
var
reqUrl
=
settings
.
centerOrderUrl
()
+
"opaction/opOrder/springBoard"
;
var
result
=
await
this
.
restPostUrl
(
tmpPobj
,
reqUrl
);
if
(
result
.
status
!=
0
)
{
return
await
this
.
disposePushResultFail
(
tmpPobj
,
result
,
"ali->tmCreateApplicant->addChannelTmApplicantResult->查询ali渠道商标交付失败"
,
3
);
}
return
result
;
}
async
updateAliChannelTm
(
pobj
)
{
//修改ali渠道商标信息
...
...
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