补字段

app/admin/controller/order/GoodsController.php

@@ -157,7 +157,7 @@ class GoodsController extends Curd
         if ($field) {
             $model = $model->orderBy($field, $order);
         }
-        $model = $model->select('order.*', 'order_express.join_express_order_id', 'order_express.order_express_type', 'order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status', 'order_return.order_return_apply_json', 'order_return.order_return_remark');
+        $model = $model->select('order.*', 'order_express.join_express_order_id', 'order_express.order_express_type', 'order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status', 'order_return.order_return_apply_json', 'order_return.order_return_refund_json', 'order_return.order_return_remark');
         return $model;
     }
 
@@ -176,6 +176,7 @@ class GoodsController extends Curd
                 $item['sheet']['order_sheet_num'] = intval($item['sheet']['order_sheet_num']);
             }
             unset($item['sheets']);
+            $item['order_return_amount'] = 0;
             if (isset($item['orders_return_id'])) {
                 $item['return'] = [
                     'orders_return_id' => $item['orders_return_id'],
@@ -184,6 +185,12 @@ class GoodsController extends Curd
                     'order_return_apply_json' => $item['order_return_apply_json'],
                     'order_return_remark' => $item['order_return_remark']
                 ];
+                if (!empty($item['order_return_refund_json'])) {
+                    $refundJson = json_decode($item['order_return_refund_json'], true);
+                    if (isset($refundJson['amount'])) {
+                        $item['order_return_amount'] = $refundJson['amount'];
+                    }
+                }
             }
             if (isset($item['join_express_order_id'])) {
                 $item['express'] = [

app/admin/controller/order/KangyangCityController.php

@@ -813,7 +813,7 @@ class KangyangCityController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner','member_is_vip','member_is_partner','member_is_referrer', 'join_member_role_id');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');

app/admin/controller/order/NewCustomerController.php

@@ -744,7 +744,7 @@ class NewCustomerController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id','member_is_vip','member_is_partner','member_is_referrer');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express', 'goods_attribute_json');

app/admin/controller/order/PackagesController.php

@@ -175,7 +175,7 @@ class PackagesController extends Curd
         if ($field) {
             $model = $model->orderBy($field, $order);
         }
-        $model = $model->select('order.*', 'order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status', 'order_return.order_return_apply_json', 'order_return.order_return_remark');
+        $model = $model->select('order.*', 'order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status', 'order_return.order_return_apply_json', 'order_return.order_return_refund_json', 'order_return.order_return_remark');
 
         return $model;
     }
@@ -195,6 +195,7 @@ class PackagesController extends Curd
                 $item['sheet']['order_sheet_num'] = intval($item['sheet']['order_sheet_num']);
             }
             unset($item['sheets']);
+            $item['order_return_amount'] = 0;
             if (isset($item['orders_return_id'])) {
                 $item['return'] = [
                     'orders_return_id' => $item['orders_return_id'],
@@ -203,6 +204,12 @@ class PackagesController extends Curd
                     'order_return_apply_json' => $item['order_return_apply_json'],
                     'order_return_remark' => $item['order_return_remark']
                 ];
+                if (!empty($item['order_return_refund_json'])) {
+                    $refundJson = json_decode($item['order_return_refund_json'], true);
+                    if (isset($refundJson['amount'])) {
+                        $item['order_return_amount'] = $refundJson['amount'];
+                    }
+                }
             }
             $item['have_success_paydetail'] = 'N';
             if (PayDetail::where('join_pay_order_id', $item['order_groupby'])

app/admin/controller/order/PartnerController.php

@@ -779,7 +779,7 @@ class PartnerController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id','member_is_vip','member_is_partner','member_is_referrer');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');

app/admin/controller/order/ReferrerController.php

@@ -779,7 +779,7 @@ class ReferrerController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id','member_is_vip','member_is_partner','member_is_referrer');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');

app/admin/controller/order/ServicesController.php

@@ -146,7 +146,7 @@ class ServicesController extends Curd
         if ($field) {
             $model = $model->orderBy($field, $order);
         }
-        $model = $model->select('order.*', 'order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status', 'order_return.order_return_apply_json', 'order_return.order_return_remark');
+        $model = $model->select('order.*', 'order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status', 'order_return.order_return_apply_json', 'order_return.order_return_refund_json', 'order_return.order_return_remark');
         return $model;
     }
 
@@ -165,6 +165,7 @@ class ServicesController extends Curd
                 $item['sheet']['order_sheet_num'] = intval($item['sheet']['order_sheet_num']);
             }
             unset($item['sheets']);
