Kirin 3 lat temu
rodzic
commit
5aa498cca5

+ 1 - 13
app/api/controller/PublicController.php

@@ -41,19 +41,7 @@ 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', 0)->where('status', '>', 1)->select();
-        var_dump(count($order));
-        try {
-            foreach ($order as $v) {
-                $res = MiniProgramService::profit_sharing_finish($v['transaction_id'], 'over_' . $v['order_id']);
-//                $res = MiniProgramService::profit_sharing_query($v['transaction_id'], $v['order_id']);
-                var_dump($res);
-//                exit;
-            }
-        } catch (\Exception $e) {
-            var_dump($e->getMessage());
-        }
+        StoreOrder::startTakeOrder();
     }
 
     /**

+ 2 - 2
app/models/user/UserBill.php

@@ -162,10 +162,10 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'in', 'recharge,system_add');
                 break;
             case 3:
-                $model = $model->where('type', 'brokerage')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'brokerage');
                 break;
             case 4:
-                $model = $model->where('type', 'extract')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'extract');
                 break;
         }
         if ($page) $model = $model->page((int)$page, (int)$limit);

+ 1 - 0
crmeb/services/MiniProgramService.php

@@ -384,6 +384,7 @@ class MiniProgramService
     {
         return self::paymentService()->profitSharingFinish($orderNo, $sharingNo);
     }
+
     /**
      * 完结分账
      */

+ 1 - 0
vendor/overtrue/wechat/src/Payment/API.php

@@ -26,6 +26,7 @@ use Doctrine\Common\Cache\FilesystemCache;
 use EasyWeChat\Core\AbstractAPI;
 use EasyWeChat\Core\Exception;
 use EasyWeChat\Support\Collection;
+use EasyWeChat\Support\Log;
 use EasyWeChat\Support\XML;
 use Psr\Http\Message\ResponseInterface;