Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/api/controller/PublicController.php

@@ -41,7 +41,8 @@ class PublicController
     public function test()
     {
         var_dump(111);
-        $order = StoreOrder::where('transaction_id', 'not null')->where('refund_status', 0)->where('is_del', 0)->where('is_system_del')->where('status', '>', 1)->select();
+        $order = StoreOrder::where('transaction_id', 'not null')->where('refund_status', 0)->where('is_del', 0)->where('is_system_del', 0)->where('status', '>', 1)->select();
+        var_dump(count($order));
         try {
             foreach ($order as $v) {
                 $res = MiniProgramService::profit_sharing_finish($v['transaction_id'], $v['order_id']);