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

app/api/controller/PublicController.php

@@ -45,7 +45,8 @@ class PublicController
         var_dump(count($order));
         try {
             foreach ($order as $v) {
-                $res = MiniProgramService::profit_sharing_query($v['transaction_id'], $v['order_id']);
+                $res = MiniProgramService::profit_sharing_finish($v['transaction_id'], $v['order_id']);
+//                $res = MiniProgramService::profit_sharing_query($v['transaction_id'], $res['order_id']);
                 var_dump($res);
 //                exit;
             }