+            $item['order_return_amount'] = 0;
             if (isset($item['orders_return_id'])) {
                 $item['return'] = [
                     'orders_return_id' => $item['orders_return_id'],
@@ -173,6 +174,12 @@ class ServicesController extends Curd
                     'order_return_apply_json' => $item['order_return_apply_json'],
                     'order_return_remark' => $item['order_return_remark']
                 ];
+                if (!empty($item['order_return_refund_json'])) {
+                    $refundJson = json_decode($item['order_return_refund_json'], true);
+                    if (isset($refundJson['amount'])) {
+                        $item['order_return_amount'] = $refundJson['amount'];
+                    }
+                }
             }
             $item['have_success_paydetail'] = 'N';
             if (PayDetail::where('join_pay_order_id', $item['order_groupby'])

app/admin/controller/order/WholeController.php

@@ -330,7 +330,7 @@ class WholeController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id','member_is_vip','member_is_partner','member_is_referrer');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');
@@ -4422,6 +4422,89 @@ class WholeController extends Curd
         return call_user_func([$this, $format_function], $items, $total);
     }
 
+    protected function exportAfterQuery($items)
+    {
+        $data = [];
+        foreach ($items as $key => $item) {
+            $goodsClassify = '';
+            $goodsName = '--';
+            if (!empty($item['sheet'])) {
+                $goods = Goods::where('goods_id', $item['sheet']['join_sheet_goods_id'])->first();
+                $goodsClassify = $goods->goods_classify ?? '';
+                $goodsName = $goods->goods_name ?? '--';
+            }
+            $systemStatus = '';
+            if ($item['order_is_complete'] == 'Y') {
+                $systemStatus = '已完成';
+            } elseif ($item['order_is_complete'] == 'R') {
+                $systemStatus = '售后已完成';
+            }
+
+            if (!empty($item['order_return_status']) && $item['order_return_status'] == 'PENDING') {
+                $systemStatus = '售后待处理';
+            } elseif (!empty($item['order_return_status']) && $item['order_return_status'] == 'DOING') {
+                $systemStatus = '退款中';
+            } elseif (!empty($item['order_return_status']) && $item['order_return_status'] == 'DONE') {
+                $systemStatus = '退款完成';
+                if (!empty($item['order_return_refund_json'])){
+                    $refundJson = json_decode($item['order_return_refund_json'],true);
+                    if (isset($refundJson['amount']) && $refundJson['amount'] >= $item['order_amount_pay']){
+                        $systemStatus .= "(全额)";
+                    }else{
+                        $systemStatus .= "(部分)";
+                    }
+                }
+            } elseif (!empty($item['order_return_status']) && $item['order_return_status'] == 'DISAGREE') {
+                $systemStatus = '不同意退款';
+            }
+
+            $payDetails = PayDetail::where('join_pay_order_id', $item['order_groupby'])
+                ->whereJsonContains('join_pay_object_json->order_id', $item['order_id'])
+                ->where('pay_status', 'SUCCESS')
+                ->where('pay_category', '<>', 'REFUND')
+                ->get()
+                ->toArray();
+            if (count($payDetails) > 1) {
+                $payWay = '组合支付';
+            } elseif (count($payDetails) == 1) {
+                $payWayEn = OrderService::getPayWayByPrepayId($payDetails[0]['pay_prepayid']);
+                $payWay = '';
+                if (!empty($payWayEn)) {
+                    $payWay = OrderService::$payWay[$payWayEn];
+                }
+            }
+            if (count($payDetails) > 0) {
+                $payDetail0 = $payDetails[0];
+                $payTimes = $payDetail0['pay_paytimes'];
+            }
+            if (!empty($item['member']) && $item['member']['member_mobile'] == '0000') {
+                $memberName = '散客';
+            } else {
+                $memberName = !empty($item['cert']) ? $item['cert']['member_cert_name'] : (!empty($item['member']) ? (substr($item['member']['member_mobile'], -4) . '会员' . '-') : '');
+                if (!empty($item['member'])) {
+                    $memberName .= $item['member']['member_mobile'];
+                }
+            }
+            $data[$key] = [
+                'goods_classify' => !empty($goodsClassify) && isset(self::$goodsClassify[$goodsClassify]) ? self::$goodsClassify[$goodsClassify] : '其他订单',
+                'order_id' => $item['order_id'],
+                'member' => $memberName,
+                'goods_name' => $goodsName,
+                'nbr' => !empty($item['sheet']) ? intval($item['sheet']['order_sheet_num']) : '--',
+                'order_amount_total' => $item['order_amount_total'],
+                'order_amount_pay' => $item['order_amount_pay'],
+                'order_status_system' => !empty($systemStatus) ? $systemStatus : self::$systemStatus[$item['order_status_system']],
+                'order_status_payment' => self::$paymentStatus[$item['order_status_payment']],
+                'pay_way' => $item['order_status_payment'] == 'SUCCESS' ? ($payWay ?? '') : '',
+                'pay_times' => $item['order_status_payment'] == 'SUCCESS' || $item['order_status_payment'] == 'FREE' ? ($payTimes ?? '') : '',
+                'order_addtimes' => date('Y-m-d H:i:s', strtotime($item['order_addtimes'])),
+            ];
+        }
+
+        return $data;
+    }
+
+
     public function benefitList(Request $request)
     {
         $orderIds = $request->get('order_ids', []);
@@ -4625,80 +4708,6 @@ class WholeController extends Curd
         }
     }
 
