明细满额

app/admin/controller/order/KangyangCityController.php

@@ -362,14 +362,16 @@ class KangyangCityController extends Curd
 //            $params['order_express_goods'] = json_encode(['sheet' => [$sheetId]]);
 
             // 2.4W 康养城
+            $full = '';
             if ($params['goods_classify'] == 'VIP' && $params['order_status_payment'] == 'SUCCESS' && (!empty($paidOrder) && floatval($paidOrder->order_amount_paid) >= $paidOrder->order_amount_total || floatval($params['order_amount_pay']) >= $params['order_amount_total'])) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.kangyangCityVIP.grant', $params);
             }
             // 触发事件
             if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y' && $params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养城VIP套餐包收入';
+                $params['inout_category'] = '购买康养城VIP套餐包收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -582,8 +584,10 @@ class KangyangCityController extends Curd
 
             PayDetail::insert($payData);
 
+            $full = '';
             // 2.4W 康养城
             if ($params['goods_classify'] == 'VIP' && $order->order_status_payment == 'SUCCESS' && floatval($order->order_amount_paid) >= $order->order_amount_total) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.kangyangCityVIP.grant', $params);
             }
@@ -595,7 +599,7 @@ class KangyangCityController extends Curd
             }// 触发事件
             if ($order->order_is_complete == 'Y' && $order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养城VIP套餐包收入';
+                $params['inout_category'] = '购买康养城VIP套餐包收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -825,7 +829,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','member_is_vip','member_is_partner','member_is_referrer', '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');
@@ -971,8 +975,8 @@ class KangyangCityController extends Curd
                     $item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
                 }
 
-                if (!empty($item['member_info'])){
-                    if (empty($item['member_info']['member_info_headimg']) || substr($item['member_info']['member_info_headimg'],0,1) == '.'){
+                if (!empty($item['member_info'])) {
+                    if (empty($item['member_info']['member_info_headimg']) || substr($item['member_info']['member_info_headimg'], 0, 1) == '.') {
                         $item['member_info']['member_info_headimg'] = "https://img.wanyuewellness.com.cn/images/avatar_default.png";
                     }
                 }

app/admin/controller/order/NewCustomerController.php

@@ -321,7 +321,9 @@ class NewCustomerController extends Curd
             Db::commit();
 
             // 分期付完
+            $full = '';
             if ($params['goods_classify'] == 'COMBINE' && $params['order_status_payment'] == 'SUCCESS' && (!empty($paidOrder) && floatval($paidOrder->order_amount_paid) >= $paidOrder->order_amount_total || floatval($params['order_amount_pay']) >= $params['order_amount_total'])) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 // 完成订单
                 Event::dispatch('order.complete', $params);
@@ -330,7 +332,7 @@ class NewCustomerController extends Curd
             }
             if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买组合包收入';
+                $params['inout_category'] = '购买组合包收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
@@ -535,7 +537,9 @@ class NewCustomerController extends Curd
             Db::commit();
 
             // 分期付款完成
+            $full = '';
             if ($params['goods_classify'] == 'COMBINE' && $order->order_status_payment == 'SUCCESS' && floatval($order->order_amount_paid) >= $order->order_amount_total) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 // 完成订单
                 Event::dispatch('order.complete', $params);
@@ -544,7 +548,7 @@ class NewCustomerController extends Curd
             }
             if ($order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买组合包收入';
+                $params['inout_category'] = '购买组合包收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($order->order_status_payment != 'SUCCESS' && $paymentStatus != 'SUCCESS') {
@@ -1146,10 +1150,11 @@ class NewCustomerController extends Curd
                     ]);
                 }
             }
