收款

app-mall/controllers/NoticeController.php

@@ -163,19 +163,12 @@ class NoticeController extends PublicController
 
                     //打印小票和语音播报
                     $order = OrderClass::getByCondition(['orderSn' => $orderSn], true);
-                    ShopExtClass::hdGatheringReport($order);
                     OrderClass::onlinePrint($order);
 
                     $shopId = $order->shopId ?? 0;
                     $shop = ShopClass::getById($shopId, true);
-                    if (in_array($order->fromType, [dict::getDict("fromType", "shop"), dict::getDict("fromType", "friend")])) {
-                        //您有新的收入提醒
-                        WxMessageClass::gatheringIncomeInform($shop, $order);
-                    }
-                    if ($order->fromType == dict::getDict("fromType", "mall")) {
-                        //来自商城的新订单微信通知
-                        WxMessageClass::hdNewOrderInform($shop, $order);
-                    }
+                    //来自商城的新订单微信通知
+                    WxMessageClass::hdNewOrderInform($shop, $order);
 
                     $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true);
                     ShopExtClass::newWorkRemind($shopExt, $order);
@@ -479,19 +472,11 @@ class NoticeController extends PublicController
                         if (!empty($order)) {
                             $order->thirdLogNo = $thirdLogNo;
                             $order->save();
-                            ShopExtClass::hdGatheringReport($order);
                             OrderClass::onlinePrint($order);
-
                             $shopId = $order->shopId ?? 0;
                             $shop = ShopClass::getById($shopId, true);
-                            if (in_array($order->fromType, [dict::getDict("fromType", "shop"), dict::getDict("fromType", "friend")])) {
-                                //您有新的收入提醒
-                                WxMessageClass::gatheringIncomeInform($shop, $order);
-                            }
-                            if ($order->fromType == dict::getDict("fromType", "mall")) {
-                                //来自商城的新订单微信通知
-                                WxMessageClass::hdNewOrderInform($shop, $order);
-                            }
+                            //来自商城的新订单微信通知
+                            WxMessageClass::hdNewOrderInform($shop, $order);
                         }
                     }
                 }