-    protected function exportAfterQuery($items)
-    {
-        $data = [];
-        foreach ($items as $key => $item) {
-            $goodsClassify = '';
-            $goodsName = '--';
-            if (!empty($item['sheet'])) {
-                $goods = Goods::where('goods_id', $item['sheet']['join_sheet_goods_id'])->first();
-                $goodsClassify = $goods->goods_classify ?? '';
-                $goodsName = $goods->goods_name ?? '--';
-            }
-            $systemStatus = '';
-            if ($item['order_is_complete'] == 'Y') {
-                $systemStatus = '已完成';
-            } elseif ($item['order_is_complete'] == 'R') {
-                $systemStatus = '售后已完成';
-            }
-
-            if ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'PENDING') {
-                $systemStatus = '待处理';
-            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DOING') {
-                $systemStatus = '退款中';
-            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DONE') {
-                $systemStatus = '退款完成';
-            } elseif ($item['order_is_complete'] != 'R' && !empty($item['order_return_status']) && $item['order_return_status'] == 'DISAGREE') {
-                $systemStatus = '不同意退款';
-            }
-
-            $payDetails = PayDetail::where('join_pay_order_id', $item['order_groupby'])
-                ->whereJsonContains('join_pay_object_json->order_id', $item['order_id'])
-                ->where('pay_status', 'SUCCESS')
-                ->where('pay_category', '<>', 'REFUND')
-                ->get()
-                ->toArray();
-            if (count($payDetails) > 1) {
-                $payWay = '组合支付';
-            } elseif (count($payDetails) == 1) {
-                $payWayEn = OrderService::getPayWayByPrepayId($payDetails[0]['pay_prepayid']);
-                $payWay = '';
-                if (!empty($payWayEn)) {
-                    $payWay = OrderService::$payWay[$payWayEn];
-                }
-            }
-            if (count($payDetails) > 0) {
-                $payDetail0 = $payDetails[0];
-                $payTimes = $payDetail0['pay_paytimes'];
-            }
-            if (!empty($item['member']) && $item['member']['member_mobile'] == '0000') {
-                $memberName = '散客';
-            } else {
-                $memberName = !empty($item['cert']) ? $item['cert']['member_cert_name'] : (!empty($item['member']) ? (substr($item['member']['member_mobile'], -4) . '会员' . '-') : '');
-                if (!empty($item['member'])) {
-                    $memberName .= $item['member']['member_mobile'];
-                }
-            }
-            $data[$key] = [
-                'goods_classify' => !empty($goodsClassify) && isset(self::$goodsClassify[$goodsClassify]) ? self::$goodsClassify[$goodsClassify] : '其他订单',
-                'order_id' => $item['order_id'],
-                'member' => $memberName,
-                'goods_name' => $goodsName,
-                'nbr' => !empty($item['sheet']) ? intval($item['sheet']['order_sheet_num']) : '--',
-                'order_amount_total' => $item['order_amount_total'],
-                'order_amount_pay' => $item['order_amount_pay'],
-                'order_status_system' => !empty($systemStatus) ? $systemStatus : self::$systemStatus[$item['order_status_system']],
-                'order_status_payment' => self::$paymentStatus[$item['order_status_payment']],
-                'pay_way' => $item['order_status_payment'] == 'SUCCESS' ? ($payWay ?? '') : '',
-                'pay_times' => $item['order_status_payment'] == 'SUCCESS' || $item['order_status_payment'] == 'FREE' ? ($payTimes ?? '') : '',
-                'order_addtimes' => date('Y-m-d H:i:s', strtotime($item['order_addtimes'])),
-            ];
-        }
-
-        return $data;
-    }
-
     /**
      * @Desc 查询订单状态
      * @Author Gorden

app/admin/service/member/MemberService.php

@@ -114,6 +114,7 @@ class MemberService
             ->forPage($page, $pageSize)
             ->get()
             ->toArray();
+        dump($rows);
 
         foreach ($rows as &$row) {
             $row['coupon_count'] = CouponDetail::where('join_coupon_detail_member_id', $row['member_id'])->count();
@@ -1117,7 +1118,7 @@ class MemberService
             return json_fail('暂无数据');
         }
         $balance = $account->member_account_surplus + $account->member_account_added;
-        $points = ClientPoints::where('join_client_points_member_id', $memberId)->get()->toArray();
+        $points = ClientPoints::where('join_client_points_member_id', $memberId)->orderBy('client_points_addtimes','DESC')->get()->toArray();
         $nowPoint = 0;
         foreach ($points as $key => &$point) {
             $point['goods_category'] = '其他';