浏览代码

修复测试bug

laiguoran 4 年之前
父节点
当前提交
11263b1c12
共有 1 个文件被更改,包括 21 次插入5 次删除
  1. 21 5
      app/service/advance_audit.js

+ 21 - 5
app/service/advance_audit.js

@@ -5,6 +5,7 @@ const shenpiConst = require('../const/shenpi');
 const pushType = require('../const/audit').pushType;
 const pushType = require('../const/audit').pushType;
 const smsTypeConst = require('../const/sms_type');
 const smsTypeConst = require('../const/sms_type');
 const wxConst = require('../const/wechat_template.js');
 const wxConst = require('../const/wechat_template.js');
+const advanceConst = require('../const/advance');
 module.exports = app => {
 module.exports = app => {
     class AdvanceAudit extends app.BaseService {
     class AdvanceAudit extends app.BaseService {
         constructor(ctx) {
         constructor(ctx) {
@@ -234,11 +235,16 @@ module.exports = app => {
 
 
                 // 微信模板通知
                 // 微信模板通知
                 const advanceInfo = await this.ctx.service.advance.getDataById(vid);
                 const advanceInfo = await this.ctx.service.advance.getDataById(vid);
+                const shenpiUrl = await this.ctx.helper.urlToShort(
+                    this.ctx.protocol + '://' + this.ctx.host + '/wap/tender/' + advanceInfo.tid + '/advance/' + advanceInfo.id + '/detail'
+                );
                 const wechatData = {
                 const wechatData = {
-                    qi: advanceInfo.type === 0 ? '开工预付款第' + advanceInfo.order + '期' : '材料预付款第' + advanceInfo.order + '期',
+                    wap_url: shenpiUrl,
+                    qi: advanceConst.typeCol[advanceInfo.type].name + '第' + advanceInfo.order + '期',
                     status: wxConst.status.check,
                     status: wxConst.status.check,
                     tips: wxConst.tips.check,
                     tips: wxConst.tips.check,
                     tp: parseFloat(advanceInfo.cur_amount),
                     tp: parseFloat(advanceInfo.cur_amount),
+                    code: this.ctx.session.sessionProject.code,
                 };
                 };
                 await this.ctx.helper.sendWechat(audit.audit_id, smsTypeConst.const.YFK, smsTypeConst.judge.approval.toString(), wxConst.template.advance, wechatData);
                 await this.ctx.helper.sendWechat(audit.audit_id, smsTypeConst.const.YFK, smsTypeConst.judge.approval.toString(), wxConst.template.advance, wechatData);
                 await transaction.commit();
                 await transaction.commit();
@@ -289,11 +295,16 @@ module.exports = app => {
                         status: auditConst.status.checking,
                         status: auditConst.status.checking,
                     });
                     });
                     // 微信模板通知
                     // 微信模板通知
+                    const shenpiUrl = await this.ctx.helper.urlToShort(
+                        this.ctx.protocol + '://' + this.ctx.host + '/wap/tender/' + advanceInfo.tid + '/advance/' + advanceInfo.id + '/detail'
+                    );
                     const wechatData = {
                     const wechatData = {
-                        qi: advanceInfo.type === 0 ? '开工预付款第' + advanceInfo.order + '期' : '材料预付款第' + advanceInfo.order + '期',
+                        wap_url: shenpiUrl,
+                        qi: advanceConst.typeCol[advanceInfo.type].name + '第' + advanceInfo.order + '期',
                         status: wxConst.status.check,
                         status: wxConst.status.check,
                         tips: wxConst.tips.check,
                         tips: wxConst.tips.check,
                         tp: parseFloat(advanceInfo.cur_amount),
                         tp: parseFloat(advanceInfo.cur_amount),
+                        code: this.ctx.session.sessionProject.code,
                     };
                     };
                     await this.ctx.helper.sendWechat(nextAudit.audit_id, smsTypeConst.const.YFK, smsTypeConst.judge.approval.toString(), wxConst.template.advance, wechatData);
                     await this.ctx.helper.sendWechat(nextAudit.audit_id, smsTypeConst.const.YFK, smsTypeConst.judge.approval.toString(), wxConst.template.advance, wechatData);
                 } else {
                 } else {
@@ -306,7 +317,7 @@ module.exports = app => {
                     // 微信模板通知
                     // 微信模板通知
                     const users = this._.uniq(this._.concat(this._.map(auditors, 'audit_id'), advanceInfo.uid));
                     const users = this._.uniq(this._.concat(this._.map(auditors, 'audit_id'), advanceInfo.uid));
                     const wechatData = {
                     const wechatData = {
-                        qi: advanceInfo.type === 0 ? '开工预付款第' + advanceInfo.order + '期' : '材料预付款第' + advanceInfo.order + '期',
+                        qi: advanceConst.typeCol[advanceInfo.type].name + '第' + advanceInfo.order + '期',
                         status: wxConst.status.success,
                         status: wxConst.status.success,
                         tips: wxConst.tips.success,
                         tips: wxConst.tips.success,
                         tp: parseFloat(advanceInfo.cur_amount),
                         tp: parseFloat(advanceInfo.cur_amount),
@@ -359,7 +370,7 @@ module.exports = app => {
                 const advanceInfo = await this.ctx.service.advance.getDataById(advanceId);
                 const advanceInfo = await this.ctx.service.advance.getDataById(advanceId);
                 const users = this._.uniq(this._.concat(this._.map(auditors, 'audit_id'), advanceInfo.uid));
                 const users = this._.uniq(this._.concat(this._.map(auditors, 'audit_id'), advanceInfo.uid));
                 const wechatData = {
                 const wechatData = {
-                    qi: advanceInfo.type === 0 ? '开工预付款第' + advanceInfo.order + '期' : '材料预付款第' + advanceInfo.order + '期',
+                    qi: advanceConst.typeCol[advanceInfo.type].name + '第' + advanceInfo.order + '期',
                     status: wxConst.status.back,
                     status: wxConst.status.back,
                     tips: wxConst.tips.back,
                     tips: wxConst.tips.back,
                     tp: parseFloat(advanceInfo.cur_amount),
                     tp: parseFloat(advanceInfo.cur_amount),
@@ -424,11 +435,16 @@ module.exports = app => {
                 });
                 });
                 // 微信模板通知
                 // 微信模板通知
                 const advanceInfo = await this.ctx.service.advance.getDataById(advanceId);
                 const advanceInfo = await this.ctx.service.advance.getDataById(advanceId);
+                const shenpiUrl = await this.ctx.helper.urlToShort(
+                    this.ctx.protocol + '://' + this.ctx.host + '/wap/tender/' + advanceInfo.tid + '/advance/' + advanceInfo.id + '/detail'
+                );
                 const wechatData = {
                 const wechatData = {
-                    qi: advanceInfo.type === 0 ? '开工预付款第' + advanceInfo.order + '期' : '材料预付款第' + advanceInfo.order + '期',
+                    wap_url: shenpiUrl,
+                    qi: advanceConst.typeCol[advanceInfo.type].name + '第' + advanceInfo.order + '期',
                     status: wxConst.status.check,
                     status: wxConst.status.check,
                     tips: wxConst.tips.check,
                     tips: wxConst.tips.check,
                     tp: parseFloat(advanceInfo.cur_amount),
                     tp: parseFloat(advanceInfo.cur_amount),
+                    code: this.ctx.session.sessionProject.code,
                 };
                 };
                 await this.ctx.helper.sendWechat(preAuditor.audit_id, smsTypeConst.const.YFK, smsTypeConst.judge.approval.toString(), wxConst.template.advance, wechatData);
                 await this.ctx.helper.sendWechat(preAuditor.audit_id, smsTypeConst.const.YFK, smsTypeConst.judge.approval.toString(), wxConst.template.advance, wechatData);
                 await transaction.insert(this.tableName, newAuditors);
                 await transaction.insert(this.tableName, newAuditors);