d

ic-deliver/app/base/controller/impl/bizchance/settlebillCtl.js

@@ -12,17 +12,19 @@ class SettleBillCtl extends CtlBase {
   async advice(p,q,req){
   async advice(p,q,req){
     let sid= p.advice.settleId
     let sid= p.advice.settleId
     let msg=p.advice.memo
     let msg=p.advice.memo
-    let rtn=await this.service.advice(sid,msg)
+    let userid=p.userid
+    let userName=p.username
+    let rtn=await this.service.advice(sid,msg,userid,userName)
     return system.getResult(rtn)
     return system.getResult(rtn)
   }
   }
   async  auditPass(p,q,req){
   async  auditPass(p,q,req){
     let sid= p.pass.settleId
     let sid= p.pass.settleId
-    let rtn=await this.service.auditPass(sid)
+    let rtn=await this.service.auditPass(sid,p.userid,p.username)
     return system.getResult(rtn)
     return system.getResult(rtn)
   }
   }
   async  pay(p,q,req){
   async  pay(p,q,req){
     let sid= p.pay.settleId
     let sid= p.pay.settleId
-    let rtn=await this.service.pay(sid)
+    let rtn=await this.service.pay(sid,p.userid,p.username)
     return system.getResult(rtn)
     return system.getResult(rtn)
   }
   }
 }
 }

ic-deliver/app/base/db/models/delivery/settlebill.js

@@ -10,7 +10,7 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       allowNull: true,
       type: DataTypes.STRING
       type: DataTypes.STRING
     },
     },
-    audited: {// 审核状态
+    auditedStatus: {// 审核状态
       type:DataTypes.BOOLEAN,
       type:DataTypes.BOOLEAN,
       defaultValue: false
       defaultValue: false
     },
     },
@@ -18,7 +18,7 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       allowNull: true,
       type: DataTypes.INTEGER
       type: DataTypes.INTEGER
     },
     },
-    isPayed:{
+    isPayedStatus:{
       type:DataTypes.BOOLEAN,
       type:DataTypes.BOOLEAN,
       defaultValue: false
       defaultValue: false
     },
     },
@@ -26,13 +26,29 @@ module.exports = (db, DataTypes) => {
       allowNull: true,
       allowNull: true,
       type:DataTypes.STRING,
       type:DataTypes.STRING,
     },
     },
-    creator_id:{
+    creator_id:{//申请人
       allowNull: true,
       allowNull: true,
       type: DataTypes.INTEGER
       type: DataTypes.INTEGER
     },
     },
     creator:{
     creator:{
       allowNull: true,
       allowNull: true,
       type: DataTypes.STRING,
       type: DataTypes.STRING,
+    },
+    auditor_id:{//审核人
+      allowNull: true,
+      type: DataTypes.INTEGER
+    },
+    auditor:{//审核人
+      allowNull: true,
+      type: DataTypes.STRING,
+    },
+    payer_id:{//付款人
+      allowNull: true,
+      type: DataTypes.INTEGER
+    },
+    payer:{
+      allowNull: true,
+      type: DataTypes.STRING,
     }
     }
   }, {
   }, {
     paranoid: true,//真的删除
     paranoid: true,//真的删除

ic-deliver/app/base/service/impl/bizchance/settlebillSve.js

@@ -7,32 +7,38 @@ class SettleBillService extends ServiceBase {
         super("bizchance", ServiceBase.getDaoName(SettleBillService));
         super("bizchance", ServiceBase.getDaoName(SettleBillService));
         this.deliverbillDao=system.getObject("db.bizchance.deliverybillDao")
         this.deliverbillDao=system.getObject("db.bizchance.deliverybillDao")
     }
     }
-    async advice(id,msg){
+    async advice(id,msg,userId,userName){
         var self=this
         var self=this
          return this.db.transaction(async function (t){
          return this.db.transaction(async function (t){
              //先按照ids查询出交付单的合计服务成本
              //先按照ids查询出交付单的合计服务成本
               let st=await self.dao.findById(id,{transaction:t})
               let st=await self.dao.findById(id,{transaction:t})
+              st.auditor_id=userId
+              st.auditor=userName
               st.memo=msg
               st.memo=msg
               await st.save({transaction:t})
               await st.save({transaction:t})
               return st
               return st
          }); 
          }); 
     }
     }
-    async auditPass(settleId){
+    async auditPass(settleId,userId,userName){
         var self=this
         var self=this
         return this.db.transaction(async function (t){
         return this.db.transaction(async function (t){
             //先按照ids查询出交付单的合计服务成本
             //先按照ids查询出交付单的合计服务成本
              let st=await self.dao.findById(settleId,{transaction:t})
              let st=await self.dao.findById(settleId,{transaction:t})
-             st.audited=true
+             st.auditedStatus=true
+             st.auditor_id=userId
+             st.auditor=userName
              await st.save({transaction:t})
              await st.save({transaction:t})
              return st
              return st
         }); 
         }); 
     }
     }
-    async pay(settleId){
+    async pay(settleId,userId,userName){
         var self=this
         var self=this
         return this.db.transaction(async function (t){
         return this.db.transaction(async function (t){
             //先按照ids查询出交付单的合计服务成本
             //先按照ids查询出交付单的合计服务成本
              let st=await self.dao.findById(settleId,{transaction:t})
              let st=await self.dao.findById(settleId,{transaction:t})
-             st.isPayed=true
+             st.isPayedStatus=true
+             st.payer_id=userId
+             st.payer=userName
              await st.save({transaction:t})
              await st.save({transaction:t})
              //改变所有交付单的结算settle_status settled ,
              //改变所有交付单的结算settle_status settled ,
              await self.deliverbillDao.updateByWhere({settle_status:'settled'}, { settlebill_id: st.id }, t);
              await self.deliverbillDao.updateByWhere({settle_status:'settled'}, { settlebill_id: st.id }, t);