shish 2 gadi atpakaļ
vecāks
revīzija
7d9a7fe350
1 mainītis faili ar 10 papildinājumiem un 8 dzēšanām
  1. 10 8
      biz-ghs/order/classes/PurchaseOrderClass.php

+ 10 - 8
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -111,6 +111,8 @@ class PurchaseOrderClass extends BaseClass
         $bigPrice = $current['bigPrice'] ?? '';
         $bigPrice = floatval($bigPrice);
         $bigUnit = $current['bigUnit'] ?? '扎';
+        $aboutPrice = $current['aboutPrice'] ?? 0;
+        $aboutString = $aboutPrice == 1 ? '约' : '';
         $name = $current['name'] ?? '';
         if (floatval($bigPrice) == 0.01) {
             $name = $name . '(送)';
@@ -118,8 +120,8 @@ class PurchaseOrderClass extends BaseClass
         $count = $current['itemNum'] ?? '';
         $count = floatval($count);
         $content .= '<B>' . $name . ' ' . $count . $bigUnit . '</B><BR>';
-        $totalPrice = $current['totalPrice']??0;
-        $content .= $count . $bigUnit . 'x' . $bigPrice . '元' . '=' . $totalPrice . '元<BR>';
+        $totalPrice = $current['totalPrice'] ?? 0;
+        $content .= $count . $bigUnit . 'x' . $aboutString . $bigPrice . '元' . '=' . $totalPrice . '元<BR>';
         if (isset($current['refundNum']) && $current['refundNum'] > 0) {
             $content .= '<B>已退' . $current['refundNum'] . $bigUnit . '</B><BR>';
         }
@@ -521,9 +523,9 @@ class PurchaseOrderClass extends BaseClass
                 $totalBigNum = bcadd($totalBigNum, $thisBigNum, 2);
                 $totalNum = bcadd($totalNum, $thisBigNum, 2);
                 if ($currentAboutPrice == 1) {
-					if($currentTotal<=0){
-						util::fail('请填写总金额');
-					}
+                    if ($currentTotal <= 0) {
+                        util::fail('请填写总金额');
+                    }
                     $currentTotalPrice = $currentTotal;
                 } else {
                     $currentTotalPrice = bcmul($thisBigNum, $v['itemPrice'], 2);
@@ -544,9 +546,9 @@ class PurchaseOrderClass extends BaseClass
                 $totalNum = bcadd($totalNum, $changeToBigNum, 2);
                 $totalSmallNum = bcadd($totalSmallNum, $thisSmallNum, 2);
                 if ($currentAboutPrice == 1) {
-					if($currentTotal<=0){
-						util::fail('请填写总金额');
-					}
+                    if ($currentTotal <= 0) {
+                        util::fail('请填写总金额');
+                    }
                     $currentTotalPrice = $currentTotal;
                 } else {
                     $currentTotalPrice = bcmul($thisSmallNum, $v['itemPrice'], 2);