Merge branch 'fix' into stable

modules/Channel/Services/Order/OrderService.php

@@ -42,11 +42,11 @@ class OrderService
                 $val->company_name = $val->puser_id > 0 ? DB::table('users')->where('id', $val->puser_id)->value("username") : "-";
                 $val->total_count = Order::where('uid', $val->uid)->where('id', "<=", $val->id)->count();
                 if ($val->user_id > 0) {
-                    $val->caompany_count = Order::where('uid', $val->uid)->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('id', "<=", $val->id)->count();
-                    $val->promotion_count = Order::where('uid', $val->uid)->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('user_id', ">", 0)->where('user_id', $val->user_id)->where('id', "<=", $val->id)->count();
+                    $val->caompany_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('id', "<=", $val->id)->count();
+                    $val->promotion_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('puser_id', '>', 0)->where('puser_id', $val->puser_id)->where('user_id', ">", 0)->where('user_id', $val->user_id)->where('id', "<=", $val->id)->count();
                 } else {
-                    $val->caompany_count = Order::where('uid', $val->uid)->where('puser_id', '>', 0)->count();
-                    $val->promotion_count = Order::where('uid', $val->uid)->where('user_id', '>', 0)->count();
+                    $val->caompany_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('puser_id', '>', 0)->count();
+                    $val->promotion_count = Order::where('uid', $val->uid)->where('status','<>', 'UNPAID')->where('user_id', '>', 0)->count();
                 }
                 $val->pay_appid = $val->pay_appid ?: '-';
                 $val->pay_merchant_name = $val->pay_merchant_name ?: '-';

modules/Channel/Services/WechatMinprogram/WechatMinprogramUserService.php

@@ -17,6 +17,7 @@ use Modules\Channel\Models\MiniprogramUserVip;
 use Modules\Channel\Models\Order;
 use Modules\Channel\Models\Videos;
 use Modules\Channel\Models\VideoSeries;
+use Modules\Channel\Services\Order\OrderService;
 use Modules\Manage\Models\Miniprogram;
 
 class WechatMinprogramUserService
@@ -58,7 +59,7 @@ class WechatMinprogramUserService
      * @return array
      * date 2023/05/26 15:41
      */
-    private static function getLevelText($uid)
+    public static function getLevelText($uid)
     {
         $record = self::userVipRecord($uid);
         if ($record && Carbon::now()->lt(Carbon::createFromTimestamp(strtotime($record->end_time)))) {
@@ -96,8 +97,8 @@ class WechatMinprogramUserService
             'YEAR' => '包年',
         ];
         $list = Order::join('pay_products', 'pay_products.id', '=', 'orders.pay_product_id')
-            ->select('orders.price', 'orders.trade_no', "orders.video_id", 'orders.pay_end_at', 'pay_products.type', 'pay_products.price as product_price', 'pay_products.given')
-            ->where('orders.status', 'PAID')
+            ->select('orders.price', 'orders.trade_no', "orders.video_id", 'orders.pay_end_at', 'pay_products.type', 'pay_products.price as product_price', 'orders.status','pay_products.given')
+            ->where('orders.status','<>', 'UNPAID')
             ->where('orders.uid', $uid);
         if (getProp($param, 'puser_id', 0) > 0) {
             $list->where('orders.puser_id', $param['puser_id']);
@@ -108,10 +109,9 @@ class WechatMinprogramUserService
 
         $list = $list->orderBy('orders.id', 'desc')
             ->paginate(getProp($param,'limit',15));
-
+        $status = array_column( OrderService::getOrderPayType(), null, 'value');
         foreach ($list as $item) {
             $item->pay_name = '微信支付';
-            $item->status = '已完成';
             if ($item->type == 'COIN') {
                 $item->rechare_coin = $item->product_price * 100;
                 $item->pay_result =- $item->product_price * 100 + $item->given;
@@ -122,6 +122,7 @@ class WechatMinprogramUserService
                 $item->rechare_coin = "-";
                 $item->pay_result = '充值';
             }
+            $item->status_txt = $status[$item->status]['name'] ?? "-";
             $item->from_page = $item->video_id > 0 ? "播放页" : "充值页";
         }
         return $list;