订单

app/admin/controller/order/WholeController.php

@@ -69,6 +69,7 @@ class WholeController extends Curd
 
         if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
             $where['order_is_complete'] = 'N';
+            $where['order_category'] = isset($where['order_category']) ? $where['order_category'] : 'NORMAL';
         }
 
         if (!empty($where['order_status_system']) && $where['order_status_system'] == 'RETURN') {

app/api/controller/pay/WxpayController.php

@@ -49,21 +49,6 @@ class WxpayController
 
     }
 
-    public function notify()
-    {
-        $pay = Pay::wechat($this->getConfig());
-
-        try {
-            $data = $pay->verify(); // 是的，验签就这么简单！
-
-            Log::debug('Wechat notify', $data->all());
-        } catch (\Exception $e) {
-            // $e->getMessage();
-        }
-
-        return $pay->success()->send();// laravel 框架中请直接 `return $pay->success()`
-    }
-
     private function getConfig()
     {
         return [