|
@@ -525,13 +525,14 @@ class Order
|
|
(
|
|
(
|
|
array('应付金额', '¥' . $info['f_price'] . '元'),
|
|
array('应付金额', '¥' . $info['f_price'] . '元'),
|
|
array('实付金额', '¥' . $info['price'] . '元'),
|
|
array('实付金额', '¥' . $info['price'] . '元'),
|
|
|
|
+ array('代理费', '¥' . $info['agent_cash'] . '元'),
|
|
),
|
|
),
|
|
|
|
|
|
array
|
|
array
|
|
(
|
|
(
|
|
- array('代理费', '¥' . $info['agent_cash'] . '元'),
|
|
|
|
array('软件服务费', '¥' . $info['soft_cash'] . '元'),
|
|
array('软件服务费', '¥' . $info['soft_cash'] . '元'),
|
|
array('商品价值', '¥' . $info['goods_cash'] . '元'),
|
|
array('商品价值', '¥' . $info['goods_cash'] . '元'),
|
|
|
|
+ array('赠送期权价值', '¥' . $info['option_price'] . '元'),
|
|
),
|
|
),
|
|
|
|
|
|
array
|
|
array
|
|
@@ -594,7 +595,7 @@ class Order
|
|
'link' => $purl,
|
|
'link' => $purl,
|
|
'name' => '备注',
|
|
'name' => '备注',
|
|
);
|
|
);
|
|
-
|
|
|
|
|
|
+
|
|
if ($info['status'] <= 1) {
|
|
if ($info['status'] <= 1) {
|
|
$purl = Dever::url('project/database/update?project=agent&table=order&where_id='.$info['id'].'&col=invite_type,parent_code,source_id,name,idcard,type,idcard_front,idcard_back,company_name,company_number,company_pic,pay_type,pay_pic', 'manage');
|
|
$purl = Dever::url('project/database/update?project=agent&table=order&where_id='.$info['id'].'&col=invite_type,parent_code,source_id,name,idcard,type,idcard_front,idcard_back,company_name,company_number,company_pic,pay_type,pay_pic', 'manage');
|
|
|
|
|
|
@@ -634,7 +635,7 @@ class Order
|
|
$cstatus = ',prize_type';
|
|
$cstatus = ',prize_type';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,price,desc'.$cstatus.'&price='.$info['price'].'&soft_price=' . $soft_price, 'manage');
|
|
|
|
|
|
+ $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,price,option_price,desc'.$cstatus.'&price='.$info['price'].'&soft_price=' . $soft_price, 'manage');
|
|
if (isset($process[1]) && $process[1]) {
|
|
if (isset($process[1]) && $process[1]) {
|
|
$purl .= '&where_id=' . $process[1]['id'];
|
|
$purl .= '&where_id=' . $process[1]['id'];
|
|
}
|
|
}
|