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
b2966f33
Commit
b2966f33
authored
Apr 19, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Plain Diff
git Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel
parents
f03a67e7
e4392047
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
187 additions
and
128 deletions
+187
-128
center-channel/app/base/api/impl/opaction/opOrder.js
+3
-0
center-channel/app/base/api/impl/opreceive/need.js
+8
-1
center-channel/app/base/service/impl/common/centerorderSve.js
+66
-80
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
+3
-3
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
+32
-0
center-channel/app/base/utils/mailClient.js
+2
-1
center-channel/app/front/entry/public/apidoc/platform/icpOrder.md
+46
-43
center-channel/app/front/entry/public/apidoc/platform/tmOrder.md
+27
-0
No files found.
center-channel/app/base/api/impl/opaction/opOrder.js
View file @
b2966f33
...
@@ -56,6 +56,9 @@ class ProductAPI extends WEBBase {
...
@@ -56,6 +56,9 @@ class ProductAPI extends WEBBase {
case
"tmConfirm"
:
//商标方案确认
case
"tmConfirm"
:
//商标方案确认
opResult
=
await
this
.
utilsOpOrderSve
.
tmConfirm
(
pobj
,
pobj
.
actionBody
);
opResult
=
await
this
.
utilsOpOrderSve
.
tmConfirm
(
pobj
,
pobj
.
actionBody
);
break
;
break
;
case
"sendAliWtsEmail"
:
//推送委托书模板邮件(阿里云)
opResult
=
await
this
.
utilsTmAliyunSve
.
sendAliWtsEmail
(
pobj
);
break
;
default
:
default
:
opResult
=
system
.
getResult
(
null
,
"action_type参数错误"
);
opResult
=
system
.
getResult
(
null
,
"action_type参数错误"
);
break
;
break
;
...
...
center-channel/app/base/api/impl/opreceive/need.js
View file @
b2966f33
...
@@ -38,6 +38,12 @@ class Need extends APIBase {
...
@@ -38,6 +38,12 @@ class Need extends APIBase {
case
"needCloseIcp"
:
//关闭需求
case
"needCloseIcp"
:
//关闭需求
opResult
=
await
this
.
utilsNeedSve
.
needCloseIcp
(
pobj
,
pobj
.
actionBody
);
opResult
=
await
this
.
utilsNeedSve
.
needCloseIcp
(
pobj
,
pobj
.
actionBody
);
break
;
break
;
case
"needDetailByChannelNo"
:
opResult
=
await
this
.
utilsNeedSve
.
needDetailByChannelNo
(
pobj
,
pobj
.
actionBody
);
break
;
case
"getItemByChannelNeedNo"
:
opResult
=
await
this
.
utilsNeedSve
.
getItemByChannelNeedNo
(
pobj
,
pobj
.
actionBody
);
break
;
case
"getItemByNeedNo"
:
case
"getItemByNeedNo"
:
opResult
=
await
this
.
utilsNeedSve
.
getItemByNeedNo
(
pobj
,
pobj
.
actionBody
);
opResult
=
await
this
.
utilsNeedSve
.
getItemByNeedNo
(
pobj
,
pobj
.
actionBody
);
break
;
break
;
...
@@ -45,7 +51,8 @@ class Need extends APIBase {
...
@@ -45,7 +51,8 @@ class Need extends APIBase {
opResult
=
await
this
.
centerorderSve
.
reqCenterOrderApi
(
pobj
);
opResult
=
await
this
.
centerorderSve
.
reqCenterOrderApi
(
pobj
);
break
;
break
;
case
"icpFeedbackSubmit"
:
//icp接收方案反馈信息
case
"icpFeedbackSubmit"
:
//icp接收方案反馈信息
opResult
=
await
this
.
utilsNeedSve
.
icpFeedbackSubmit
(
pobj
);
pobj
.
actionType
=
"receiveIcpFeedback"
;
opResult
=
await
this
.
utilsNeedSve
.
reqCenterOrderApi
(
pobj
);
break
;
break
;
case
"icpNotify"
:
//icp方案更新
case
"icpNotify"
:
//icp方案更新
var
rtn
=
await
this
.
utilsNeedSve
.
icpNotify
(
pobj
,
pobj
.
actionBody
);
var
rtn
=
await
this
.
utilsNeedSve
.
icpNotify
(
pobj
,
pobj
.
actionBody
);
...
...
center-channel/app/base/service/impl/common/centerorderSve.js
View file @
b2966f33
const
system
=
require
(
"../../../system"
);
const
system
=
require
(
"../../../system"
);
const
crypto
=
require
(
'crypto'
);
const
crypto
=
require
(
'crypto'
);
var
settings
=
require
(
"../../../../config/settings"
);
var
settings
=
require
(
"../../../../config/settings"
);
class
CenterorderService
{
const
AppServiceBase
=
require
(
"../../app.base"
);
class
CenterorderService
extends
AppServiceBase
{
constructor
()
{
constructor
()
{
super
();
this
.
centerOrderUrl
=
settings
.
centerOrderUrl
();
this
.
centerOrderUrl
=
settings
.
centerOrderUrl
();
this
.
execClient
=
system
.
getObject
(
"util.execClient"
);
this
.
execClient
=
system
.
getObject
(
"util.execClient"
);
this
.
aliclient
=
system
.
getObject
(
"util.aliyunClient"
);
this
.
aliclient
=
system
.
getObject
(
"util.aliyunClient"
);
...
@@ -198,34 +200,11 @@ class CenterorderService {
...
@@ -198,34 +200,11 @@ class CenterorderService {
}
}
async
icppaysuccess
(
pobj
)
{
async
icppaysuccess
(
pobj
)
{
if
(
!
pobj
.
actionBody
.
bizId
)
{
return
system
.
getResult
(
null
,
"actionBody.bizId can not be empty,100491"
);
}
var
solutionobj
=
{
actionType
:
""
,
actionBody
:
pobj
.
actionBody
.
bizId
,
appInfo
:
pobj
.
appInfo
,
actionProcess
:
pobj
.
actionProcess
}
var
solutionrtn
=
await
this
.
execClient
.
execPost
(
solutionobj
,
url
);
if
(
!
solutionrtn
||
!
solutionrtn
.
stdout
)
{
return
system
.
getResultFail
(
-
5011
,
"方案查询失败"
);
}
var
solutiondata
=
JSON
.
parse
(
solutionrtn
.
stdout
);
if
(
solutiondata
.
status
!=
0
)
{
return
system
.
getResultFail
(
-
5011
,
"方案查询失败"
);
}
if
(
solutiondata
.
data
&&
solutiondata
.
data
.
channelNeedNo
)
{
pobj
.
actionBody
.
needId
=
solutiondata
.
data
.
channelNeedNo
;
}
var
reqUrl
=
this
.
centerOrderUrl
+
"action/need/springBoard"
;
var
itemResult
=
await
this
.
restPostUrl
(
pobj
,
reqUrl
);
if
(
needResult
.
status
!=
0
)
{
return
needResult
;
}
var
sobj
=
{
var
sobj
=
{
actionType
:
"getaliicpProduce"
,
actionType
:
"getaliicpProduce"
,
actionBody
:
pobj
.
actionBody
,
// actionBody: { typeCode: itemResult.data.channelTypeCode, province: itemResult.data.province },
actionBody
:
{
typeCode
:
pobj
.
actionBody
.
channelTypeCode
,
province
:
pobj
.
actionBody
.
province
},
appInfo
:
pobj
.
appInfo
,
appInfo
:
pobj
.
appInfo
,
actionProcess
:
pobj
.
actionProcess
actionProcess
:
pobj
.
actionProcess
}
}
...
@@ -239,10 +218,12 @@ class CenterorderService {
...
@@ -239,10 +218,12 @@ class CenterorderService {
if
(
data
.
status
!=
0
)
{
if
(
data
.
status
!=
0
)
{
return
system
.
getResultFail
(
-
5010
,
"产品查询失败"
);
return
system
.
getResultFail
(
-
5010
,
"产品查询失败"
);
}
}
pobj
.
actionBody
=
data
.
data
;
//
pobj.actionBody = data.data;
pobj
.
actionBody
.
orderNo
=
pobj
.
actionBody
.
bizId
;
pobj
.
actionBody
.
orderNo
=
pobj
.
actionBody
.
bizId
;
pobj
.
actionBody
.
totalSum
=
pobj
.
actionBody
.
price
;
pobj
.
actionBody
.
totalSum
=
data
.
data
.
price
;
pobj
.
actionBody
.
payTotalSum
=
pobj
.
actionBody
.
price
;
pobj
.
actionBody
.
payTotalSum
=
data
.
data
.
price
;
pobj
.
actionBody
.
payCode
=
data
.
data
.
payCode
;
pobj
.
actionBody
.
channelItemCode
=
data
.
data
.
channelItemCode
;
pobj
.
actionBody
.
quantity
=
1
;
pobj
.
actionBody
.
quantity
=
1
;
pobj
.
actionBody
.
channelOrder
=
{
pobj
.
actionBody
.
channelOrder
=
{
channelServiceNo
:
pobj
.
actionBody
.
orderNo
,
channelServiceNo
:
pobj
.
actionBody
.
orderNo
,
...
@@ -285,57 +266,57 @@ class CenterorderService {
...
@@ -285,57 +266,57 @@ class CenterorderService {
//--------------------------阿里ICP---start--------------------------------------------------------
//--------------------------阿里ICP---start--------------------------------------------------------
//提交公司注册方案
//提交公司注册方案
async
submitIcpProgramme
(
pobj
)
{
async
submitIcpProgramme
(
pobj
)
{
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
if
(
res
&&
res
.
status
==
0
&&
res
.
data
&&
res
.
data
.
needinfo
&&
res
.
data
.
needsolution
)
{
if
(
res
&&
res
.
status
==
0
&&
res
.
data
&&
res
.
data
.
needinfo
&&
res
.
data
.
needsolution
)
{
var
needinfo
=
res
.
data
.
needinfo
;
//需求信息
var
needinfo
=
res
.
data
.
needinfo
;
//需求信息
var
needsolution
=
res
.
data
.
needsolution
;
//方案信息
var
needsolution
=
res
.
data
.
needsolution
;
//方案信息
var
ab
=
pobj
.
actionBody
;
var
ab
=
pobj
.
actionBody
;
if
(
typeof
(
ab
.
solutionContent
)
==
"string"
)
{
if
(
typeof
(
ab
.
solutionContent
)
==
"string"
)
{
ab
.
solutionContent
=
JSON
.
parse
(
ab
.
solutionContent
);
ab
.
solutionContent
=
JSON
.
parse
(
ab
.
solutionContent
);
}
}
if
(
typeof
(
needsolution
.
solutionContent
)
==
"string"
)
{
if
(
typeof
(
needsolution
.
solutionContent
)
==
"string"
)
{
needsolution
.
solutionContent
=
JSON
.
parse
(
needsolution
.
solutionContent
);
needsolution
.
solutionContent
=
JSON
.
parse
(
needsolution
.
solutionContent
);
}
}
var
solution
=
needsolution
.
solutionContent
.
solution
;
var
solution
=
needsolution
.
solutionContent
.
solution
;
//推送数据至阿里
//推送数据至阿里
var
bizType
=
needinfo
.
channelTypeCode
;
//业务类型里
var
bizType
=
needinfo
.
channelTypeCode
;
//业务类型里
var
pushObj
=
{
var
pushObj
=
{
IntentionBizId
:
needinfo
.
channelNeedNo
,
IntentionBizId
:
needinfo
.
channelNeedNo
,
CompanyName
:
solution
.
CompanyName
,
IcpType
:
solution
.
IcpType
,
CompanyAddress
:
solution
.
CompanyAddress
,
CompanyName
:
solution
.
CompanyName
,
IcpType
:
solution
.
IcpType
,
CompanyAddress
:
solution
.
CompanyAddress
,
Area
:
solution
.
Area
,
Note
:
solution
.
Note
Area
:
solution
.
Area
,
Note
:
solution
.
Note
};
};
var
self
=
this
;
var
self
=
this
;
//推送方案
//推送方案
//
this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
this
.
pushIcpSolution
(
pushObj
,
needsolution
.
solutionNo
,
pobj
.
appInfo
,
self
);
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
}
}
return
res
;
return
res
;
}
}
//推送ICP方案
//推送ICP方案
async
pushIcpSolution
(
pushObj
,
solutionNo
,
appInfo
,
self
)
{
async
pushIcpSolution
(
pushObj
,
solutionNo
,
appInfo
,
self
)
{
//推送方案信息
//推送方案信息
var
pushRes
=
await
self
.
aliclient
.
reqbyget
({
action
:
"SubmitIcpSolution"
,
reqbody
:
pushObj
,
apiVersion
:
"2019-05-08"
});
var
pushRes
=
await
self
.
aliclient
.
reqbyget
({
action
:
"SubmitIcpSolution"
,
reqbody
:
pushObj
,
apiVersion
:
"2019-05-08"
});
if
(
pushRes
&&
pushRes
.
status
==
0
&&
pushRes
.
data
)
{
if
(
pushRes
&&
pushRes
.
status
==
0
&&
pushRes
.
data
)
{
var
resData
=
pushRes
.
data
;
var
resData
=
pushRes
.
data
;
if
(
resData
.
BizId
)
{
if
(
resData
.
BizId
)
{
var
reqObj2
=
{
var
reqObj2
=
{
actionType
:
"receiveProgrammeNo"
,
actionType
:
"receiveProgrammeNo"
,
appInfo
:
appInfo
,
appInfo
:
appInfo
,
actionBody
:{
actionBody
:
{
solutionNo
:
solutionNo
,
solutionNo
:
solutionNo
,
solutionBizId
:
resData
.
BizId
solutionBizId
:
resData
.
BizId
}
}
};
};
var
a
=
await
self
.
reqCenterOrderApi
(
reqObj2
);
//保存渠道方案id
var
a
=
await
self
.
reqCenterOrderApi
(
reqObj2
);
//保存渠道方案id
if
(
a
&&
a
.
status
==
0
)
{
if
(
a
&&
a
.
status
==
0
)
{
//推送方案确认信息
//推送方案确认信息
await
self
.
aliclient
.
reqbyget
({
action
:
"ConfirmIntention"
,
reqbody
:{
BizId
:
resData
.
BizId
}
});
await
self
.
aliclient
.
reqbyget
({
action
:
"ConfirmIntention"
,
reqbody
:{
BizId
:
pushObj
.
IntentionBizId
},
apiVersion
:
"2019-05-08"
});
}
}
}
}
}
}
}
}
//材料链接转换
//材料链接转换
async
materialUrlConversion
(
pobj
){
async
materialUrlConversion
(
pobj
)
{
// if(!pobj || !pobj.actionBody || !pobj.actionBody.material){
// if(!pobj || !pobj.actionBody || !pobj.actionBody.material){
// return pobj;
// return pobj;
// }
// }
...
@@ -347,67 +328,72 @@ class CenterorderService {
...
@@ -347,67 +328,72 @@ class CenterorderService {
//icp材料提交
//icp材料提交
async
submitIcpMaterial
(
pobj
)
{
async
submitIcpMaterial
(
pobj
)
{
// pobj = await this.materialUrlConversion(pobj);
// pobj = await this.materialUrlConversion(pobj);
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
var
needsolution
=
res
.
data
;
//方案信息
var
needsolution
=
res
.
data
;
//方案信息
var
ab
=
pobj
.
actionBody
;
var
ab
=
pobj
.
actionBody
;
if
(
typeof
(
ab
.
material
)
==
"string"
)
{
if
(
typeof
(
ab
.
material
)
==
"string"
)
{
ab
.
material
=
JSON
.
parse
(
ab
.
material
);
ab
.
material
=
JSON
.
parse
(
ab
.
material
);
}
}
var
material
=
ab
.
material
;
var
material
=
ab
.
material
;
//推送数据至阿里
//推送数据至阿里
var
BizId
=
ab
.
BizId
;
//⽅案业务ID
var
BizId
=
ab
.
BizId
;
//⽅案业务ID
var
pushObj
=
{
var
pushObj
=
{
"BizId"
:
BizId
,
"BizId"
:
BizId
,
"Domain"
:
material
.
Domain
,
"Domain"
:
material
.
Domain
,
"CorporateName"
:
material
.
CorporateName
,
"CorporateName"
:
material
.
CorporateName
,
"IncludeForeignInvestment"
:
material
.
IncludeForeignInvestment
,
"IncludeForeignInvestment"
:
material
.
IncludeForeignInvestment
,
"PartnerBusinessLicense"
:
material
.
PartnerBusinessLicense
,
"PartnerBusinessLicense"
:
material
.
PartnerBusinessLicense
,
"PartnerIdCardList"
:
material
.
PartnerIdCardList
,
"PartnerIdCardList"
:
material
.
PartnerIdCardList
,
"PartnerDomainCertificate"
:
material
.
PartnerDomainCertificate
,
"PartnerDomainCertificate"
:
material
.
PartnerDomainCertificate
,
"PartnerPreviewOtherList"
:
material
.
PartnerPreviewOtherList
||
[],
"PartnerPreviewOtherList"
:
material
.
PartnerPreviewOtherList
||
[],
"PartnerPlan"
:
material
.
PartnerPlan
||
""
,
"PartnerPlan"
:
material
.
PartnerPlan
||
""
,
"PartnerForeignInvestment"
:
material
.
PartnerForeignInvestment
||
""
,
"PartnerForeignInvestment"
:
material
.
PartnerForeignInvestment
||
""
,
"PartnerLaw"
:
material
.
PartnerLaw
||
""
,
"PartnerLaw"
:
material
.
PartnerLaw
||
""
,
"PartnerStampOtherList"
:
material
.
PartnerStampOtherList
||
[],
"PartnerStampOtherList"
:
material
.
PartnerStampOtherList
||
[],
"PartnerSignOtherList"
:
material
.
PartnerSignOtherList
||
[],
"PartnerSignOtherList"
:
material
.
PartnerSignOtherList
||
[],
"PartnerSignAndStampOtherList"
:
material
.
PartnerSignAndStampOtherList
||
[]
"PartnerSignAndStampOtherList"
:
material
.
PartnerSignAndStampOtherList
||
[]
};
};
var
self
=
this
;
var
self
=
this
;
//推送方案材料
//推送方案材料
// self.aliclient.reqbyget({action:"SavePartnerSubmitMaterial",reqbody:pushObj
});
self
.
aliclient
.
reqbyget
({
action
:
"SavePartnerSubmitMaterial"
,
reqbody
:
pushObj
,
apiVersion
:
"2019-05-08"
});
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
}
}
return
res
;
return
res
;
}
}
//icp通知状态变更
//icp通知状态变更
async
acceptIcpPartnerNotification
(
pobj
){
async
acceptIcpPartnerNotification
(
pobj
)
{
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
var
ab
=
pobj
.
actionBody
;
var
ab
=
pobj
.
actionBody
;
//推送数据至阿里
//推送数据至阿里
var
pushObj
=
res
.
data
;
// var pushObj = res.data;
var
pushObj
=
{
BizId
:
res
.
data
.
BizId
,
OfficialFileURL
:
res
.
data
.
OfficialFileURL
,
ApplicationStatus
:
res
.
data
.
ApplicationStatus
};
//推送方案
//推送方案
//this.aliclient.reqbyget({action:"AcceptPartnerNotification",reqbody:pushObj
});
this
.
aliclient
.
reqbyget
({
action
:
"AcceptPartnerNotification"
,
reqbody
:
pushObj
,
apiVersion
:
"2019-05-08"
});
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
}
}
return
res
;
return
res
;
}
}
//服务商icp方案关闭
//服务商icp方案关闭
async
abolishIcpProgramme
(
pobj
){
async
abolishIcpProgramme
(
pobj
)
{
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
var
res
=
await
this
.
reqCenterOrderApi
(
pobj
,
"action/icpapi/springBoard"
);
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
if
(
res
&&
res
.
status
==
0
&&
res
.
data
)
{
var
needsolution
=
res
.
data
;
//方案信息
var
needsolution
=
res
.
data
;
//方案信息
var
ab
=
pobj
.
actionBody
;
var
ab
=
pobj
.
actionBody
;
if
(
typeof
(
ab
.
material
)
==
"string"
)
{
if
(
typeof
(
ab
.
material
)
==
"string"
)
{
ab
.
material
=
JSON
.
parse
(
ab
.
material
);
ab
.
material
=
JSON
.
parse
(
ab
.
material
);
}
}
//推送数据至阿里
//推送数据至阿里
var
pushObj
=
{
var
pushObj
=
{
BizId
:
ab
.
BizId
,
Note
:
ab
.
Note
BizId
:
ab
.
BizId
,
Note
:
ab
.
Note
};
};
//
推送
方案
//
关闭
方案
//this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj
});
this
.
aliclient
.
reqbyget
({
action
:
"CloseIcpProduce"
,
reqbody
:
pushObj
,
apiVersion
:
"2019-05-08"
});
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
}
}
return
res
;
return
res
;
...
...
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
View file @
b2966f33
...
@@ -109,15 +109,15 @@ class UtilsNeedService extends AppServiceBase {
...
@@ -109,15 +109,15 @@ class UtilsNeedService extends AppServiceBase {
if
(
!
actionBody
.
channelNeedNo
)
{
if
(
!
actionBody
.
channelNeedNo
)
{
return
system
.
getResult
(
null
,
"actionBody.channelNeedNo can not be empty,100395"
);
return
system
.
getResult
(
null
,
"actionBody.channelNeedNo can not be empty,100395"
);
}
}
var
self
=
this
;
var
self
=
this
;
pobj
.
actionBody
.
intentionBizId
=
pobj
.
actionBody
.
channelNeedNo
;
pobj
.
actionBody
.
intentionBizId
=
pobj
.
actionBody
.
channelNeedNo
;
pobj
.
actionType
=
"needClose"
pobj
.
actionType
=
"needClose"
var
reqUrl
=
this
.
centerOrderUrl
+
"action/need/springBoard"
;
var
reqUrl
=
this
.
centerOrderUrl
+
"action/need/springBoard"
;
var
result
=
await
this
.
restPostUrl
(
pobj
,
reqUrl
);
var
result
=
await
this
.
restPostUrl
(
pobj
,
reqUrl
);
if
(
result
.
status
==
0
)
{
if
(
result
.
status
==
0
)
{
//推送ali
//推送ali
await
self
.
aliclient
.
reqbyget
({
action
:
"CloseIntention"
,
reqbody
:
{
BizId
:
actionBody
.
channelNeedNo
}
});
// await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo }, apiVersion: "2019-05-08"
});
self
.
utilsPushSve
.
aliBusiness2Fq
(
pobj
,
"pushCloseNeed"
);
//
self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseNeed");
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
}
else
{
}
else
{
return
system
.
getResult
(
null
,
"close fail 100389"
);
return
system
.
getResult
(
null
,
"close fail 100389"
);
...
...
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
View file @
b2966f33
...
@@ -9,6 +9,38 @@ class UtilsTmAliyunService extends AppServiceBase {
...
@@ -9,6 +9,38 @@ class UtilsTmAliyunService extends AppServiceBase {
//ICON 图标图样,CARD 身份证,ATTORNEY 授权书ossKey,PASSPORT 护照,BUSINESS_LICENSE 营业执照,LEGAL_NOTICE 法律声明,SUPPLEMENT 补正图片的上传
//ICON 图标图样,CARD 身份证,ATTORNEY 授权书ossKey,PASSPORT 护照,BUSINESS_LICENSE 营业执照,LEGAL_NOTICE 法律声明,SUPPLEMENT 补正图片的上传
this
.
aliOssFileType
=
{
ICON
:
"ICON"
,
CARD
:
"CARD"
,
ATTORNEY
:
"ATTORNEY"
,
PASSPORT
:
"PASSPORT"
,
BUSINESS_LICENSE
:
"BUSINESS_LICENSE"
,
LEGAL_NOTICE
:
"LEGAL_NOTICE"
,
SUPPLEMENT
:
"SUPPLEMENT"
};
this
.
aliOssFileType
=
{
ICON
:
"ICON"
,
CARD
:
"CARD"
,
ATTORNEY
:
"ATTORNEY"
,
PASSPORT
:
"PASSPORT"
,
BUSINESS_LICENSE
:
"BUSINESS_LICENSE"
,
LEGAL_NOTICE
:
"LEGAL_NOTICE"
,
SUPPLEMENT
:
"SUPPLEMENT"
};
}
}
//推送委托书模板邮件(阿里云)
async
sendAliWtsEmail
(
pobj
){
var
ab
=
pobj
.
actionBody
;
if
(
!
ab
.
email
){
return
system
.
getResult
(
null
,
"邮箱地址不能为空"
);
}
if
(
!
ab
.
type
){
return
system
.
getResult
(
null
,
"邮件类型不能为空"
);
}
var
mailCilent
=
system
.
getObject
(
"util.mailClient"
);
var
url
=
""
;
if
(
ab
.
type
==
"1"
){
var
sendRes
=
await
mailCilent
.
sendMsg
(
ab
.
email
,
"商标代理委托书"
,
"see"
,
"商标代理委托书"
,
null
,
null
,[
{
filename
:
'商标代理委托书'
,
path
:
'http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc'
}
]);
return
system
.
getResultSuccess
(
sendRes
);
}
else
if
(
ab
.
type
==
"2"
){
var
sendRes
=
await
mailCilent
.
sendMsg
(
ab
.
email
,
"阿里云商标代理委托书"
,
"see"
,
"阿里云商标代理委托书"
,
null
,
null
,[
{
filename
:
'阿里云商标代理委托书'
,
path
:
'http://gsb-zc.oss-cn-beijing.aliyuncs.com/tmwtu2020041811188516gcjhvjwts.docx'
}
]);
return
system
.
getResultSuccess
(
sendRes
);
}
else
if
(
ab
.
type
==
"3"
){
var
sendRes
=
await
mailCilent
.
sendMsg
(
ab
.
email
,
"阿里云声明文件"
,
"see"
,
"阿里云声明文件"
,
null
,
null
,[
{
filename
:
'阿里云声明文件'
,
path
:
'http://gsb-zc.oss-cn-beijing.aliyuncs.com/tm_smwj202004181626725onjdaliyun.doc'
}
]);
return
system
.
getResultSuccess
(
sendRes
);
}
else
{
return
system
.
getResult
(
null
,
"邮件类型错误"
);
}
}
async
tmCreateApplicant
(
pobj
)
{
//创建商标申请人信息
async
tmCreateApplicant
(
pobj
)
{
//创建商标申请人信息
var
verifyResult
=
await
this
.
opAliyunRpcVerifyParam
(
pobj
);
var
verifyResult
=
await
this
.
opAliyunRpcVerifyParam
(
pobj
);
var
apply
=
pobj
.
actionBody
.
delivery_content
.
apply
;
var
apply
=
pobj
.
actionBody
.
delivery_content
.
apply
;
...
...
center-channel/app/base/utils/mailClient.js
View file @
b2966f33
...
@@ -2,6 +2,7 @@ var nodemailer = require('nodemailer');
...
@@ -2,6 +2,7 @@ var nodemailer = require('nodemailer');
class
MailClient
{
class
MailClient
{
constructor
(){
constructor
(){
this
.
mailer
=
nodemailer
.
createTransport
({
this
.
mailer
=
nodemailer
.
createTransport
({
host
:
"smtp.mxhichina.com"
,
service
:
'aliyun'
,
service
:
'aliyun'
,
secureConnection
:
true
,
secureConnection
:
true
,
port
:
465
,
port
:
465
,
...
@@ -68,7 +69,7 @@ class MailClient{
...
@@ -68,7 +69,7 @@ class MailClient{
}
}
module
.
exports
=
MailClient
;
module
.
exports
=
MailClient
;
// var d=new MailClient();
// var d=new MailClient();
// d.sendMsg("zh
angjiao
@gongsibao.com","test","see","hello txt",null,null,[
// d.sendMsg("zh
uangbing
@gongsibao.com","test","see","hello txt",null,null,[
// {
// {
// filename: 'text1.jpg',
// filename: 'text1.jpg',
// path: 'https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_3369154019592833720182216128337mmexport1540195729827.jpg'
// path: 'https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_3369154019592833720182216128337mmexport1540195729827.jpg'
...
...
center-channel/app/front/entry/public/apidoc/platform/icpOrder.md
View file @
b2966f33
...
@@ -22,11 +22,11 @@
...
@@ -22,11 +22,11 @@
{
{
"actionType"
:
"submitIcpProgramme"
,
"actionType"
:
"submitIcpProgramme"
,
"actionBody"
:{
"actionBody"
:{
"needNo"
:
"I20200320201737000zhb"
,
"needNo"
:
"I20200320201737000zhb"
,
//渠道需求号
"solutionContent"
:{
"solutionContent"
:{
"bizType"
:
"
gszc"
,
"bizType"
:
"
icpsq"
,
//产品类型 icpsq edisq
"solution"
:{
"solution"
:{
"IcpType"
:
1
,
//方案类型 不传默认1 1:icp 2: edi
// "IcpType":1,//方案类型 不传默认1 1:icp 2: edi 参数无效
"CompanyName"
:
"公司名"
,
"CompanyName"
:
"公司名"
,
"CompanyAddress"
:
"公司地址"
,
"CompanyAddress"
:
"公司地址"
,
"Area"
:
"区域"
,
"Area"
:
"区域"
,
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
{
{
"actionType"
:
"submitIcpMaterial"
,
"actionType"
:
"submitIcpMaterial"
,
"actionBody"
:{
"actionBody"
:{
"BizId"
:
"S20200323174838000zhb"
,
"BizId"
:
"S20200323174838000zhb"
,
//渠道方案号 同channelSolutionNo
"material"
:{
"material"
:{
"Domain"
:
"备案域名"
,
"Domain"
:
"备案域名"
,
"CorporateName"
:
"法人名称"
,
"CorporateName"
:
"法人名称"
,
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
{
{
"actionType"
:
"getProgrammeInfoByChannelNeedNo"
,
"actionType"
:
"getProgrammeInfoByChannelNeedNo"
,
"actionBody"
:{
"actionBody"
:{
"needNo"
:
"20200413210610000001"
"needNo"
:
"20200413210610000001"
//渠道需求号
}
}
}
}
...
@@ -121,11 +121,11 @@
...
@@ -121,11 +121,11 @@
"msg"
:
"success"
,
"msg"
:
"success"
,
"data"
:[
"data"
:[
{
{
"needNo"
:
"N202004132334EjurnEr"
,
"needNo"
:
"N202004132334EjurnEr"
,
//需求号 同channelNeedNo
"solutionNo"
:
"NS202004140953WtCUTG"
,
"solutionNo"
:
"NS202004140953WtCUTG"
,
//方案号 同solutionNo
"channelSolutionNo"
:
"S20200323174838000zhb8"
,
"channelSolutionNo"
:
"S20200323174838000zhb8"
,
//渠道方案号 同channelSolutionNo
"orderNo"
:
null
,
"orderNo"
:
null
,
"solutionContent"
:{
"solutionContent"
:{
//方案交付信息
"notes"
:
""
,
"notes"
:
""
,
"bizType"
:
"icpsq"
,
"bizType"
:
"icpsq"
,
"solution"
:{
"solution"
:{
...
@@ -349,7 +349,7 @@
...
@@ -349,7 +349,7 @@
{
{
"actionType"
:
"acceptIcpPartnerNotification"
,
"actionType"
:
"acceptIcpPartnerNotification"
,
"actionBody"
:{
"actionBody"
:{
"BizId"
:
"S20200323174838000zhb"
,
"BizId"
:
"S20200323174838000zhb"
,
//渠道方案号 同channelSolutionNo
"OfficialFileUrl"
:
"官⽂下载地址"
,
"OfficialFileUrl"
:
"官⽂下载地址"
,
"ApplicationStatus"
:
"507"
"ApplicationStatus"
:
"507"
}
}
...
@@ -387,7 +387,7 @@ ApplicationStatus:
...
@@ -387,7 +387,7 @@ ApplicationStatus:
{
{
"actionType"
:
"abolishIcpProgramme"
,
"actionType"
:
"abolishIcpProgramme"
,
"actionBody"
:{
"actionBody"
:{
"BizId"
:
"S20200323174838000zhb"
,
"BizId"
:
"S20200323174838000zhb"
,
//渠道方案号 同channelSolutionNo
"Note"
:
"备注"
"Note"
:
"备注"
}
}
}
}
...
@@ -406,7 +406,7 @@ ApplicationStatus:
...
@@ -406,7 +406,7 @@ ApplicationStatus:
## **<a name="getNeedSolutionDetailByUser"> 获取方案详情</a>**
## **<a name="getNeedSolutionDetailByUser"> 获取方案详情</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/action/icapi/springBoard
]
[
/web/action/ic
p
api/springBoard
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin(用户登录后的凭证)的值
#### 请求头中需要增加userpin(用户登录后的凭证)的值
...
@@ -417,7 +417,7 @@ ApplicationStatus:
...
@@ -417,7 +417,7 @@ ApplicationStatus:
{
{
"actionType"
:
"getNeedSolutionDetailByUser"
,
"actionType"
:
"getNeedSolutionDetailByUser"
,
"actionBody"
:{
"actionBody"
:{
"solutionNo"
:
"NS202004131008iKPRDB"
"solutionNo"
:
"NS202004131008iKPRDB"
//方案号
}
}
}
}
```
```
...
@@ -427,14 +427,18 @@ ApplicationStatus:
...
@@ -427,14 +427,18 @@ ApplicationStatus:
{
{
"status"
:
0
,
"status"
:
0
,
"msg"
:
"success"
,
"msg"
:
"success"
,
"data"
:[
"data"
:{
{
"id"
:
230
,
"id"
:
230
,
"channelNeedNo"
:
"I20200320201737000221"
,
//渠道需求号
"channelNeedNo"
:
"I20200320201737000221"
,
//渠道需求号
"needNo"
:
"N202004111217gD5T8TJ"
,
//需求号
"needNo"
:
"N202004111217gD5T8TJ"
,
//需求号
"solutionNo"
:
"NS202004131349EAWwSV"
,
//方案号
"solutionNo"
:
"NS202004131349EAWwSV"
,
//方案号
"channelSolutionNo"
:
"S20200323174838000zhb7"
,
//渠道方案号 同BizId
"channelSolutionNo"
:
"S20200323174838000zhb7"
,
//渠道方案号 同BizId
"orderNo"
:
null
,
//服务订单号
"orderNo"
:
null
,
//服务订单号
"needinfo"
:{
//需求信息 ---- 联系人信息
"publishName"
:
"云武"
,
"publishMobile"
:
"13800138000"
,
"channelUserId"
:
"13800138000"
},
"solutionContent"
:{
//方案交付信息
"solutionContent"
:{
//方案交付信息
"notes"
:
""
,
//用户反馈备注
"notes"
:
""
,
//用户反馈备注
"status"
:
"ACCOUNT_REGISTERED"
,
//方案流程状态
"status"
:
"ACCOUNT_REGISTERED"
,
//方案流程状态
...
@@ -504,8 +508,7 @@ ApplicationStatus:
...
@@ -504,8 +508,7 @@ ApplicationStatus:
"updated_at"
:
"2020-04-13T05:51:08.000Z"
,
"updated_at"
:
"2020-04-13T05:51:08.000Z"
,
"deleted_at"
:
null
,
"deleted_at"
:
null
,
"version"
:
0
"version"
:
0
}
},
],
"requestId"
:
"1594aa8fabfd42eba332160263b2597e"
"requestId"
:
"1594aa8fabfd42eba332160263b2597e"
}
}
```
```
...
@@ -515,7 +518,7 @@ ApplicationStatus:
...
@@ -515,7 +518,7 @@ ApplicationStatus:
## **<a name="needCloseIcp"> 服务商关闭icp需求</a>**
## **<a name="needCloseIcp"> 服务商关闭icp需求</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/
action
/need/springBoard
]
[
/web/
opreceive
/need/springBoard
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin(用户登录后的凭证)的值
#### 请求头中需要增加userpin(用户登录后的凭证)的值
...
@@ -541,19 +544,19 @@ ApplicationStatus:
...
@@ -541,19 +544,19 @@ ApplicationStatus:
}
}
```
```
## **<a name="getItemByNeedNo"> 获取需求详情</a>**
## **<a name="getItemBy
Channel
NeedNo"> 获取需求详情</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/
action
/need/springBoard
]
[
/web/
opreceive
/need/springBoard
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin(用户登录后的凭证)的值
#### 请求头中需要增加userpin(用户登录后的凭证)的值
#### 渠道执行的类型 actionType:getItemByNeedNo
#### 渠道执行的类型 actionType:getItemBy
Channel
NeedNo
```
javascript
```
javascript
{
{
"actionType"
:
"getItemByNeedNo"
,
"actionType"
:
"getItemBy
Channel
NeedNo"
,
"actionBody"
:{
"actionBody"
:{
"needNo"
:
"NS202004131008iKPRDB"
"needNo"
:
"NS202004131008iKPRDB"
}
}
...
@@ -567,28 +570,28 @@ ApplicationStatus:
...
@@ -567,28 +570,28 @@ ApplicationStatus:
data
:
data
:
{
id
:
559
,
{
id
:
559
,
uapp_id
:
18
,
uapp_id
:
18
,
needNo
:
'N202004132334EjurnEr'
,
needNo
:
'N202004132334EjurnEr'
,
//需求号--用于服务商或需求表中创建订单
channelNeedNo
:
'20200413210610000001'
,
channelNeedNo
:
'20200413210610000001'
,
//渠道需求号
channelUserId
:
'13800138000'
,
channelUserId
:
'13800138000'
,
//渠道用户唯一码
followManUserId
:
'100'
,
followManUserId
:
'100'
,
//跟进者唯一码
followManMobile
:
'13075556693'
,
followManMobile
:
'13075556693'
,
//跟进者手机号
city
:
'9'
,
city
:
'9'
,
//城市
province
:
null
,
province
:
null
,
//省份
publishContent
:
'icp需求测试_005'
,
publishContent
:
'icp需求测试_005'
,
//发布内容
publishName
:
'张三'
,
publishName
:
'张三'
,
//发布者姓名
publishMobile
:
'13800138000'
,
publishMobile
:
'13800138000'
,
//发布者手机号
notes
:
null
,
notes
:
null
,
//备注
followContent
:
followContent
:
//跟进内容
{
content
:
'icp提交到方案'
,
followDate
:
'2020-04-14T01:53:33.521Z'
},
{
content
:
'icp提交到方案'
,
followDate
:
'2020-04-14T01:53:33.521Z'
},
disposeNotes
:
null
,
disposeNotes
:
null
,
//处理的备注
status
:
'wts'
,
status
:
'wts'
,
//状态
typeCode
:
'icpsq'
,
typeCode
:
'icpsq'
,
//类型编码
typeName
:
'icp申请'
,
typeName
:
'icp申请'
,
//类型名称
channelTypeCode
:
'7'
,
channelTypeCode
:
'7'
,
//渠道类型编码
channelTypeName
:
'icp申请'
,
channelTypeName
:
'icp申请'
,
//渠道类型名称
publisherOnlyCode
:
null
,
publisherOnlyCode
:
null
,
//发布者唯一码
followManName
:
'13075556693'
,
followManName
:
'13075556693'
,
//跟进人姓名
followManOnlyCode
:
'13075556693'
}
}
followManOnlyCode
:
'13075556693'
//跟进者唯一码
} }
```
```
...
...
center-channel/app/front/entry/public/apidoc/platform/tmOrder.md
View file @
b2966f33
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
1.
[
商标订单修改-修改申请人信息
](
#updateCustomerInfo
)
1.
[
商标订单修改-修改申请人信息
](
#updateCustomerInfo
)
1.
[
商标订单修改-修改交官材料
](
#updateOfficial
)
1.
[
商标订单修改-修改交官材料
](
#updateOfficial
)
1.
[
商标方案确认
](
#tmConfirm
)
1.
[
商标方案确认
](
#tmConfirm
)
1.
[
推送委托书模板邮件(阿里云)
](
#sendAliWtsEmail
)
## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
...
@@ -390,3 +391,29 @@
...
@@ -390,3 +391,29 @@
}
}
```
```
## **<a name="sendAliWtsEmail"> 推送委托书模板邮件(阿里云)</a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/opaction/opOrder/springBoard
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType:sendAliWtsEmail
```
javascript
{
"email "
:
"zhuangbing@gongsibao.com"
,
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
"250 Data Ok: queued as freedom"
,
"requestId"
:
"9f0d22bd7afe402f830a559b2e7a412a"
}
```
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