Skip to content

Z
zhichan
Commit b2966f33 by 宋毅
Options

git Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

parents f03a67e7 e4392047
Showing with 122 additions and 49 deletions
center-channel/app/base/api/impl/opaction/opOrder.js
......@@ -56,6 +56,9 @@ class ProductAPI extends WEBBase {
case "tmConfirm"://商标方案确认
opResult = await this.utilsOpOrderSve.tmConfirm(pobj, pobj.actionBody);
break;
case "sendAliWtsEmail"://推送委托书模板邮件(阿里云)
opResult = await this.utilsTmAliyunSve.sendAliWtsEmail(pobj);
break;
default:
opResult = system.getResult(null, "action_type参数错误");
break;
......
center-channel/app/base/api/impl/opreceive/need.js
......@@ -37,7 +37,13 @@ class Need extends APIBase {
break;
case "needCloseIcp"://关闭需求
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":
opResult = await this.utilsNeedSve.getItemByNeedNo(pobj, pobj.actionBody);
break;
......@@ -45,7 +51,8 @@ class Need extends APIBase {
opResult = await this.centerorderSve.reqCenterOrderApi(pobj);
break;
case "icpFeedbackSubmit"://icp接收方案反馈信息
opResult = await this.utilsNeedSve.icpFeedbackSubmit(pobj);
pobj.actionType = "receiveIcpFeedback";
opResult = await this.utilsNeedSve.reqCenterOrderApi(pobj);
break;
case "icpNotify"://icp方案更新
var rtn = await this.utilsNeedSve.icpNotify(pobj, pobj.actionBody);
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
......@@ -109,15 +109,15 @@ class UtilsNeedService extends AppServiceBase {
if (!actionBody.channelNeedNo) {
return system.getResult(null, "actionBody.channelNeedNo can not be empty，100395");
}
var self=this;
var self = this;
pobj.actionBody.intentionBizId = pobj.actionBody.channelNeedNo;
pobj.actionType = "needClose"
var reqUrl = this.centerOrderUrl + "action/need/springBoard";
var result = await this.restPostUrl(pobj, reqUrl);
if (result.status == 0) {
//推送ali
await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo } });
self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseNeed");
// await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo }, apiVersion: "2019-05-08" });
// self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseNeed");
return system.getResultSuccess();
} else {
return system.getResult(null, "close fail　100389");
......
center-channel/app/base/service/impl/utilsSve/utilsTmAliyunSve.js
......@@ -9,6 +9,38 @@ class UtilsTmAliyunService extends AppServiceBase {
//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" };
}
//推送委托书模板邮件(阿里云)
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) {//创建商标申请人信息
var verifyResult = await this.opAliyunRpcVerifyParam(pobj);
var apply = pobj.actionBody.delivery_content.apply;
......
center-channel/app/base/utils/mailClient.js
......@@ -2,6 +2,7 @@ var nodemailer = require('nodemailer');
class MailClient{
constructor(){
this.mailer=nodemailer.createTransport({
host:"smtp.mxhichina.com",
service: 'aliyun',
secureConnection: true,
port: 465,
......@@ -68,7 +69,7 @@ class MailClient{
}
module.exports=MailClient;
// var d=new MailClient();
// d.sendMsg("zhangjiao@gongsibao.com","test","see","hello txt",null,null,[
// d.sendMsg("zhuangbing@gongsibao.com","test","see","hello txt",null,null,[
// {
// filename: 'text1.jpg',
// path: 'https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_3369154019592833720182216128337mmexport1540195729827.jpg'
......
center-channel/app/front/entry/public/apidoc/platform/icpOrder.md
......@@ -22,11 +22,11 @@
{
"actionType":"submitIcpProgramme",
"actionBody":{
"needNo":"I20200320201737000zhb",
"needNo":"I20200320201737000zhb",//渠道需求号
"solutionContent":{
"bizType":"gszc",
"bizType":"icpsq",//产品类型 icpsq edisq
"solution":{
"IcpType":1,//方案类型 不传默认1 1:icp 2: edi
// "IcpType":1,//方案类型 不传默认1 1:icp 2: edi 参数无效
"CompanyName":"公司名",
"CompanyAddress":"公司地址",
"Area":"区域",
......@@ -62,7 +62,7 @@
{
"actionType":"submitIcpMaterial",
"actionBody":{
"BizId":"S20200323174838000zhb",
"BizId":"S20200323174838000zhb",//渠道方案号 同channelSolutionNo
"material":{
"Domain":"备案域名",
"CorporateName":"法人名称",
......@@ -108,7 +108,7 @@
{
"actionType":"getProgrammeInfoByChannelNeedNo",
"actionBody":{
"needNo":"20200413210610000001"
"needNo":"20200413210610000001" //渠道需求号
}
}
......@@ -121,11 +121,11 @@
"msg":"success",
"data":[
{
"needNo":"N202004132334EjurnEr",
"solutionNo":"NS202004140953WtCUTG",
"channelSolutionNo":"S20200323174838000zhb8",
"needNo":"N202004132334EjurnEr",//需求号 同channelNeedNo
"solutionNo":"NS202004140953WtCUTG",//方案号 同solutionNo
"channelSolutionNo":"S20200323174838000zhb8",//渠道方案号 同channelSolutionNo
"orderNo":null,
"solutionContent":{
"solutionContent":{//方案交付信息
"notes":"",
"bizType":"icpsq",
"solution":{
......@@ -349,7 +349,7 @@
{
"actionType":"acceptIcpPartnerNotification",
"actionBody":{
"BizId":"S20200323174838000zhb",
"BizId":"S20200323174838000zhb",//渠道方案号 同channelSolutionNo
"OfficialFileUrl":"官⽂下载地址",
"ApplicationStatus":"507"
}
......@@ -387,7 +387,7 @@ ApplicationStatus：
{
"actionType":"abolishIcpProgramme",
"actionBody":{
"BizId":"S20200323174838000zhb",
"BizId":"S20200323174838000zhb", //渠道方案号 同channelSolutionNo
"Note":"备注"
}
}
......@@ -406,7 +406,7 @@ ApplicationStatus：
## **<a name="getNeedSolutionDetailByUser"> 获取方案详情</a>**
[返回到目录](#menu)
##### URL
[/web/action/icapi/springBoard]
[/web/action/icpapi/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
......@@ -417,7 +417,7 @@ ApplicationStatus：
{
"actionType":"getNeedSolutionDetailByUser",
"actionBody":{
"solutionNo":"NS202004131008iKPRDB"
"solutionNo":"NS202004131008iKPRDB" //方案号
}
}
```
......@@ -427,14 +427,18 @@ ApplicationStatus：
{
"status":0,
"msg":"success",
"data":[
{
"data":{
"id":230,
"channelNeedNo":"I20200320201737000221",//渠道需求号
"needNo":"N202004111217gD5T8TJ",//需求号
"solutionNo":"NS202004131349EAWwSV",//方案号
"channelSolutionNo":"S20200323174838000zhb7",//渠道方案号 同BizId
"orderNo":null,//服务订单号
"needinfo":{//需求信息 ---- 联系人信息
"publishName":"云武",
"publishMobile":"13800138000",
"channelUserId":"13800138000"
},
"solutionContent":{//方案交付信息
"notes":"",//用户反馈备注
"status":"ACCOUNT_REGISTERED",//方案流程状态
......@@ -504,8 +508,7 @@ ApplicationStatus：
"updated_at":"2020-04-13T05:51:08.000Z",
"deleted_at":null,
"version":0
}
],
},
"requestId":"1594aa8fabfd42eba332160263b2597e"
}
```
......@@ -515,7 +518,7 @@ ApplicationStatus：
## **<a name="needCloseIcp"> 服务商关闭icp需求</a>**
[返回到目录](#menu)
##### URL
[/web/action/need/springBoard]
[/web/opreceive/need/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
......@@ -541,19 +544,19 @@ ApplicationStatus：
}
```
## **<a name="getItemByNeedNo"> 获取需求详情</a>**
## **<a name="getItemByChannelNeedNo"> 获取需求详情</a>**
[返回到目录](#menu)
##### URL
[/web/action/need/springBoard]
[/web/opreceive/need/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
#### 渠道执行的类型 actionType：getItemByNeedNo
#### 渠道执行的类型 actionType：getItemByChannelNeedNo
``` javascript
{
"actionType":"getItemByNeedNo",
"actionType":"getItemByChannelNeedNo",
"actionBody":{
"needNo":"NS202004131008iKPRDB"
}
......@@ -567,28 +570,28 @@ ApplicationStatus：
data:
{ id: 559,
uapp_id: 18,
needNo: 'N202004132334EjurnEr',
channelNeedNo: '20200413210610000001',
channelUserId: '13800138000',
followManUserId: '100',
followManMobile: '13075556693',
city: '9',
province: null,
publishContent: 'icp需求测试_005',
publishName: '张三',
publishMobile: '13800138000',
notes: null,
followContent:
needNo: 'N202004132334EjurnEr', //需求号--用于服务商或需求表中创建订单
channelNeedNo: '20200413210610000001', //渠道需求号
channelUserId: '13800138000', //渠道用户唯一码
followManUserId: '100', //跟进者唯一码
followManMobile: '13075556693', //跟进者手机号
city: '9', //城市
province: null, //省份
publishContent: 'icp需求测试_005', //发布内容
publishName: '张三', //发布者姓名
publishMobile: '13800138000', //发布者手机号
notes: null, //备注
followContent: //跟进内容
{ content: 'icp提交到方案', followDate: '2020-04-14T01:53:33.521Z' },
disposeNotes: null,
status: 'wts',
typeCode: 'icpsq',
typeName: 'icp申请',
channelTypeCode: '7',
channelTypeName: 'icp申请',
publisherOnlyCode: null,
followManName: '13075556693',
followManOnlyCode: '13075556693' } }
disposeNotes: null, //处理的备注
status: 'wts', //状态
typeCode: 'icpsq',　　　//类型编码
typeName: 'icp申请',　　　//类型名称
channelTypeCode: '7',　　　　//渠道类型编码
channelTypeName: 'icp申请',　　　//渠道类型名称
publisherOnlyCode: null,　　　　//发布者唯一码
followManName: '13075556693',　　　//跟进人姓名　　
followManOnlyCode: '13075556693'　　　//跟进者唯一码 } }
```
......
center-channel/app/front/entry/public/apidoc/platform/tmOrder.md
......@@ -8,6 +8,7 @@
1. [商标订单修改-修改申请人信息](#updateCustomerInfo)
1. [商标订单修改-修改交官材料](#updateOfficial)
1. [商标方案确认](#tmConfirm)
1. [推送委托书模板邮件(阿里云)](#sendAliWtsEmail)
## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
[返回到目录](#menu)
......@@ -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"
}
```
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment