|
|
@@ -1184,6 +1184,14 @@ class Dhorder
|
|
|
if($member_goods && $member_goods['cdate']){
|
|
|
$quanyi = date('Y-m-d H:i',$member_goods['cdate']);
|
|
|
}
|
|
|
+ $order = Dever::db('agent/order')->find(array('mid'=>$member['id']));
|
|
|
+ $zhongshen = '';
|
|
|
+ $process = Dever::db('agent/order_process')->state(array('order_id'=>$order['id']));
|
|
|
+ foreach($process as $k1 => $v1){
|
|
|
+ if($v1['status'] == 2){
|
|
|
+ $zhongshen = date('Y-m-d H:i',$v1['cdate']);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$goods_status = Dever::db('agent/dh_order')->config['status'];
|
|
|
$status = Dever::status($goods_status, $v['status']);
|
|
|
@@ -1205,7 +1213,7 @@ class Dhorder
|
|
|
$fdate,
|
|
|
$v['audit_desc'],
|
|
|
$quanyi,
|
|
|
- $quanyi,
|
|
|
+ $zhongshen,
|
|
|
|
|
|
);
|
|
|
$body[] = $d;
|
|
|
@@ -1220,23 +1228,23 @@ class Dhorder
|
|
|
foreach($data as $k => $v){
|
|
|
$member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
|
|
|
$role = Dever::db('setting/role')->find(array('id'=>$member['role']));
|
|
|
- $price = '';
|
|
|
- if($v['type'] == 1){
|
|
|
- $goods = Dever::db('goods/info')->find(array('id'=>$v['type_id']));
|
|
|
- if($goods){
|
|
|
- $price = $goods['price'];
|
|
|
- }
|
|
|
- }elseif($v['type'] == 2){
|
|
|
- $goods = Dever::db('card/info')->find(array('id'=>$v['type_id']));
|
|
|
- if($goods){
|
|
|
- $price = $goods['value'];
|
|
|
- }
|
|
|
- }elseif($v['type'] == 3){
|
|
|
- $goods = Dever::db('setting/prize')->find(array('id'=>$v['type_id']));
|
|
|
- if($goods){
|
|
|
- $price = $goods['price'];
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
$d = array
|
|
|
(
|
|
|
$v['name'],
|
|
|
@@ -1245,7 +1253,7 @@ class Dhorder
|
|
|
$member['mobile'],
|
|
|
$v['total_num']-$v['sell_num'],
|
|
|
$v['total_num'],
|
|
|
- $price,
|
|
|
+ $v['price'],
|
|
|
'',
|
|
|
date('Y-m-d H:i',$v['cdate']),
|
|
|
|
Your Name