diff --git a/app/manager/controller/SellInfo.php b/app/manager/controller/SellInfo.php index f40575f..cb144e1 100644 --- a/app/manager/controller/SellInfo.php +++ b/app/manager/controller/SellInfo.php @@ -142,12 +142,14 @@ class SellInfo extends Controller // $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['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['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']; @@ -291,12 +293,14 @@ class SellInfo extends Controller $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['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['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']; diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php index 5d71756..6bcff31 100644 --- a/app/manager/controller/UserFollow.php +++ b/app/manager/controller/UserFollow.php @@ -286,6 +286,10 @@ class UserFollow extends Controller case 'mogu_order': $info['product_type'] = '蘑菇IP订单'; break; + + case 'jihu_order': + $info['product_type'] = '极狐IP订单'; + break; case 'recharge': $info['product_type'] = 'IP充值'; break; @@ -358,6 +362,8 @@ class UserFollow extends Controller case 'mogu_order': $info['product_type'] = '蘑菇IP订单'; break; + case 'jihu_order': + $info['product_type'] = '极狐IP订单'; case 'recharge': $info['product_type'] = 'IP充值'; break; @@ -455,7 +461,7 @@ class UserFollow extends Controller 'sell_money' => 0, 'sell_type' => 0, ]; - if ($data['product_type'] == 'other_order' || $data['product_type'] == 'mogu_order') { + if ($data['product_type'] == 'other_order' || $data['product_type'] == 'mogu_order' || $data['product_type'] == 'jihu_order') { $sell_where = [ 'UserId' => $data['user_id'], 'PaymentAmount' => $data['sell_money'],