Merge branch 'master' into dev

app-ghs/controllers/ProductController.php

@@ -223,6 +223,8 @@ class ProductController extends BaseController
         $hyPrice = floatval($hyPrice);
 
         $name = $info->name ?? '';
+        $name = preg_replace('/\s{2,}/', ' ', $name ?? '');
+        
         $ptItemId = $info->itemId ?? 0;
         $mainId = $info->mainId ?? 0;
         $ext = $this->shopExt;
@@ -251,7 +253,7 @@ class ProductController extends BaseController
             }
         } else {
             if (stringUtil::getWordNum($name) > 8) {
-                $content = '<TEXT x="30" y="30" font="12" w="1" h="1" r="0">' . $name . '</TEXT>';
+                $content = '<TEXT x="30" y="30" font="12" w="1" h="2" r="0">' . $name . '</TEXT>';
             } else {
                 $content = '<TEXT x="30" y="30" font="12" w="2" h="2" r="0">' . $name . '</TEXT>';
             }

app-ghs/controllers/TestController.php

@@ -993,7 +993,7 @@ class TestController extends BaseController
     //交易查询 ssh 20231021
     public function actionTradeQuery()
     {
-        $shopId = 86726;
+        $shopId = 40212;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店，编号677230');
@@ -1009,7 +1009,7 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CG30692793';
+        $orderSn = 'CG30754216';
         $tradeNo = '66223936904050';
         $queryParams = [
             'orderSn' => $orderSn,

biz-hd/order/classes/OrderClass.php

@@ -1085,11 +1085,16 @@ class OrderClass extends BaseClass
         }
 
         $content .= '--------------------------------<BR>';
+        $balance = $custom['balance'] ?? 0;
+        $balance = floatval($balance);
+        if ($balance > 0) {
+            $content .= '当前账户余额：' . $balance . '<BR>';
+        }
         $content .= '订单日期：' . $order->addTime . '<BR>';
         $content .= '订单编号：' . $respond['orderSn'] . '<BR>';
         $content .= '门店名称：' . $currentName . '<BR>';
         $content .= "<BR>";
-
+        noticeUtil::push($content, '15280215347');
         $p = new printUtil($printSn);
 
         $orderSn = $order->orderSn ?? '';