|
@@ -299,6 +299,13 @@ class TPlusServerService extends Service
|
|
|
|
|
|
//组织数据
|
|
//组织数据
|
|
foreach ($dataArray as $key => $value) {
|
|
foreach ($dataArray as $key => $value) {
|
|
|
|
+ $customer_profit_rate = rtrim($value['customer_profit_rate'],'%');
|
|
|
|
+ if(is_numeric($customer_profit_rate)){
|
|
|
|
+ $customer_profit_rate = bcdiv($customer_profit_rate,100,3);
|
|
|
|
+ }else{
|
|
|
|
+ $customer_profit_rate = 0;
|
|
|
|
+ }
|
|
|
|
+ $dataArray[$key]['customer_profit_rate'] = $customer_profit_rate;
|
|
$p_tmp = $product_map[$value['product_code']] ?? [];
|
|
$p_tmp = $product_map[$value['product_code']] ?? [];
|
|
$dataArray[$key]['order_type'] = RevenueCost::ORDER_ONE;
|
|
$dataArray[$key]['order_type'] = RevenueCost::ORDER_ONE;
|
|
$dataArray[$key]['order_time'] = strtotime($value['order_time']);
|
|
$dataArray[$key]['order_time'] = strtotime($value['order_time']);
|
|
@@ -390,6 +397,13 @@ class TPlusServerService extends Service
|
|
|
|
|
|
//组织数据
|
|
//组织数据
|
|
foreach ($dataArray as $key => $value){
|
|
foreach ($dataArray as $key => $value){
|
|
|
|
+ $customer_profit_rate = rtrim($value['customer_profit_rate'],'%');
|
|
|
|
+ if(is_numeric($customer_profit_rate)){
|
|
|
|
+ $customer_profit_rate = bcdiv($customer_profit_rate,100,3);
|
|
|
|
+ }else{
|
|
|
|
+ $customer_profit_rate = 0;
|
|
|
|
+ }
|
|
|
|
+ $dataArray[$key]['customer_profit_rate'] = $customer_profit_rate;
|
|
$p_tmp = $product_map[$value['product_code']] ?? [];
|
|
$p_tmp = $product_map[$value['product_code']] ?? [];
|
|
$dataArray[$key]['order_type'] = RevenueCost::ORDER_TWO;
|
|
$dataArray[$key]['order_type'] = RevenueCost::ORDER_TWO;
|
|
$dataArray[$key]['order_time'] = strtotime($value['order_time']);
|
|
$dataArray[$key]['order_time'] = strtotime($value['order_time']);
|
|
@@ -480,6 +494,13 @@ class TPlusServerService extends Service
|
|
|
|
|
|
//组织数据
|
|
//组织数据
|
|
foreach ($dataArray as $key => $value){
|
|
foreach ($dataArray as $key => $value){
|
|
|
|
+ $customer_profit_rate = rtrim($value['customer_profit_rate'],'%');
|
|
|
|
+ if(is_numeric($customer_profit_rate)){
|
|
|
|
+ $customer_profit_rate = bcdiv($customer_profit_rate,100,3);
|
|
|
|
+ }else{
|
|
|
|
+ $customer_profit_rate = 0;
|
|
|
|
+ }
|
|
|
|
+ $dataArray[$key]['customer_profit_rate'] = $customer_profit_rate;
|
|
$p_tmp = $product_map[$value['product_code']] ?? [];
|
|
$p_tmp = $product_map[$value['product_code']] ?? [];
|
|
$dataArray[$key]['order_type'] = RevenueCost::ORDER_THREE;
|
|
$dataArray[$key]['order_type'] = RevenueCost::ORDER_THREE;
|
|
$dataArray[$key]['order_time'] = strtotime($value['order_time']);
|
|
$dataArray[$key]['order_time'] = strtotime($value['order_time']);
|