+            $full = '';
             if ($payStatus == 'Y') {
                 Db::commit();
-
                 if ($order['order_amount_paid'] + $payAmount >= $order['order_amount_total']) {
+                    $full = '-满额';
                     $params['member_id'] = $order['join_order_member_id'];
                     $params['join_sheet_goods_id'] = $sheet->join_sheet_goods_id;
                     Event::dispatch('order.new_custom.grant', $params);
@@ -1157,7 +1162,7 @@ class NewCustomerController extends Curd
 
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '购买组合包收入';
+                $params['inout_category'] = '购买组合包收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
 
                 return json_success('success');

app/admin/controller/order/PartnerController.php

@@ -326,13 +326,15 @@ class PartnerController extends Curd
             $this->insertPayDetail($params);
             Db::commit();
             // 分期付完
+            $full = '';
             if ($params['goods_classify'] == 'PARTNER' && $params['order_status_payment'] == 'SUCCESS' && (!empty($paidOrder) && floatval($paidOrder->order_amount_paid) >= $paidOrder->order_amount_total || floatval($params['order_amount_pay']) >= $params['order_amount_total'])) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.partner.grant', $params);
             }
-            if ($params['order_status_payment'] == 'SUCCESS'){
+            if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买会员合伙人收入';
+                $params['inout_category'] = '购买会员合伙人收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
@@ -551,14 +553,16 @@ class PartnerController extends Curd
             Db::commit();
 
             // 分期付款完成
+            $full = '';
             if ($params['goods_classify'] == 'PARTNER' && $order->order_status_payment == 'SUCCESS' && floatval($order->order_amount_paid) >= $order->order_amount_total) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.complete', $params);
                 Event::dispatch('order.partner.grant', $params);
             }
-            if ($order->order_status_payment == 'SUCCESS'){
+            if ($order->order_status_payment == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买会员合伙人收入';
+                $params['inout_category'] = '购买会员合伙人收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
             if ($order->order_status_payment != 'SUCCESS' && $paymentStatus != 'SUCCESS') {
@@ -787,7 +791,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','member_is_vip','member_is_partner','member_is_referrer');
+                    $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');
@@ -1211,8 +1215,10 @@ class PartnerController extends Curd
                     ]);
                 }
             }
+            $full = '';
             if ($payStatus == 'Y') {
                 if ($order['order_amount_paid'] + $payAmount >= $order['order_amount_total']) {
+                    $full = '-满额';
                     $params['member_id'] = $order['join_order_member_id'];
                     $params['orderId'] = $order['order_id'];
                     $params['order_amount_pay'] = $payAmount;
@@ -1231,7 +1237,7 @@ class PartnerController extends Curd
 
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '购买会员合伙人收入';
+                $params['inout_category'] = '购买会员合伙人收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
 
                 return json_success('success');

app/admin/controller/order/ReferrerController.php

@@ -326,13 +326,15 @@ class ReferrerController extends Curd
             $this->insertPayDetail($params);
             Db::commit();
             // 分期付完
+            $full = '';
             if ($params['goods_classify'] == 'REFERRER' && $params['order_status_payment'] == 'SUCCESS' && (!empty($paidOrder) && floatval($paidOrder->order_amount_paid) >= $paidOrder->order_amount_total || floatval($params['order_amount_pay']) >= $params['order_amount_total'])) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.referrer.grant', $params);
             }
-            if ($params['order_status_payment'] == 'SUCCESS'){
+            if ($params['order_status_payment'] == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养推荐官收入';
+                $params['inout_category'] = '购买康养推荐官收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -550,16 +552,17 @@ class ReferrerController extends Curd
             PayDetail::insert($payData);
 
             Db::commit();
-
+            $full = '';
             // 分期付款完成
             if ($params['goods_classify'] == 'REFERRER' && $order->order_status_payment == 'SUCCESS' && floatval($order->order_amount_paid) >= $order->order_amount_total) {
+                $full = '-满额';
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.complete', $params);
                 Event::dispatch('order.referrer.grant', $params);
             }
-            if ($paymentStatus == 'SUCCESS'){
+            if ($paymentStatus == 'SUCCESS') {
                 // 入收支明细表
-                $params['inout_category'] = '购买康养推荐官收入';
+                $params['inout_category'] = '购买康养推荐官收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
             }
 
@@ -789,7 +792,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','member_is_vip','member_is_partner','member_is_referrer');
+                    $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');
@@ -1200,8 +1203,10 @@ class ReferrerController extends Curd
                     ]);
                 }
             }
+            $full = '';
             if ($payStatus == 'Y') {
                 if ($order['order_amount_paid'] + $payAmount >= $order['order_amount_total']) {
+                    $full = '-满额';
                     $params['member_id'] = $order['join_order_member_id'];
                     $params['orderId'] = $order['order_id'];
                     $params['order_amount_pay'] = $payAmount;
@@ -1220,7 +1225,7 @@ class ReferrerController extends Curd
 
                 // 入收支明细表
                 $params['orderId'] = $order['order_id'];
-                $params['inout_category'] = '购买康养推荐官收入';
+                $params['inout_category'] = '购买康养推荐官收入' . $full;
                 Event::dispatch('statistics.inout.in', $params);
 
                 return json_success('success');