Merge branch 'master' into ls

app-ghs/controllers/OrderController.php

@@ -683,7 +683,7 @@ class OrderController extends BaseController
             $orderSn = orderSn::getPurchaseSn();
             $cg->orderSn = $orderSn;
             $cg->save();
-            noticeUtil::push("重新扫码，成功更换单号 {$oldOrderSn} {$orderSn}", '15280215347');
+            //noticeUtil::push("重新扫码，成功更换单号 {$oldOrderSn} {$orderSn}", '15280215347');
             PurchaseItemClass::updateByCondition(['orderSn' => $oldOrderSn], ['orderSn' => $orderSn]);
         }
 
@@ -822,7 +822,7 @@ class OrderController extends BaseController
                     ShopExtClass::remindInputPassword($shopId);
                 }
                 $fullMsg = $msg . "（付款码：{$authCode}）" . '（' . $name . '）';
-                noticeUtil::push($fullMsg . ' ' . $retCode . ' 编号007', '15280215347');
+                //noticeUtil::push($fullMsg . ' ' . $retCode . ' 编号007', '15280215347');
                 util::success(['returnStatus' => 'FAILURE', 'returnCode' => $retCode], $msg);
             }
         } catch (\Exception $e) {

app-hd/controllers/OrderController.php

@@ -392,7 +392,7 @@ class OrderController extends BaseController
                     $shopId = $order->shopId;
                     ShopExtClass::remindInputPassword($shopId);
                 }
-                noticeUtil::push($fullMsg . ' ' . $retCode . ' 编号008', '15280215347');
+                //noticeUtil::push($fullMsg . ' ' . $retCode . ' 编号008', '15280215347');
                 util::success(['returnStatus' => 'FAILURE', 'returnCode' => $retCode], $msg);
             }
 

biz-ghs/order/classes/OrderClearClass.php

@@ -218,7 +218,7 @@ class OrderClearClass extends BaseClass
             $clearData['discountType'] = dict::getDict('discountType', 'discount');
         }
         if ($modifyPrice > $amount) {
-            noticeUtil::push("结账金额大于总欠款金额 {$modifyPrice} {$amount}", '15280215347');
+            //noticeUtil::push("结账金额大于总欠款金额 {$modifyPrice} {$amount}", '15280215347');
             util::fail('结账金额大于总欠款金额');
         }
         $return = PurchaseClearClass::add($clearData, true);