Skip to content

Z
zhichan
Commit 0d32ef85 by 宋毅
Options

tj

parent 4e83eb2b
Showing with 245 additions and 58 deletions
igirl-channel/app/base/api/impl/action/tmOrder.js
......@@ -63,6 +63,9 @@ class TmOrderAPI extends APIBase {
}
switch (action_type) {
// sy
case "getIcbcOrderDetails"://
opResult = await this.orderSve.getIcbcOrderDetails(pobj, req);
break;
case "againPushFqBusiness"://再次推送商机
opResult = await this.orderSve.againPushFqBusiness(pobj, req);
break;
......
igirl-channel/app/base/service/impl/dborder/orderSve.js
......@@ -11,8 +11,8 @@ class OrderService extends ServiceBase {
this.receiptvoucherDao = system.getObject("db.dborder.receiptvoucherDao");
this.customercontactsDao = system.getObject("db.dborder.customercontactsDao");
this.execClient = system.getObject("util.execClient");
this.fqReqUrl = "https://yunfuapi.gongsibao.com";//线上域名
// this.fqReqUrl = "https://yunfuapi-dev.gongsibao.com";//dev域名
// this.fqReqUrl = "https://yunfuapi.gongsibao.com";//线上域名
this.fqReqUrl = "https://yunfuapi-dev.gongsibao.com";//dev域名
this.restClient = system.getObject("util.restClient");
this.appDao = system.getObject("db.dbapp.appDao");
this.orderReceiptVoucherDao = system.getObject("db.dbcpay.orderreceiptvoucherDao");
......@@ -782,7 +782,40 @@ class OrderService extends ServiceBase {
});
}
}
async getIcbcOrderDetails(pobj, req) {//获取工商详情
var rc = system.getObject("util.aliyunClient");
var rtn = null;
var reqUrl = this.fqReqUrl + "/bigData/ic/formDetail";
var body = pobj.actionBody;
try {
rtn = await rc.post(reqUrl, body);
this.logCtl.info({
appid: req.app.id,
appkey: req.app.uappKey,
requestId: req.requestId || "",
op: "igirl-channel/app/base/service/impl/dborder/orderSve/getIcbcOrderDetails",
content: "请求地址：" + reqUrl + "，参数：" + JSON.stringify(body) + "，返回结果：" + JSON.stringify(rtn),
clientIp: pobj.clientIp,
optitle: "获取公司注册详情",
});
if (rtn.code != "200") {
return system.getResult(null, "获取公司注册详情失败，失败原因：" + rtn.errorMsg + "，selfrequestId=" + req.requestId + "，requestId=" + rtn.requestId);
}
return system.getResultSuccess(rtn.data, "ok");
} catch (e) {
//日志记录
this.logCtl.error({
appid: req.app.id,
appkey: req.app.uappKey,
requestId: req.requestId || "",
op: "igirl-channel/app/base/service/impl/dborder/orderSve/againPushFqBusiness",
content: "error：" + e.stack,
clientIp: pobj.clientIp,
optitle: "推送订单商机到FQ出错--again",
});
}
}
async gsbOrderInfo(pobj, req) {//公司宝官网订单
var rc = system.getObject("util.aliyunClient");
var rtn = null;
......@@ -1136,8 +1169,8 @@ class OrderService extends ServiceBase {
"totalSum": orderItem.totalSum,
"orderPayStatus": "yfk",
}
if(orderItem && orderItem.id && app && app.id && app.appSourceCode =='bw'){
self.pushDataToFq(orderItem,app);
if (orderItem && orderItem.id && app && app.id && app.appSourceCode == 'bw') {
self.pushDataToFq(orderItem, app);
}
return system.getResultSuccess(resdata);
});
......@@ -1152,9 +1185,9 @@ class OrderService extends ServiceBase {
// await this.pushDataToFq(order,app);
// }
//推送商标数据至fqboss(自助商标注册商标)
async pushDataToFq(order,app){
async pushDataToFq(order, app) {
var rtn = null;
var logObj={
var logObj = {
appid: app.id,
appkey: app.uappKey,
op: "orderSve.js/pushDataToFq",
......@@ -1162,25 +1195,25 @@ class OrderService extends ServiceBase {
returnType: '0',
opTitle: "商标数据推送-付款成功调用",
};
var url ="";
var reqObj={};//请求参数
var url = "";
var reqObj = {};//请求参数
try {
if(order && order.itemCode=='zzsbzc'){//自助商标注册
if (order && order.itemCode == 'zzsbzc') {//自助商标注册
url = settings.pushFqbossDataUrl() + "api/channelaccessApi/createChannelOrder";
if(!order.createuser_id){
logObj.content="订单用户id不存在";
if (!order.createuser_id) {
logObj.content = "订单用户id不存在";
await this.pushLog(logObj);
return;
}
var user = await this.appuserDao.model.findOne({//订单所属用户
where:{id:order.createuser_id},raw:true
where: { id: order.createuser_id }, raw: true
});
if(!user){
logObj.content="订单用户不存在";
if (!user) {
logObj.content = "订单用户不存在";
await this.pushLog(logObj);
return;
}
var channelUser={//渠道用户
var channelUser = {//渠道用户
"channelUserId": user.channelUserId,
"channelUserName": user.channelUserName,
"channelUserMoblie": user.userMoblie,
......@@ -1189,14 +1222,14 @@ class OrderService extends ServiceBase {
"orgPath": user.orgPath
};
var otmp = await this.ordertmproductDao.model.findOne({//订单交付单
where:{sourceOrderNo:order.orderNo,app_id:app.id},raw:true
where: { sourceOrderNo: order.orderNo, app_id: app.id }, raw: true
});
if(!otmp){
logObj.content="订单交付单不存在";
if (!otmp) {
logObj.content = "订单交付单不存在";
await this.pushLog(logObj);
return;
}
var channelOrder={//渠道订单
var channelOrder = {//渠道订单
"channelServiceNo": otmp.channelServiceNo,
"channelOrderNo": otmp.channelOrderNo,
"needNo": otmp.needNo,
......@@ -1204,42 +1237,42 @@ class OrderService extends ServiceBase {
"payTime": new Date()
};
var ci = await this.customerinfoDao.model.findOne({
where:{app_id:app.id,deliveryOrderNo:otmp.deliveryOrderNo},raw:true
where: { app_id: app.id, deliveryOrderNo: otmp.deliveryOrderNo }, raw: true
});
if(!ci){
logObj.content="订单申请人信息为空";
if (!ci) {
logObj.content = "订单申请人信息为空";
await this.pushLog(logObj);
return;
}
var contacts = await this.customercontactsDao.model.findOne({
where:{app_id:app.id,deliveryOrderNo:otmp.deliveryOrderNo},raw:true
where: { app_id: app.id, deliveryOrderNo: otmp.deliveryOrderNo }, raw: true
});
if(!contacts){
logObj.content="订单申请联系人信息为空";
if (!contacts) {
logObj.content = "订单申请联系人信息为空";
await this.pushLog(logObj);
return;
}
var apply={//申请人信息
var apply = {//申请人信息
"applyAddr": ci.applyAddr,
"applyArea": ci.applyArea,
"businessLicensePic": ci.businessLicensePic,
"businessLicensePdf": ci.businessLicensePdf,
"code": ci.code,
"customerType":ci.customerType,
"customerType": ci.customerType,
"contacts": contacts.name,
"email":contacts.email,
"fax":contacts.fax,
"identityCardNo":ci.identityCardNo,
"identityCardPic":ci.identityCardPic,
"identityCardPdf":ci.identityCardPdf,
"mobile":contacts.mobile,
"name":ci.name,
"notes":ci.notes,
"gzwtsUrl":otmp.gzwtsUrl,
"smwjUrl":otmp.smwjUrl,
"zipCode":ci.zipCode
"email": contacts.email,
"fax": contacts.fax,
"identityCardNo": ci.identityCardNo,
"identityCardPic": ci.identityCardPic,
"identityCardPdf": ci.identityCardPdf,
"mobile": contacts.mobile,
"name": ci.name,
"notes": ci.notes,
"gzwtsUrl": otmp.gzwtsUrl,
"smwjUrl": otmp.smwjUrl,
"zipCode": ci.zipCode
};
var tm= {//商标信息
var tm = {//商标信息
"colorizedPicUrl": otmp.colorizedPicUrl,
"tmName": otmp.tmName,
"picUrl": otmp.picUrl,
......@@ -1250,27 +1283,27 @@ class OrderService extends ServiceBase {
"totalTaxes": order.totalTaxes
};
var tms = await this.trademarkDao.model.findAll({
where:{app_id:app.id,deliveryOrderNo:otmp.deliveryOrderNo},raw:true
where: { app_id: app.id, deliveryOrderNo: otmp.deliveryOrderNo }, raw: true
});
if(!tms || tms.length<1){
logObj.content="商标信息为空";
if (!tms || tms.length < 1) {
logObj.content = "商标信息为空";
await this.pushLog(logObj);
return;
}
var nclones=[];
for(var i=0;i<tms.length;i++){
var nclone= {
var nclones = [];
for (var i = 0; i < tms.length; i++) {
var nclone = {
"code": tms[i].nclOneCodes,
"name": tms[i].nclOneCodesName,
"nclThree": tms[i].nclSmallCodes?JSON.parse(tms[i].nclSmallCodes):"",
"tbCode":tms[i].tbCode
"nclThree": tms[i].nclSmallCodes ? JSON.parse(tms[i].nclSmallCodes) : "",
"tbCode": tms[i].tbCode
};
nclones.push(nclone);
}
reqObj={//请求参数汇总
itemCode:order.itemCode,channelUser:channelUser,channelOrder:channelOrder,tm:tm,apply:apply,
nclones:nclones,appid:"2e787bbaacda4c6488b9fae58fff30ba",channelCode:app.appSourceCode,
channelUserId:user.channelUserId,deliveryOrderNo:otmp.deliveryOrderNo
reqObj = {//请求参数汇总
itemCode: order.itemCode, channelUser: channelUser, channelOrder: channelOrder, tm: tm, apply: apply,
nclones: nclones, appid: "2e787bbaacda4c6488b9fae58fff30ba", channelCode: app.appSourceCode,
channelUserId: user.channelUserId, deliveryOrderNo: otmp.deliveryOrderNo
};
rtn = await this.execClient.execPost(reqObj, url);
var returnType = "0";
......@@ -1289,15 +1322,15 @@ class OrderService extends ServiceBase {
returnType: returnType,
opTitle: "商标数据推送-付款成功调用",
});
return ;
}else if(order.itemCode=='fzsbzc' || order.itemCode=='dbsbzc'){//辅助/担保商标注册
return;
} else if (order.itemCode == 'fzsbzc' || order.itemCode == 'dbsbzc') {//辅助/担保商标注册
var productItem = await this.appproductDao.findOneByChannelItemCode(order.channelItemCode, app.id);//获取产品
if (!productItem) {
logObj.content="订单产品信息为空";
logObj.content = "订单产品信息为空";
await this.pushLog(logObj);
return;
}
await this.pushFqBusiness("tm_", order, productItem.pushServiceItemCode, {clientIp:""}, {app:app});
await this.pushFqBusiness("tm_", order, productItem.pushServiceItemCode, { clientIp: "" }, { app: app });
return;
}
} catch (e) {
......@@ -1310,7 +1343,7 @@ class OrderService extends ServiceBase {
returnType: '0',
opTitle: "商标数据推送-付款成功调用",
});
return ;
return;
}
}
......
igirl-channel/app/base/utils/aliyunClient.js
......@@ -2,8 +2,8 @@ const Client = require('aliyun-api-gateway').Client;
var RPCClient = require('@alicloud/pop-core').RPCClient;
// const client = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');//开发
const client = new Client('203763771', 'e5e2ytnn6nrkr9qnqk4w5e6z0xlhkznu');//线上
const client = new Client('203756805', 'crkyej0xlmqa6bmvqijun6ltxparllyn');//开发
// const client = new Client('203763771', 'e5e2ytnn6nrkr9qnqk4w5e6z0xlhkznu');//线上
class aliyunClient {
constructor() {
// this.aliReqUrl = "https://aliapi.gongsibao.com/tm/springboard";
......
igirl-channel/app/front/entry/public/apidoc/README.md
......@@ -21,3 +21,6 @@
## 3. 用户中心相关接口
　　1 [用户中心](doc/api/user/user.md)
## 4. 工商相关接口
　　1 [商标检索中心](doc/api/opTrademark/icbc.md)
\ No newline at end of file
igirl-channel/app/front/entry/public/apidoc/opTrademark/icbc.md 0 → 100644
<a name="menu" href="/doc">返回主目录</a>
1. [获取公司注册详情信息](#getIcbcOrderDetails)
## **<a name="getIcbcOrderDetails"> 获取公司注册详情信息</a>**
[返回到目录](#menu)
##### URL
[/action/tmOrder/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：getIcbcOrderDetails
``` javascript
{
"idempotentNo":"203915601880842" //Y string 订单号（orderNo）
}
```
#### 返回结果
```javascript
{
"status": 0,//0成功，否则失败
"msg": "ok",
"data": {
"orgType": "股份有限公司", //--公司组织形式(股份 有限 集团)
"addressType": "自有地址",//--地址类型（自有地址,非自有地址）
"companyName": "申达股份电饭锅",//--公司名称（全称）
"capital": "1000",//--注册资本（万元）
"detailAddress": "朝阳区来广营西路8号国创产业园6号楼B门3层东1区",//--详细办公地址
"industryType": "不限行业（金融投资除外）",//--公司行业分类
"area": "北京市-北京市-朝阳区",//--注册区域 （朝阳区）
"scope": "实业投资;股权投资;投资咨询;资产管理;税务服务;财务、税务咨询服务;互联网软、硬件产品研发、销售、技术服务、系统集成服务;数据服务;金属材料热处理及表面改性设备的技术开发、技术咨询、制造、销售及维修服务;房屋、设备租赁。(依法须经批准的项目,经相关部门批准后方可开展经营活动)",//--经营范围
"capiDate": "20年",//--实缴日期
"companyType": "内资",//--公司类型(内资 外资 合资)
"deadline": "20年",//--经营期限
"city": "北京市",//--注册城市 （北京市）----接口暂时没有返回
"taxpayerType": "小规模",//--纳税人类别（小规模,一般纳税人）----接口暂时没有返回
"depositRatio": "6%",//--公积金缴存比例----接口暂时没有返回
"remark": "备注"// ----接口暂时没有返回
"attachFiles": [//--附件文件列表
{
"name": "租房合同 - 副本.png",//--附件名称
"type": "租赁合同扫描件",//--附件类型（业务类型）
"suffix": "png",//--文件后缀
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571923E4ECB747/%E7%A7%9F%E6%88%BF%E5%90%88%E5%90%8C+-+%E5%89%AF%E6%9C%AC.png?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=1HotwH1GwqUYMGedkXptd80A7Ek%3D&x-oss-process=image%2Fauto-orient%2C0"//--文件地址
},
{
"name": "租房合同.png",
"type": "租赁合同扫描件",
"suffix": "png",
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571923D1EEF06B/%E7%A7%9F%E6%88%BF%E5%90%88%E5%90%8C.png?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=OtZs%2Bjrx3%2Bz%2BSxxVUHIbgtRNa3w%3D&x-oss-process=image%2Fauto-orient%2C0"
},
{
"name": "租赁.jpg",
"type": "租赁合同扫描件",
"suffix": "jpg",
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571924A10E79E5/%E7%A7%9F%E8%B5%81.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=f7txi5hWMbNRbKWOg5bYMTUaUU4%3D&x-oss-process=image%2Fauto-orient%2C0"
},
{
"name": "产权证啊啊啊啊.jpg",
"type": "产权证复印件",
"suffix": "jpg",
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571916C49A39CC/%E4%BA%A7%E6%9D%83%E8%AF%81%E5%95%8A%E5%95%8A%E5%95%8A%E5%95%8A.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=6Jl%2FcU3lB54IpkmocuktlEf8D4M%3D&x-oss-process=image%2Fauto-orient%2C0"
},
{
"name": "是否产权人.png",
"type": "产权人身份证复印件",
"suffix": "png",
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571918AEF732F0/%E6%98%AF%E5%90%A6%E4%BA%A7%E6%9D%83%E4%BA%BA.png?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=Nvfeqf%2BHumfvVDNUDb0zYShnx84%3D&x-oss-process=image%2Fauto-orient%2C0"
},
{
"name": "住所证明.jpg",
"type": "住所证明扫描件",
"suffix": "jpg",
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/155806157191768E516AB/%E4%BD%8F%E6%89%80%E8%AF%81%E6%98%8E.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=Nzt8kh2DPQaSsWKDdqEAWHRAjdY%3D&x-oss-process=image%2Fauto-orient%2C0"
},
{
"name": "营业执照.png",
"type": "公司营业执照",
"suffix": "png",
"url": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571913847624AD/%E8%90%A5%E4%B8%9A%E6%89%A7%E7%85%A7.png?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=i6KkUJLLrDdIZDudCs1pcnYAo0M%3D&x-oss-process=image%2Fauto-orient%2C0"
}
],
"shareholder": [//--自然人股东/出资比例
{
"idCardUrlBack": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571920B5CD801B/%E6%AC%A1%E6%AC%A1+%E5%8F%8D.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=BbvvNUbP1icAVS6bKXSshFv7MAU%3D&x-oss-process=image%2Fauto-orient%2C0",//--身份证背面（附件）
"idCard": "146546465464646464",//--身份证
"phone": "18946164646",//--联系电话
"stockPercent": "100%",//--出资比例
"idCardUrlFace": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/155806159031860490969/ff.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=4%2Bj4a9HFJHkSNbaWc9%2By%2FUVqDNQ%3D&x-oss-process=image%2Fauto-orient%2C0",//--身份证正面（附件）
"address": "多个电饭锅电饭锅",//--身份证住址
"email": "sdf@163.com",//--邮箱
"stockName": "次次",//--股东名称
"idCardUrlInhand": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571921792DBB03/%E6%AC%A1%E6%AC%A1+%E6%89%8B%E6%8C%81.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=cSXq84chUxY08Ouyn%2BDXpPLYbkI%3D&x-oss-process=image%2Fauto-orient%2C0",//--身份证手持（附件）
"shouldCapi": "1000万"//--出资金额
}
],
"alternative": [ //--备选字号 [‘xxxx’,‘xxx’]
"北京创业嘉裕科技有限公司",
"北京家有老板科技有限公司",
"北京创业佳境科技有限公司"
],
"legalShareholder": [{//--法人股东列表
"stockName": "汉唐技术",//--法人股东名称
"stockPercent": "60%",//--出资比例
"shouldCapi": "600",//--出资金额（万元）
"creditCode": "91330110MA27WHUA0H",//--社会统一信用代码
"address": "北京市朝阳区创远路36号院10号楼",//--注册地址
"phone": "18888888888",//--联系电话
"email": "ht@gongsibao.com",//--邮箱
"businessLicense": "https://fengqing-cts-public.oss-cn-beijing.aliyuncs.com/upfile/1556249674596F609A74A/%E8%90%A5%E4%B8%9A%E6%89%A7%E7%85%A7.png"//--营业执照扫描件（附件）
}],
"logistics": {//--物流信息
"recipient": "张晓静",//--收件人
"recipientPostcode": "100000",//--收件人邮编
"recipientAddress": "北京市朝阳区创远路36号院10号楼1层102",//--收件人地址
"recipientPhone": "15044236963"//--收件人联系方式
},
"employees": [//--主要成员列表
{
"idCardUrlBack": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571920B5CD801B/%E6%AC%A1%E6%AC%A1+%E5%8F%8D.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=BbvvNUbP1icAVS6bKXSshFv7MAU%3D&x-oss-process=image%2Fauto-orient%2C0",//--身份证背面（附件）
"position": "法定代表人",//--职位
"phone": "18946465464",//--手机号
"idCardUrlFace": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061595000D10271B7/1553507239(1).png?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=Hl214aim3O%2B2NXT4GL6BAp1z9XQ%3D&x-oss-process=image%2Fauto-orient%2C0",//--身份证正面（附件）
"email": "sdf@163.com",//--邮箱
"address": "在相辅相成",//--住址
"fixPhone": "010-16546464",//--固话
"name": "次次",//--姓名
"idCardUrlInhand": "https://fengqing-cts-private.oss-cn-beijing.aliyuncs.com/upfile/1558061571921792DBB03/%E6%AC%A1%E6%AC%A1+%E6%89%8B%E6%8C%81.jpg?OSSAccessKeyId=LTAI4JXJQMbTL2EQ&Expires=1582173111&Signature=cSXq84chUxY08Ouyn%2BDXpPLYbkI%3D&x-oss-process=image%2Fauto-orient%2C0",//--身份证手持（附件）
"education": ""//--学历
},
{
"idCardUrlBack": "",
"position": "执行董事",
"phone": "",
"idCardUrlFace": "",
"email": "",
"address": "",
"fixPhone": "",
"name": "",
"idCardUrlInhand": "",
"education": ""
}
]
},
"requestId": "c76a7ff14dd6498c80b9240ff0d75bca"
}
```
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