金额

biz-ghs/clear/classes/OrderCgClearClass.php

@@ -312,23 +312,11 @@ class OrderCgClearClass extends BaseClass
     }
 
     /**
-     * 结账时优先 remainDebtPrice；历史已结清单 remainDebtPrice=0 时回退 debtPrice
+     * 关系行 amount 取订单/采购单 actPrice
      */
     protected static function resolveDebtAmount($entity)
     {
-        $remain = self::readField($entity, 'remainDebtPrice');
-        if (bccomp(self::normalizeAmount($remain), '0', 2) > 0) {
-            return self::normalizeAmount($remain);
-        }
-        $debt = self::readField($entity, 'debtPrice');
-        if (bccomp(self::normalizeAmount($debt), '0', 2) > 0) {
-            return self::normalizeAmount($debt);
-        }
-        $act = self::readField($entity, 'actPrice');
-        if (bccomp(self::normalizeAmount($act), '0', 2) > 0) {
-            return self::normalizeAmount($act);
-        }
-        return self::normalizeAmount(self::readField($entity, 'orderPrice'));
+        return self::normalizeAmount(self::readField($entity, 'actPrice'));
     }
 
     protected static function readField($entity, $key)

biz-hd/purchase/classes/OrderCgClearClass.php

@@ -225,19 +225,7 @@ class OrderCgClearClass extends BaseClass
 
     protected static function resolveDebtAmount($entity)
     {
-        $remain = self::readField($entity, 'remainDebtPrice');
-        if (bccomp(self::normalizeAmount($remain), '0', 2) > 0) {
-            return self::normalizeAmount($remain);
-        }
-        $debt = self::readField($entity, 'debtPrice');
-        if (bccomp(self::normalizeAmount($debt), '0', 2) > 0) {
-            return self::normalizeAmount($debt);
-        }
-        $act = self::readField($entity, 'actPrice');
-        if (bccomp(self::normalizeAmount($act), '0', 2) > 0) {
-            return self::normalizeAmount($act);
-        }
-        return self::normalizeAmount(self::readField($entity, 'orderPrice'));
+        return self::normalizeAmount(self::readField($entity, 'actPrice'));
     }
 
     protected static function readField($entity, $key)