Skip to content

Z
zhichan
Commit b5efa562 by 王勇飞
Options

gyq

parent a0e4e563
Showing with 77 additions and 43 deletions
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -10,7 +10,7 @@ class BizOptCtl extends CtlBase {
super("bizchance", CtlBase.getServiceName(BizOptCtl));
this.schemeService = system.getObject("service.bizchance.schemeSve");
this.logService = system.getObject("service.bizchance.statuslogSve");
this.receiveUrl = "http://192.168.1.128:4011/api/receive/entService/springBoard";
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
}
......@@ -159,6 +159,7 @@ class BizOptCtl extends CtlBase {
pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
pobj.sourceNumber = "1111111";
pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
var buInfo = await this.service.insertInfo(pobj);
var logInfo = {
"flowType":"BIZ",
......@@ -177,6 +178,8 @@ class BizOptCtl extends CtlBase {
}
catch(error){
console.log("TTTTTTTTTTTTTTTTTTTTTTT");
console.log(error);
return system.getResultError(error);
}
}
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -11,7 +11,7 @@ class DeliverybillCtl extends CtlBase {
this.materialService = system.getObject("service.bizchance.materialSve");
this.schemeService = system.getObject("service.bizchance.schemeSve");
this.logService = system.getObject("service.bizchance.statuslogSve");
this.receiveUrl = "http://192.168.1.128:4011/api/receive/entService/springBoard";
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
}
......@@ -35,18 +35,11 @@ class DeliverybillCtl extends CtlBase {
robj.serviceName = element.facilitator_name;
robj.baseInfo = element.delivery_info;//交付单详情
robj.payStatus = element.delivery_info.payStatus;//交付状态
<<<<<<< HEAD
robj.costPrice = this.FenToYuan(element.cost_price);//成本
robj.settleStatus = element.settle_status;
if (robj.businessName == '公司注册') {
if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是") {//如果有刻章需求或者是虚拟地址
=======
robj.costPrice = element.cost_price;//成本
robj.settle_status=element.settle_status;
robj.settlebill=element.settlebill;
if (robj.businessName == '公司注册'){
if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是"){//如果有刻章需求或者是虚拟地址
>>>>>>> 901900a178eab18cd3e4171b03f80dbaa5ca62e5
robj.relatedProducts = '有';
}
else {
......@@ -273,13 +266,15 @@ class DeliverybillCtl extends CtlBase {
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
console.log("RRRRRRRRRRRRRR");
console.log(JSON.stringify(j));
if (j.status == 1) {
//更新详情
var uarr = {
"deliverNumber": pobj.deliverNumber,
"baseInfo": rs.delivery_info
};
await this.service.updateInfoByDesliverCode(uarr);
await this.service.updateInfoByDeliverCode(uarr);
return system.getResult("更新成功");
}
else {
......@@ -292,10 +287,13 @@ class DeliverybillCtl extends CtlBase {
}
catch (error) {
console.log("##########");
console.log(error);
return system.getResultError(error);
}
}
else {
console.log("参数错误" + pobj);
return system.getResultError("参数错误！");
}
}
......@@ -373,7 +371,7 @@ class DeliverybillCtl extends CtlBase {
//更新材料信息
await this.materialService.updateInfoByDeliverNumber(pobj);
//return system.getResult("操作成功！");
//传给庄冰，放队列
//传给庄冰，tongbu
baseInfo.clerkName = rs.salesman_name;//业务员名称
baseInfo.clerkPhone = rs.salesman_phone;
pobj.baseInfo = baseInfo;
......@@ -415,17 +413,10 @@ class DeliverybillCtl extends CtlBase {
}
<<<<<<< HEAD
async settleApply(p, q, req) {
let ids = p.ids
let rtn = await this.service.settleApply(ids, req.userid, req.username)
return system.getResult({})
=======
async settleApply(p,q,req){
let ids=p.ids
let rtn=await this.service.settleApply(ids,p.userid,p.username)
return system.getResult({})
>>>>>>> 901900a178eab18cd3e4171b03f80dbaa5ca62e5
}
/*根据商机编号插入交付单信息*/
async insertInfo(pobj, qobj, req) {//队列的时候用
......
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
......@@ -10,7 +10,7 @@ class SchemeCtl extends CtlBase {
super("bizchance", CtlBase.getServiceName(SchemeCtl));
this.bizoptService = system.getObject("service.bizchance.bizoptSve");
this.logService = system.getObject("service.bizchance.statuslogSve");
this.receiveUrl = "http://192.168.1.128:4011/api/receive/entService/springBoard";
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
// this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
}
......
ic-deliver/app/base/db/impl/bizchance/bizoptDao.js
......@@ -80,6 +80,9 @@ class BizoptDao extends Dao {
if (qobj.serviceName && qobj.serviceName != 'undefined'){
obj.business_info.serviceName = qobj.serviceName;
}
if (qobj.businessName && qobj.businessName != 'undefined'){
obj.business_info.businessName = qobj.businessName;
}
if (qobj.servicerCode && qobj.servicerCode != 'undefined') {
obj.facilitator_id = qobj.servicerCode;
}
......
ic-deliver/app/base/db/metadata/app/platform.js
......@@ -143,28 +143,54 @@ module.exports = {
},
"registeredAreaDict": {//注册地区
"beijing": "北京市",
"shanghai": "上海市",
"hangzhou": "杭州市",
"qingdao": "青岛市",
"suzhou": "苏州市",
"tianjin": "天津市",
"ningbo": "宁波市",
"najing": "南京市",
"wuxi": "无锡市",
"jinan": "济南市",
"wenzhou": "温州市",
"shijiazhuang": "石家庄市",
"jinhua": "金华市",
"changzhou": "常州市",
"nantong": "南通市",
"xuzhou": "徐州市",
"jiaxing": "嘉兴市",
"taizhou": "台州市",
"shaoxing": "绍兴市",
"taiyuan": "太原市",
"yantai": "烟台市",
"yangzhou": "扬州市"
"110100":"北京",
"310100":"上海",
"330100":"杭州",
"370200":"青岛",
"320500":"苏州",
"330200":"宁波",
"320100":"南京",
"320200":"无锡",
"330300":"温州",
"130100":"石家庄",
"330700":"金华",
"320400":"常州",
"320600":"南通",
"320300":"徐州",
"330400":"嘉兴",
"331000":"台州",
"330600":"绍兴",
"140100":"太原",
"370600":"烟台",
"321000":"扬州",
"440100":"广州",
"440300":"深圳",
"510100":"成都",
"420100":"武汉",
"500100":"重庆",
"410100":"郑州",
"430100":"长沙",
"530100":"昆明",
"610100":"西安",
"441900":"东莞",
"350100":"福州",
"520100":"贵阳",
"360100":"南昌",
"440600":"佛山",
"120100":"天津",
"370100":"济南",
"210100":"沈阳",
"210200":"大连",
"230100":"哈尔滨",
"220100":"长春",
"340100":"合肥",
"410200":"开封",
"321300":"宿迁",
"370783":"寿光",
"442000":"中山",
"420500":"宜昌",
"350200":"厦门",
"350700":"南平"
},
"TaxpayerTypeDict": {//纳税人类型
......@@ -216,8 +242,19 @@ module.exports = {
},
"registeredParkDict": {//注册园区
"shanghai": "上海云上公司",
"beijing": "北京云上公司"
"410200":"开封",
"321300":"宿迁",
"310100":"上海",
"370783":"寿光",
"442000":"中山",
"420500":"宜昌",
"440600":"佛山",
"340100":"合肥",
"510100":"成都",
"500100":"重庆",
"350200":"厦门",
"350700":"南平",
"330100":"杭州"
},
"sealSevTypeDict": {//刻章类型
......
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