合同支付调整

app/lib/pay_calc.js

@@ -130,8 +130,9 @@ class PayCalculate {
      * 累计 计量等数据
      */
     async _getAddCalcRela() {
-        // todo 获取截止上期数据
-        this.pre = this.stage.order > 1 ? await this.ctx.service.stageBillsFinal.getSumTotalPrice(this.stage.tid, this.stage.order - 1) : null;
+        if (this.cur && this.add) return;
+
+        this.pre = this.stage.order > 1 ? await this.ctx.service.stageBillsFinal.getSumTotalPrice(this.stage.tid, this.stage.order - 1) : {};
         this.cur = await this.ctx.service.stageBills.getSumTotalPrice(this.stage);
         this.add = {};
         if (this.pre) {
@@ -231,6 +232,8 @@ class PayCalculate {
     }
 
     async calculateAll(pays) {
+        await this.getCalcBase();
+        await this._getAddCalcRela();
         await this.calculateStartRangePrice(pays);
         await this.calculate(pays);
     }