From 73bce4e8f8b3b006caa0c29bf21acbc978a4bde4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Sat, 17 May 2025 11:37:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E7=9A=84=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/manager/controller/SellInfo.php | 38 +++++++++++++++------------ app/manager/controller/UserFollow.php | 7 +++-- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/manager/controller/SellInfo.php b/app/manager/controller/SellInfo.php index 84e63cf..a15dbda 100644 --- a/app/manager/controller/SellInfo.php +++ b/app/manager/controller/SellInfo.php @@ -140,18 +140,20 @@ class SellInfo extends Controller // $data['cost_not_mogu'] = "其他营业额($cost_not_mogu_data)"; // $data['sell_percent'] = "我的营业额($user_cost)/总营业额($all_cost)=" . $sell_percent . '%'; - $data['other_order_active'] = "其他IP产品:" . $sell_money_list['other_order_1']; - $data['mogu_order_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_1']; - $data['jihu_order_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_1']; - $data['jiguang_order_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_1']; + $data['other_order_active'] = "合营IP产品:" . $sell_money_list['other_order_1']; + $data['self_order_active'] = "自营IP产品:" . $sell_money_list['self_order_1']; + // $data['mogu_order_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_1']; + // $data['jihu_order_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_1']; + // $data['jiguang_order_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_1']; $data['recharge_active'] = "IP充值:" . $sell_money_list['recharge_1']; $data['http_active'] = "HTTP充值:" . $sell_money_list['http_1']; $data['ros_active'] = "ROS订单:" . $sell_money_list['ros_1']; $data['jinqiao_active'] = "金桥订单:" . $sell_money_list['jinqiao_1']; $data['other_order_not_active'] = "其他IP产品:" . $sell_money_list['other_order_0']; - $data['mogu_order_not_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_0']; - $data['jihu_order_not_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_0']; - $data['jiguang_order_not_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_0']; + $data['self_order_not_active'] = "其他IP产品:" . $sell_money_list['self_order_0']; + // $data['mogu_order_not_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_0']; + // $data['jihu_order_not_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_0']; + // $data['jiguang_order_not_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_0']; $data['recharge_not_active'] = "IP充值:" . $sell_money_list['recharge_0']; $data['http_not_active'] = "HTTP充值:" . $sell_money_list['http_0']; $data['ros_not_active'] = "ROS订单:" . $sell_money_list['ros_0']; @@ -293,25 +295,27 @@ class SellInfo extends Controller $cost_mogu_data = round($mogu_cost-$mogu_refund_cost,2); //其他营业额 $cost_not_mogu_data = round($user_cost-$cost_mogu_data-$refund,2); - $data['other_order_active'] = "其他IP产品:" . $sell_money_list['other_order_1']; - $data['mogu_order_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_1']; - $data['jihu_order_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_1']; - $data['jiguang_order_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_1']; + $data['other_order_active'] = "合营IP产品:" . $sell_money_list['other_order_1']; + $data['self_order_active'] = "自营IP产品:" . $sell_money_list['self_order_1']; + // $data['mogu_order_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_1']; + // $data['jihu_order_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_1']; + // $data['jiguang_order_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_1']; $data['recharge_active'] = "IP充值:" . $sell_money_list['recharge_1']; $data['http_active'] = "HTTP充值:" . $sell_money_list['http_1']; $data['ros_active'] = "ROS订单:" . $sell_money_list['ros_1']; $data['jinqiao_active'] = "金桥订单:" . $sell_money_list['jinqiao_1']; - $data['other_order_not_active'] = "其他IP产品:" . $sell_money_list['other_order_0']; - $data['mogu_order_not_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_0']; - $data['jihu_order_not_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_0']; - $data['jiguang_order_not_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_0']; + $data['other_order_not_active'] = "合营IP产品:" . $sell_money_list['other_order_0']; + $data['self_order_not_active'] = "自营IP产品:" . $sell_money_list['self_order_0']; + // $data['mogu_order_not_active'] = "蘑菇IP产品:" . $sell_money_list['mogu_order_0']; + // $data['jihu_order_not_active'] = "极狐IP产品:" . $sell_money_list['jihu_order_0']; + // $data['jiguang_order_not_active'] = "极光IP产品:" . $sell_money_list['jiguang_order_0']; $data['recharge_not_active'] = "IP充值:" . $sell_money_list['recharge_0']; $data['http_not_active'] = "HTTP充值:" . $sell_money_list['http_0']; $data['ros_not_active'] = "ROS订单:" . $sell_money_list['ros_0']; $data['jinqiao_not_active'] = "金桥订单:" . $sell_money_list['jinqiao_0']; - $data['cost_mogu'] = "蘑菇营业额($cost_mogu_data)"; - $data['cost_not_mogu'] = "其他营业额($cost_not_mogu_data)"; + // $data['cost_mogu'] = "蘑菇营业额($cost_mogu_data)"; + // $data['cost_not_mogu'] = "其他营业额($cost_not_mogu_data)"; $data['sell_percent'] = "我的营业额($user_cost)/总营业额($all_cost)=" . $sell_percent . '%'; $data['cost_percent'] = "需维护的已消费客户($user_cost_num)/总的已消费客户($all_cost_num)=" . $cost_percent . '%'; diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php index 6515a8d..630a0e3 100644 --- a/app/manager/controller/UserFollow.php +++ b/app/manager/controller/UserFollow.php @@ -281,7 +281,10 @@ class UserFollow extends Controller $info['op_user'] = $manager_info['RealName']; switch($info['product_type']) { case 'other_order': - $info['product_type'] = '其他IP产品订单'; + $info['product_type'] = '合营IP订单'; + break; + case 'self_order': + $info['product_type'] = '自营IP订单'; break; case 'mogu_order': $info['product_type'] = '蘑菇IP订单'; @@ -472,7 +475,7 @@ class UserFollow extends Controller 'sell_money' => 0, 'sell_type' => 0, ]; - if ($data['product_type'] == 'other_order' || $data['product_type'] == 'mogu_order' || $data['product_type'] == 'jihu_order' || $data['product_type'] == 'jiguang_order') { + if ($data['product_type'] == 'other_order' || $data['product_type'] == 'self_order' ) { $sell_where = [ 'UserId' => $data['user_id'], 'PaymentAmount' => $data['sell_money'],