shish 2 жил өмнө
parent
commit
8c9b4d23a5

+ 13 - 18
biz-ghs/order/classes/OrderClass.php

@@ -985,7 +985,13 @@ class OrderClass extends BaseClass
         }
         $productNum = $current['num'] ?? '';
         $count = $current['count'] ?? '';
-        $content .= '<B>' . $name . ' ' . $count . '</B><BR>';
+        $unitName = $current['unitName'] ?? '喳';
+        if (isset($current['refundNum']) && $current['refundNum'] > 0) {
+            $show = $name . ' ' . $count . '(退' . $current['refundNum'] . $unitName . ')';
+        } else {
+            $show = $name . ' ' . $count;
+        }
+        $content .= '<B>' . $show . '</B><BR>';
         if ($showPrice == 1) {
             $content .= $productNum . '=' . $productPrice . '元<BR>';
         }
@@ -1118,23 +1124,6 @@ class OrderClass extends BaseClass
         $content .= "</CB>";
         $content .= '********************************<BR><BR>';
 
-        if (isset($respond['refund']) && !empty($respond['refund'])) {
-            $content .= '<CB>【已退款】</CB><BR>';
-            foreach ($respond['refund'] as $current) {
-                //58mm的机器,一行打印16个汉字,32个字母
-                $name = $current['name'] ?? '';
-                $count = $current['count'] ?? '';
-                $content .= '<B>' . $name . ' ' . $count . '</B><BR>';
-                if ($showPrice == 1) {
-                    $productNum = $current['num'] ?? '';
-                    $productPrice = $current['price'] ?? '';
-                    $content .= $productNum . '=' . $productPrice . '<BR>';
-                }
-                $content .= '--------------------------------<BR>';
-            }
-            $content .= '--------------------------------<BR>';
-        }
-
         if ($showPrice == 1) {
             if (isset($orderInfo['itemPrice']) && $orderInfo['itemPrice'] > 0) {
                 $content .= '商品金额:' . floatval($orderInfo['itemPrice']) . '<BR>';
@@ -1250,6 +1239,7 @@ class OrderClass extends BaseClass
                 $smallNum = $itemVal['smallNum'] ?? 0;
                 $giveNum = $itemVal['giveNum'] ?? 0;
                 $xhUnitName = $itemVal['xhUnitName'] ?? '扎';
+                $refundNum = $itemVal['refundNum'] ?? 0;
 
                 if ($bigNum > 0) {
                     $bigTotalPrice = bcmul($bigUnitPrice, $bigNum, 2);
@@ -1258,6 +1248,8 @@ class OrderClass extends BaseClass
                         'num' => floatval($bigNum) . $xhUnitName . '*' . floatval($bigUnitPrice) . '元',
                         'count' => floatval($bigNum) . $xhUnitName,
                         'price' => floatval($bigTotalPrice),
+                        'refundNum' => $refundNum,
+                        'unitName' => $xhUnitName,
                     ];
                 }
                 if ($smallNum > 0) {
@@ -1267,6 +1259,8 @@ class OrderClass extends BaseClass
                         'num' => floatval($smallNum) . '支*' . floatval($smallUnitPrice) . '元',
                         'count' => floatval($smallNum) . '支',
                         'price' => floatval($smallTotalPrice),
+                        'refundNum' => $refundNum,
+                        'unitName' => '支',
                     ];
                 }
                 if ($giveNum > 0) {
@@ -1275,6 +1269,7 @@ class OrderClass extends BaseClass
                         'num' => floatval($giveNum) . $xhUnitName . '*0元',
                         'count' => floatval($giveNum) . $xhUnitName,
                         'price' => 0,
+                        'unitName' => $xhUnitName,
                     ];
                 }
             }