Skip to content

Z
zhichan
Commit a966698c by 蒋勇
Options

Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

parents 47a0ef70 0739419f
Showing with 154 additions and 38 deletions
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
......@@ -14,6 +14,7 @@ class DeliverybillCtl extends CtlBase {
this.cacheService = system.getObject("service.bizchance.cacheinfoSve");
this.receiveUrl = "http://192.168.1.140:4011/api/receive/entService/springBoard";
this.queueUrl = "http://192.168.1.128:4018/api/queueAction/producer/springBoard";
this.wdyUrl = "http://192.168.1.113:4011/api/action/order/springBoard";
}
/*根据用户id获取商机信息，分页获取*/
......@@ -41,7 +42,7 @@ class DeliverybillCtl extends CtlBase {
robj.settle_status = element.settle_status;
robj.settlebill = element.settlebill;
if (robj.businessName == '公司注册') {
if (robj.baseInfo.isWhether == "是" || robj.baseInfo.isVirtual == "是") {//如果有刻章需求或者是虚拟地址
if (robj.baseInfo.isWhether == "yes" || robj.baseInfo.isVirtual == "yes") {//如果有刻章需求或者是虚拟地址
robj.relatedProducts = '有';
}
else {
......@@ -50,7 +51,7 @@ class DeliverybillCtl extends CtlBase {
}
else if (robj.businessName == '云上园区注册') {
robj.registeredType = element.delivery_info.registeredType;//园区注册时，根据该值跳界面
if (robj.baseInfo.isWhether == "是") {//如果有刻章需求或者是虚拟地址
if (robj.baseInfo.isWhether == "yes"|| robj.baseInfo.financial == "yes") {//如果有刻章需求或者是财税服务
robj.relatedProducts = '有';
}
else {
......@@ -78,23 +79,23 @@ class DeliverybillCtl extends CtlBase {
}
/*根据交付单编号获取交付单xinxi*/
async findInfoByDeliverCode(mobj, qobj, req){
async findInfoByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try{
try {
var rs = await this.service.findInfoByDeliverCode(pobj);
if (rs){
if (rs) {
return system.getResult(rs);
}
else{
else {
return system.getResultError("数据不存在");
}
}
catch(error){
catch (error) {
return system.getResultError(error);
}
}
else{
else {
return system.getResultError("参数错误！");
}
}
......@@ -119,6 +120,7 @@ class DeliverybillCtl extends CtlBase {
"expressInfo": {}
}
if (rs) {
console.log("D___________________________" + JSON.stringify(rs));
rarr.id = rs.id;//数据的id
rarr.baseInfo.deliverNumber = rs.delivery_code;//交付单编号
rarr.baseInfo.businessName = rs.product_name;//产品名称
......@@ -141,11 +143,11 @@ class DeliverybillCtl extends CtlBase {
rarr.baseInfo.serviceArea = appconfig.pdict.registeredAreaDict[rarr.serviceCode];//服务地区名称
}
if (rs.delivery_info.contactsName && rs.delivery_info.contactsName != 'undefined'){
if (rs.delivery_info.contactsName && rs.delivery_info.contactsName != 'undefined') {
rarr.contactsInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
rarr.baseInfo.contactsName = rs.delivery_info.contactsName;//联系人信息
}
if (rs.delivery_info.contactsPhone && rs.delivery_info.contactsPhone != 'undefined'){
if (rs.delivery_info.contactsPhone && rs.delivery_info.contactsPhone != 'undefined') {
rarr.contactsInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
rarr.baseInfo.contactsPhone = rs.delivery_info.contactsPhone;//联系电话信息
}
......@@ -178,9 +180,14 @@ class DeliverybillCtl extends CtlBase {
if (rs.delivery_info.buyTime && rs.delivery_info.buyTime != 'undefined') {
rarr.baseInfo.buyTime = rs.delivery_info.buyTime;//购买时间
}
if (rs.delivery_info.buyDuration && rs.delivery_info.buyDuration != 'undefined' && rarr.baseInfo.buyTime && rarr.baseInfo.buyTime != 'undefined') {
var d = new Date(rarr.baseInfo.buyTime);
rarr.baseInfo.endTime = this.oneYearPast(d, Number(rs.delivery_info.buyDuration));//到期时间
if (rs.delivery_info.startTime && rs.delivery_info.startTime != 'undefined') {
rarr.baseInfo.startTime = rs.delivery_info.startTime;//开始计费时间
}
if (rs.delivery_info.buyDuration && rs.delivery_info.buyDuration != 'undefined' && rarr.baseInfo.startTime && rarr.baseInfo.startTime != 'undefined') {
console.log("ddddddddddd____________________________"+ rarr.baseInfo.startTime );
var d = new Date(rarr.baseInfo.startTime);
console.log("ddddddddddd____________________________"+ d );
rarr.baseInfo.endTime = this.oneYearPast(d, 1);//到期时间
var ss = moment();
rarr.baseInfo.surplusDuration = this.diffDays(ss, rarr.baseInfo.endTime);//剩余时长
}
......@@ -218,6 +225,78 @@ class DeliverybillCtl extends CtlBase {
}
}
async updatestartTimeByDeliverCode(mobj, qobj, red) {//根据交付单编号更新开始计费时间
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.baseInfo.startTime && pobj.baseInfo.startTime != 'undefined'){
try{
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
if (rs && rs != 'undefined') {
rs.delivery_info.startTime = pobj.baseInfo.startTime;
var d = new Date(rs.delivery_info.startTime);
rs.delivery_info.endTime = this.oneYearPast(d, 1);//到期时间
//回传信息给庄冰，放队列
var rc = system.getObject("util.execClient");
var requrl = this.queueUrl;
var params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.receiveUrl,
"actionType": "updateOrderStatus",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.deliverNumber,//订单编码
"status": appconfig.pdict.ddyDict[rs.delivery_status],
"deliverContent": { "baseInfo": rs.delivery_info }
}
}
}
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout);
console.log("RRRRRRRRRRRRRR");
console.log(JSON.stringify(j));
params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.wdyUrl,
"actionType": "jftime",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.deliverNumber,//订单编码
"startTime": rs.delivery_info.startTime,
"endTime": rs.delivery_info.endTime
}
}
}
rtn = await rc.execPost(params, requrl);
var j1 = JSON.parse(rtn.stdout);
console.log("R1RRRRR1RR1RRRR1RR1");
console.log(JSON.stringify(j1));
if (j.status == 1 && j1.status == 1) {
//更新详情
var uarr = {
"deliverNumber": pobj.deliverNumber,
"baseInfo": rs.delivery_info
};
await this.service.updateInfoByDeliverCode(uarr);
return system.getResult("更新成功");
}
else {
return system.getResultError("更新失败！");
}
}
else {
return system.getResultError("数据不存在！");
}
}
catch(error){
return system.getResultError(error);
}
}
else{
return system.getResultError("参数错误!");
}
}
/*根据交付单编号更新交付单状态*/
async updateStatusByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
......@@ -243,7 +322,26 @@ class DeliverybillCtl extends CtlBase {
var rtn = await rc.execPost(params, requrl);
console.log("_____________________________" + rtn.stdout);
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
var j1status = 1;
if (pobj.deliverStatus == "closed"){//退款
params = {
"actionType": "produceData",
"actionBody": {
"pushUrl": this.wdyUrl,
"actionType": "refundOrder",
"identifyCode": "ic-manage",
"messageBody": {
"orderNum": pobj.deliverNumber//订单编码
}
}
}
rtn = await rc.execPost(params, requrl);
console.log("_____________________________tuifei" + rtn.stdout);
var j1 = JSON.parse(rtn.stdout);
j1status = j1.status;
}
if (j.status == 1 && j1status == 1) {
await this.service.updateStatusByDeliverCode(pobj);
var pInfo = this.service.findInfoByDeliverCode(pobj);
if (pInfo) {
......@@ -298,7 +396,7 @@ class DeliverybillCtl extends CtlBase {
"messageBody": {
"orderNum": pobj.deliverNumber,//订单编码
"status": appconfig.pdict.ddyDict[rs.delivery_status],
"deliverContent": {"baseInfo":rs.delivery_info}
"deliverContent": { "baseInfo": rs.delivery_info }
}
}
}
......@@ -355,7 +453,7 @@ class DeliverybillCtl extends CtlBase {
"messageBody": {
"orderNum": pobj.deliverNumber,//订单编码
"status": appconfig.pdict.ddyDict[deliverInfo.delivery_status],
"deliverContent": {"expressInfo":pobj.expressInfo}
"deliverContent": { "expressInfo": pobj.expressInfo }
}
}
}
......@@ -376,7 +474,7 @@ class DeliverybillCtl extends CtlBase {
}
}
catch(error){
catch (error) {
console.log("Error-----------------------------------------------" + error);
return system.getResultError(error);
}
......@@ -389,6 +487,7 @@ class DeliverybillCtl extends CtlBase {
/*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(mobj, qobj, req) {//
var pobj = mobj.d;
console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
......@@ -439,6 +538,7 @@ class DeliverybillCtl extends CtlBase {
params.actionBody.status = appconfig.pdict.ddyDict[rs.delivery_status];
}
var rtn = await rc.execPost(params, requrl);
console.log("rtn-------------------------------------------" + rtn.stdout);
var j = JSON.parse(rtn.stdout);
if (j.status == 1) {
return system.getResult("操作成功！");
......@@ -448,41 +548,44 @@ class DeliverybillCtl extends CtlBase {
}
}
catch (error) {
console.log("error-------------------------------------------" + error);
return system.getResultError(error);
}
}
else {
console.log("参数错误-------------------------------------------参数错误！");
return system.getResultError("参数错误！");
}
}
async settleApplyForTacent(p,q,req){
let ids=p.ids
let spname=p.spname
let spid=p.spid
let rtn=await this.service.settleApplyForTacent(ids,p.userid,p.username,spname,spid)
async settleApplyForTacent(p, q, req) {
let ids = p.ids
let spname = p.spname
let spid = p.spid
let rtn = await this.service.settleApplyForTacent(ids, p.userid, p.username, spname, spid)
return system.getResult({})
}
async settleApply(p,q,req){
let ids=p.ids
let spname=p.spname
let spid=p.spid
let rtn=await this.service.settleApply(ids,p.userid,p.username,spname,spid)
async settleApply(p, q, req) {
let ids = p.ids
let spname = p.spname
let spid = p.spid
let rtn = await this.service.settleApply(ids, p.userid, p.username, spname, spid)
return system.getResult({})
}
/*根据商机编号插入交付单信息*/
async insertInfo(nobj, qobj, req) {//队列的时候用
var pobj = nobj.d;
console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try {
pobj.deliverStatus = "received";
pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
if (pobj.companyInfo.companyPropertiesName && pobj.companyInfo.companyPropertiesName != 'undefined') {
if (pobj.businessName == "公司注册"){
if (pobj.businessName == "公司注册") {
pobj.companyInfo.companyProperties = appconfig.pdict.companyNatureDictT[pobj.companyInfo.companyPropertiesName];
}
else if (pobj.businessName == "云上园区注册"){
else if (pobj.businessName == "云上园区注册") {
pobj.companyInfo.companyProperties = appconfig.pdict.registeredTypeDictT[pobj.companyInfo.companyPropertiesName];
}
pobj.baseInfo.companyProperties = pobj.companyInfo.companyProperties;
......@@ -494,7 +597,7 @@ class DeliverybillCtl extends CtlBase {
}
if (pobj.baseInfo.taxpayerName && pobj.baseInfo.taxpayerName != 'undefined') {
pobj.baseInfo.taxpayerType = appconfig.pdict.TaxpayerTypeDictT[pobj.baseInfo.taxpayerName];
if (pobj.businessName == "公司注册" || pobj.businessName == "云上园区注册"){
if (pobj.businessName == "公司注册" || pobj.businessName == "云上园区注册") {
pobj.companyInfo.taxpayerType = pobj.baseInfo.taxpayerType;
}
}
......@@ -502,8 +605,8 @@ class DeliverybillCtl extends CtlBase {
pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
pobj.channelNumber = "1111111";
pobj.cacheInfo = {
"cmpDeliverInfo":{},
"cmpContactInfo":{}
"cmpDeliverInfo": {},
"cmpContactInfo": {}
};
if (pobj.businessMode && pobj.businessMode != 'undefined') {//如果有商机编号，需要取方案编号
var schemeInfo = await this.schemeService.findInfoByDemandCode(pobj);
......@@ -531,8 +634,8 @@ class DeliverybillCtl extends CtlBase {
if (pobj.baseInfo.isWhether && pobj.baseInfo.isWhether != 'undefined') {
pobj.cacheInfo.cmpDeliverInfo.isWhether = pobj.baseInfo.isWhether;
}
if (pobj.baseInfo.financial && pobj.baseInfo.financial != 'undefined'){
pobj.cacheInfo.financial = pobj.baseInfo.financial;
if (pobj.baseInfo.financial && pobj.baseInfo.financial != 'undefined') {
pobj.cacheInfo.cmpDeliverInfo.financial = pobj.baseInfo.financial;
}
if (pobj.baseInfo.addressType && pobj.baseInfo.addressType != 'undefined') {
......@@ -568,11 +671,11 @@ class DeliverybillCtl extends CtlBase {
pobj.cacheInfo.cmpDeliverInfo.fullAddress = pobj.companyInfo.fullAddress;
pobj.cacheInfo.cmpDeliverInfo.residenceAddress = pobj.companyInfo.fullAddress;
}
if (pobj.baseInfo.contactsName && pobj.baseInfo.contactsName != 'undefined'){
if (pobj.baseInfo.contactsName && pobj.baseInfo.contactsName != 'undefined') {
pobj.cacheInfo.cmpContactInfo.contactsName = pobj.baseInfo.contactsName;
}
if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined'){
if (pobj.baseInfo.contactsPhone && pobj.baseInfo.contactsPhone != 'undefined') {
pobj.cacheInfo.cmpContactInfo.contactsPhone = pobj.baseInfo.contactsPhone;
}
......@@ -678,25 +781,38 @@ class DeliverybillCtl extends CtlBase {
//time时间n年后的的前一天
oneYearPast(time, n) {
//var time=new Date();
try{
var year = time.getFullYear() + n;
var d = time.setFullYear(year);
var date = time.getDate(d) - 1;
var xx = time.setDate(date);
return moment(new Date(xx)).format('yyyy-MM-DD');
}
catch{
return "";
}
}
//计算俩日期相差多少天
diffDays(time1, time2) {
try{
var m1 = moment(time1);
var m2 = moment(time2);
return m2.diff(m1, 'day');
}
catch{
return "";
}
}
}
module.exports = DeliverybillCtl;
// var task = new DeliverybillCtl();
// var d = new Date("2020-06-05");
// var oneYear = task.oneYearPast(d);
// console.log("dddddddddddd:" + d);
// var oneYear = task.oneYearPast(d,1);
// var ss = moment();
// var diff = task.diffDays(ss,oneYear);
// console.log(oneYear);
......
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
......@@ -40,7 +40,7 @@ class DeliverybillDao extends Dao {
//不是来自平台前端查询
if (qobj.bizpath && qobj.bizpath.indexOf("pmx") < 0) {
qc.where.product_code = qc.where.product_code || {
[this.db.Op.notIn]: ["ICP", "EDI"]
[this.db.Op.notIn]: ["ICP", "EDI","ICPANNUALREPORT","EDIANNUALREPORT"]
}
if (qobj.bizpath && qobj.bizpath != "") {
if (qobj.bizpath.indexOf("myDeliver") > 0) {//说明是从商机列表过来的
......
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