Просмотр исходного кода

Merge branch 'master' into dev

shish 1 день назад
Родитель
Сommit
c027cbc1c0
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      biz-ghs/order/classes/PurchaseOrderClass.php

+ 3 - 3
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -898,7 +898,7 @@ class PurchaseOrderClass extends BaseClass
         if (isset($orderInfo['tkPrice']) && $orderInfo['tkPrice'] > 0) {
         if (isset($orderInfo['tkPrice']) && $orderInfo['tkPrice'] > 0) {
             $content .= '退款金额:' . floatval($orderInfo['tkPrice']) . '元<BR>';
             $content .= '退款金额:' . floatval($orderInfo['tkPrice']) . '元<BR>';
         }
         }
-        $content .= '<B>单金额:' . floatval($orderInfo['realPrice']) . '</B><BR>';
+        $content .= '<B>单金额:' . floatval($orderInfo['realPrice']) . '</B><BR>';
         if ($orderInfo['debtPrice'] > 0) {
         if ($orderInfo['debtPrice'] > 0) {
             $remainDebt = bcadd((string)($orderInfo['remainDebtPrice'] ?? '0'), '0', 2);
             $remainDebt = bcadd((string)($orderInfo['remainDebtPrice'] ?? '0'), '0', 2);
             $totalRefund = bcadd((string)($orderInfo['tkPrice'] ?? '0'), (string)($orderInfo['nextDayTkPrice'] ?? '0'), 2);
             $totalRefund = bcadd((string)($orderInfo['tkPrice'] ?? '0'), (string)($orderInfo['nextDayTkPrice'] ?? '0'), 2);
@@ -906,9 +906,9 @@ class PurchaseOrderClass extends BaseClass
                 $content .= '累计退款:' . floatval($totalRefund) . '元<BR>';
                 $content .= '累计退款:' . floatval($totalRefund) . '元<BR>';
             }
             }
             if($remainDebt > 0) {
             if($remainDebt > 0) {
-                $content .= '<B>剩余待结:' . floatval($remainDebt) . '元</B><BR>';   
+                $content .= '<B>本单待结:' . floatval($remainDebt) . '元</B><BR>';   
             }else{
             }else{
-                $content .= '<B>剩余待结:0元 已结清!</B><BR>';
+                $content .= '<B>本单待结:0元 已结清!</B><BR>';
             }
             }
         } else {
         } else {
             $content .= '实付金额:' . floatval($orderInfo['realPrice']) . '元<BR>';
             $content .= '实付金额:' . floatval($orderInfo['realPrice']) . '元<BR>';