Skip to content

Z
zhichan
Commit 8803fdb1 by Sxy
Options

fix: 更改请求融易算地址

parent 87a6f402
Showing with 51 additions and 50 deletions
tx-fi-tax/app/base/controller/impl/bizchance/bizoptCtl.js
......@@ -121,9 +121,9 @@ class BizOptCtl extends CtlBase {
}
*/
async closeBizopt(mobj, qobj, req) {
console.log("bizoptCtl:closeBizopt:mobj-----------------",JSON.stringify(mobj));
console.log("bizoptCtl:closeBizopt:mobj-----------------", JSON.stringify(mobj));
let pobj = mobj.d;
console.log("bizoptCtl:closeBizopt:pobj-----------------",JSON.stringify(pobj));
console.log("bizoptCtl:closeBizopt:pobj-----------------", JSON.stringify(pobj));
pobj.business_status = "isClosed";
if (!pobj.demand_code || !pobj.close_reason) {
return system.getResultError("缺少必要参数.");
......@@ -131,7 +131,7 @@ class BizOptCtl extends CtlBase {
//根据需求编号去更新该条需求的状态为已关闭
try {
let res = await this.service.updateStatusByDemandCode(pobj);
console.log("bizoptCtl:closeBizopt:res-----------------",JSON.stringify(res));
console.log("bizoptCtl:closeBizopt:res-----------------", JSON.stringify(res));
//添加到记录表
pobj.operator = {
......@@ -144,7 +144,7 @@ class BizOptCtl extends CtlBase {
remarks: pobj.remarks
}
let recordRes = await this.operationrecordSve.insertInfo(pobj);
console.log("bizoptCtl:operationrecordSve-----------------",JSON.stringify(recordRes));
console.log("bizoptCtl:operationrecordSve-----------------", JSON.stringify(recordRes));
//异步将该需求关闭信息同步到其他系统(走队列，融易算接口文档2.3)
//构造参数，添加判断(有方案信息的才走队列同步到融易算，没有的直接关闭)
let schemeRes = await this.schemeSve.findInfo(pobj);
......@@ -157,16 +157,16 @@ class BizOptCtl extends CtlBase {
console.log("bizoptCtl:closeBizopt-----------------关闭需求成功");
return system.getResult("关闭需求成功!");
} catch (error) {
console.log("bizoptCtl/closeBizopt 关闭需求出错------------------",error);
console.log("bizoptCtl/closeBizopt 关闭需求出错------------------", error);
return system.getResultError("bizoptCtl/closeBizopt 关闭需求出错!");
}
}
async testCloseProposal(obj){
async testCloseProposal(obj) {
console.log("testCloseProposal-------------------");
return {
"requestId": "d51aa427-738f-4bed-b48d-282da0a74432",
"status":1,
"status": 1,
"success": true,
"errorCode": 0,
"errorMsg": "ok",
......@@ -177,8 +177,8 @@ class BizOptCtl extends CtlBase {
}
buildObj(pobj, schemeRes) {
//let pushUrl = this.rysUrl + "leads/proposal/close";
let pushUrl = this.rysUrl + "/web/bizchance/bizoptCtl/testCloseProposal";
let pushUrl = this.rysUrl + "/leads/proposal/close";
// let pushUrl = this.rysUrl + "/web/bizchance/bizoptCtl/testCloseProposal";
let solutionBizId;
if (schemeRes.solution_bizid) {
solutionBizId = schemeRes.solution_bizid.replace(/_book/g, "");
......@@ -248,7 +248,7 @@ class BizOptCtl extends CtlBase {
var followUpinfos = await this.operationrecordSve.findAllInfo(pobj); //线索记录
var rtn = { bizoptInfo: bizoptInfo, companyInfo: companyInfo, schemeInfo: schemeInfo, followUpinfos: followUpinfos };
console.log("获取记录详情页所有信息-------------------",JSON.stringify(rtn));
console.log("获取记录详情页所有信息-------------------", JSON.stringify(rtn));
return system.getResult(rtn);
} catch (error) {
......@@ -410,7 +410,7 @@ class BizOptCtl extends CtlBase {
/*插入数据信息 */
async insertInfo(nobj, qobj, req) {
console.log("融易算需求插入参数-------------------------------------------",JSON.stringify(nobj));
console.log("融易算需求插入参数-------------------------------------------", JSON.stringify(nobj));
var pobj = nobj.actionBody;
if (pobj.intentionBizId && pobj.intentionBizId != 'undefined') {
try {
......@@ -434,7 +434,7 @@ class BizOptCtl extends CtlBase {
//插入操作
var buInfo = await this.service.insertInfo(pobj);
console.log("融易算需求插入结果-----------------------------------------",JSON.stringify(buInfo));
console.log("融易算需求插入结果-----------------------------------------", JSON.stringify(buInfo));
if (buInfo) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);
//日志
......@@ -457,7 +457,7 @@ class BizOptCtl extends CtlBase {
}
} catch (error) {
//异常处理
console.log("融易算需求插入异常-------------------------",error);
console.log("融易算需求插入异常-------------------------", error);
return system.getResultError(error);
}
} else {
......@@ -469,7 +469,7 @@ class BizOptCtl extends CtlBase {
/*根据需求编号更新需求状态*/
async updatepayStatusByDemandCode(mobj, qobj, req) {
console.log("融易算更新需求状态参数-----------------------",JSON.stringify(mobj));
console.log("融易算更新需求状态参数-----------------------", JSON.stringify(mobj));
var pobj = mobj.actionBody;
if (pobj.solutionBizId && pobj.solutionBizId != 'undefined') {
try {
......@@ -478,7 +478,7 @@ class BizOptCtl extends CtlBase {
pobj.business_status = 'isFinished';
}
var res = await this.service.findInfoByDemandCode(pobj);
console.log("融易算更新需求返回结果-----------------------",JSON.stringify(res));
console.log("融易算更新需求返回结果-----------------------", JSON.stringify(res));
if (res) {
Object.assign(res.business_info, { "payStatus": "已支付" })
await res.update({ business_info: res.business_info })
......@@ -488,7 +488,7 @@ class BizOptCtl extends CtlBase {
return system.getResultError("更新需求状态出错");
}
} catch (error) {
console.log("融易算更新需求返回error-----------------------",error);
console.log("融易算更新需求返回error-----------------------", error);
return system.getResultError(error);
}
} else {
......
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -17,6 +17,7 @@ class DeliverybillCtl extends CtlBase {
this.cacheManager = system.getObject("db.common.cacheManager");
this.fitaxschemeService = system.getObject("service.bizchance.fitaxschemeSve");
this.bizoptService = system.getObject("service.bizchance.bizoptSve");
this.rysUrl = settings.rysUrl();
}
/**
......@@ -77,11 +78,11 @@ class DeliverybillCtl extends CtlBase {
}
}
const rs = await this.service.updateOrderStatus(pobj);
console.log("updateOrderStatus--------------rs",JSON.stringify(rs));
console.log("updateOrderStatus--------------rs", JSON.stringify(rs));
return system.getResult(rs);
} catch (err) {
console.log("updateOrderStatus--------------error",err);
console.log("updateOrderStatus:err.message--------------error",err.message);
console.log("updateOrderStatus--------------error", err);
console.log("updateOrderStatus:err.message--------------error", err.message);
return system.getResult(null, err.message)
}
}
......@@ -93,7 +94,7 @@ class DeliverybillCtl extends CtlBase {
* @param {*} req
*/
async setupBill(pobj, qobj, req) {
console.log("deliveryCtl:setupBill:pobj--------------------------------"+JSON.stringify(pobj));
console.log("deliveryCtl:setupBill:pobj--------------------------------" + JSON.stringify(pobj));
try {
if (!pobj.deliverId) {
throw new Error("deliverId 不能为空");
......@@ -102,10 +103,10 @@ class DeliverybillCtl extends CtlBase {
throw new Error("参数不能为空");
}
const rs = await this.service.setupBill(pobj);
console.log("deliveryCtl:setupBill:rs--------------------------------"+JSON.stringify(rs));
console.log("deliveryCtl:setupBill:rs--------------------------------" + JSON.stringify(rs));
return system.getResult(rs);
} catch (err) {
console.log("deliveryCtl:setupBill:err--------------------------------"+err);
console.log("deliveryCtl:setupBill:err--------------------------------" + err);
return system.getResult(null, err.message)
}
}
......@@ -174,7 +175,7 @@ class DeliverybillCtl extends CtlBase {
}
}));
} catch (err) {
console.log("delivergCtr:getChannelCompany:err-------------------------------------------"+err);
console.log("delivergCtr:getChannelCompany:err-------------------------------------------" + err);
return system.getResult(null, err.message)
}
}
......@@ -199,7 +200,7 @@ class DeliverybillCtl extends CtlBase {
obj.delivery_code = pobj.orderId + "_book";
obj.source_number = "tx";
if (pobj.solutionBizId) {
obj.scheme_number = pobj.solutionBizId+"_book";
obj.scheme_number = pobj.solutionBizId + "_book";
var scheme = await this.fitaxschemeService.findInfoByBizid({ "bizId": pobj.solutionBizId });
if (scheme) {
obj.demand_code = scheme.demand_code;
......@@ -260,7 +261,7 @@ class DeliverybillCtl extends CtlBase {
//更新融易算服务实例
async updateServer(mobj, qobj, req) {
console.log("更新融易算服务实例参数--------------------------",JSON.stringify(mobj));
console.log("更新融易算服务实例参数--------------------------", JSON.stringify(mobj));
try {
var pobj = mobj.actionBody;
var cachestr = sha235(JSON.stringify(pobj));
......@@ -298,7 +299,7 @@ class DeliverybillCtl extends CtlBase {
"biz_id": pobj.bizId
};
const rs = await this.service.updateServer(obj);
console.log("更新融易算服务返回结果--------------------------",JSON.stringify(rs));
console.log("更新融易算服务返回结果--------------------------", JSON.stringify(rs));
if (rs) {
await this.cacheManager["TxCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
return {
......@@ -314,7 +315,7 @@ class DeliverybillCtl extends CtlBase {
}
}
catch (err) {
console.log("更新融易算服务返回错误结果--------------------------",error);
console.log("更新融易算服务返回错误结果--------------------------", error);
return system.getResult(null, err.message)
}
}
......@@ -337,7 +338,7 @@ class DeliverybillCtl extends CtlBase {
//服务状态变更通知
async notifyServiceStatusChange(pobj, qobj, req) {
console.log("融易算服务状态变更通知参数--------------------------",JSON.stringify(pobj));
console.log("融易算服务状态变更通知参数--------------------------", JSON.stringify(pobj));
let ab = pobj.actionBody;
if (!ab.requestId || ab.requestId == "undefined") {
return system.getResultFail(-1, "请求id不能为空");
......@@ -363,7 +364,7 @@ class DeliverybillCtl extends CtlBase {
// 变更服务状态
let whereObj = { biz_id: ab.bizId };
let rtn = await this.service.findOne(whereObj);
console.log("融易算服务状态变更通知返回结果--------------------------",JSON.stringify(rtn));
console.log("融易算服务状态变更通知返回结果--------------------------", JSON.stringify(rtn));
if (!rtn) {
return system.getResultFail(-1, "未知服务信息");
}
......@@ -388,14 +389,14 @@ class DeliverybillCtl extends CtlBase {
}
}
catch (err) {
console.log("融易算服务状态变更通知返回错误结果--------------------------",error);
console.log("融易算服务状态变更通知返回错误结果--------------------------", error);
return system.getResultError(err);
}
}
//接收票据快递单号
async receivePaperPost(pobj, qobj, req) {
console.log("融易算接收票据快递单号参数--------------------------",JSON.stringify(pobj));
console.log("融易算接收票据快递单号参数--------------------------", JSON.stringify(pobj));
var deliverInfo = await this.service.getInfo({ "bizId": pobj.bizNo });
if (deliverInfo) {
var param = {
......@@ -411,7 +412,7 @@ class DeliverybillCtl extends CtlBase {
var reqUrl = settings.ftConfig.url + "/customerReceiveBill/addCusReceiveBill";
var result = await rc.execPost(param, reqUrl);
var j = JSON.parse(result.stdout);
console.log("融易算接收票据快递单号返回结果--------------------------",JSON.stringify(j));
console.log("融易算接收票据快递单号返回结果--------------------------", JSON.stringify(j));
if (j.status == 1) {
return system.getResult(result);
}
......@@ -430,11 +431,11 @@ class DeliverybillCtl extends CtlBase {
}
async testPaperPostConfirm(obj){
async testPaperPostConfirm(obj) {
console.log("testCloseProposal-------------------");
return {
"requestId": "d51aa427-738f-4bed-b48d-282da0a74432",
"status":1,
"status": 1,
"success": true,
"errorCode": 0,
"errorMsg": "ok",
......@@ -445,7 +446,7 @@ class DeliverybillCtl extends CtlBase {
//票据快递情况反馈
async confirmPaperPost(pobj, qobj, req) {
console.log("融易算接收票据快递情况反馈参数--------------------------",JSON.stringify(pobj));
console.log("融易算接收票据快递情况反馈参数--------------------------", JSON.stringify(pobj));
var deliverInfo = await this.service.findByClientId({ "vftClientId": pobj.customer_id });
if (deliverInfo) {
var param = {
......@@ -461,8 +462,8 @@ class DeliverybillCtl extends CtlBase {
}
}
var pushObj = {
//"pushUrl": this.rysUrl + "service/paperPost/confirm",
"pushUrl": this.rysUrl + "/web/bizchance/deliverybillCtl/testPaperPostConfirm",
"pushUrl": this.rysUrl + "/service/paperPost/confirm",
// "pushUrl": this.rysUrl + "/web/bizchance/deliverybillCtl/testPaperPostConfirm",
"actionType": "confirm",
"messageBody": param,
"headData": {
......@@ -480,11 +481,11 @@ class DeliverybillCtl extends CtlBase {
}
}
async testfeedback(obj){
async testfeedback(obj) {
console.log("testfeedback-------------------");
return {
"requestId": "d51aa427-738f-4bed-b48d-282da0a74432",
"status":1,
"status": 1,
"success": true,
"errorCode": 0,
"errorMsg": "ok",
......
tx-fi-tax/app/base/controller/impl/bizchance/fitaxschemeCtl.js
......@@ -26,7 +26,7 @@ class FitaxschemeCtl extends CtlBase {
//构造参数
let pushObj = this.buildObj(pobj);
system.queueOper(pushObj);
console.log("fitasschemeCtl:insertInfo:queueOper--------------------新建方案成功" );
console.log("fitasschemeCtl:insertInfo:queueOper--------------------新建方案成功");
return system.getResult("新建方案成功!");
} catch (error) {
console.log("fitaxschemeCtl/insertInfo---------------------------------------------------------------- " + error);
......@@ -40,7 +40,7 @@ class FitaxschemeCtl extends CtlBase {
* @param {*} req
*/
async updateInfo(pobj, qobj, req) {
console.log("fitaxscjemeCtl:updateInfo:pobj--------------------",JSON.stringify(pobj));
console.log("fitaxscjemeCtl:updateInfo:pobj--------------------", JSON.stringify(pobj));
let obj = {};
if (pobj.actionBody.messageBody.IntentionBizId) {//需求编号
obj.demand_code = pobj.actionBody.messageBody.IntentionBizId + "_book";
......@@ -78,11 +78,11 @@ class FitaxschemeCtl extends CtlBase {
}
}
async testCreateProposal(pobj){
async testCreateProposal(pobj) {
console.log("testCreateProposal-------------------");
return {
"requestId": "d51aa427-738f-4bed-b48d-282da0a74432",
"status":1,
"status": 1,
"success": true,
"errorCode": 0,
"errorMsg": "ok",
......@@ -94,8 +94,8 @@ class FitaxschemeCtl extends CtlBase {
}
buildObj(pobj) {
//let pushUrl = this.rysUrl + "leads/proposal/create";
let pushUrl = this.rysUrl + "/web/bizchance/fitaxschemeCtl/testCreateProposal";
let pushUrl = this.rysUrl + "/leads/proposal/create";
// let pushUrl = this.rysUrl + "/web/bizchance/fitaxschemeCtl/testCreateProposal";
let notifyUrl = this.bookUrl + "/web/bizchance/fitaxschemeCtl/updateInfo";
let companyType, sreaCode, quantity, taxQualify;
if (pobj.company_type) { //公司类型
......
tx-fi-tax/app/base/utils/toFtClient.js
......@@ -141,8 +141,8 @@ const feedbackToRys = async (data) => {
}
}
let resData = await system.queueOper({
//pushUrl: this.rysUrl + "service/feedback",
pushUrl: settings.rysUrl() + "/web/bizchance/deliverybillCtl/testfeedback",
pushUrl: settings.rysUrl() + "/service/feedback",
// pushUrl: settings.rysUrl() + "/web/bizchance/deliverybillCtl/testfeedback",
actionType: "feedback",
messageBody: reqData,
headData: {
......
tx-fi-tax/app/config/routes/api.js
......@@ -61,13 +61,13 @@ module.exports = function (app) {
console.log(JSON.stringify(req.body));
await deliverService.fromFtToRys(JSON.parse(req.body.info));
res.json({
status: 0,
code: 1,
msg: "SUCCESS",
data: "SUCCESS",
});
} catch (err) {
res.json({
status: -1,
status: 0,
msg: err.message,
data: null,
});
......
tx-fi-tax/app/config/settings.js
......@@ -63,7 +63,7 @@ var settings = {
if (this.env == "localhost") {
return "http://192.168.1.6:8889";
} else {
return "http://bookdeliver-service";
return "http://abk.tencentyun.com";
}
},
bookUrl: function () {
......
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