|
@@ -1333,12 +1333,13 @@ class Dhorder
|
|
$res[1][$key] = $v['name'];
|
|
$res[1][$key] = $v['name'];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
return $res;
|
|
return $res;
|
|
}
|
|
}
|
|
public function out_equity_api($data){
|
|
public function out_equity_api($data){
|
|
$start = Dever::input('search_option_start_udate');
|
|
$start = Dever::input('search_option_start_udate');
|
|
$end = Dever::input('search_option_end_udate');
|
|
$end = Dever::input('search_option_end_udate');
|
|
|
|
+ $fstart = Dever::input('search_option_start_dever_auth');
|
|
|
|
+ $fend = Dever::input('search_option_end_dever_auth');
|
|
if($start && $end){
|
|
if($start && $end){
|
|
$where['start'] = $start;
|
|
$where['start'] = $start;
|
|
$where['end'] = $end;
|
|
$where['end'] = $end;
|
|
@@ -1347,9 +1348,17 @@ class Dhorder
|
|
$where['end'] = strtotime(date('Y-m-d 23:59:59',
|
|
$where['end'] = strtotime(date('Y-m-d 23:59:59',
|
|
strtotime(date('Y-m-01')."+1 month - 1 day")));
|
|
strtotime(date('Y-m-01')."+1 month - 1 day")));
|
|
}
|
|
}
|
|
|
|
+ $w = array();
|
|
|
|
+ if ($fstart) {
|
|
|
|
+ $w['start'] = $fstart;
|
|
|
|
+ }
|
|
|
|
+ if ($fend) {
|
|
|
|
+ $w['end'] = $fend;
|
|
|
|
+ }
|
|
|
|
+
|
|
$where['type'] = '1,2';
|
|
$where['type'] = '1,2';
|
|
$res = $this->head(1);
|
|
$res = $this->head(1);
|
|
- $header = array('基础信息', '', '', '', '','', '', '', '', '');
|
|
|
|
|
|
+ $header = array('基础信息', '', '', '', '','', '', '', '');
|
|
$body = array();
|
|
$body = array();
|
|
$pg = Dever::input('pg');
|
|
$pg = Dever::input('pg');
|
|
if ($pg == 1) {
|
|
if ($pg == 1) {
|
|
@@ -1435,6 +1444,7 @@ class Dhorder
|
|
foreach ($res[0] as $k1 => $v1) {
|
|
foreach ($res[0] as $k1 => $v1) {
|
|
list($type, $type_id) = explode('_', $k1);
|
|
list($type, $type_id) = explode('_', $k1);
|
|
$goods[$k1] = Dever::db('agent/member_goods')->getTotal(array('end'=>$where['end'],'mid'=>$v['mid'],'type'=>$type, 'type_id' => $type_id));
|
|
$goods[$k1] = Dever::db('agent/member_goods')->getTotal(array('end'=>$where['end'],'mid'=>$v['mid'],'type'=>$type, 'type_id' => $type_id));
|
|
|
|
+
|
|
$d[$i] = 0;
|
|
$d[$i] = 0;
|
|
if ($goods[$k1]) {
|
|
if ($goods[$k1]) {
|
|
if(strstr($v1[0],'卡')){
|
|
if(strstr($v1[0],'卡')){
|
|
@@ -1460,7 +1470,6 @@ class Dhorder
|
|
} else {
|
|
} else {
|
|
$caipin_cash += $goods[$k1]['cash'] ? $goods[$k1]['cash'] : 0;
|
|
$caipin_cash += $goods[$k1]['cash'] ? $goods[$k1]['cash'] : 0;
|
|
}
|
|
}
|
|
- // if ($v)
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1478,7 +1487,18 @@ class Dhorder
|
|
if (strstr($v1,'卡')) {
|
|
if (strstr($v1,'卡')) {
|
|
$d[$i] = $goods[$k1]['cash']*$goods[$k1]['sell_num'] ? $goods[$k1]['cash']*$goods[$k1]['sell_num'] : 0;
|
|
$d[$i] = $goods[$k1]['cash']*$goods[$k1]['sell_num'] ? $goods[$k1]['cash']*$goods[$k1]['sell_num'] : 0;
|
|
} else {
|
|
} else {
|
|
- $d[$i] = $goods[$k1]['sell_num'] ? $goods[$k1]['sell_num'] : 0;
|
|
|
|
|
|
+ $w1 = $w;
|
|
|
|
+ $w1['mid'] = $v['mid'];
|
|
|
|
+ $order_ps[$k1] = Dever::db('agent/dh_order_ps')->getDui($w1);
|
|
|
|
+ foreach($order_ps as $a => $b){
|
|
|
|
+ $pc_order = Dever::db('shop/sell_order')->getSellDui(array('id'=>$b['order_id']));
|
|
|
|
+ if($pc_order){
|
|
|
|
+
|
|
|
|
+ $d[$i] += $pc_order['num'];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // $d[$i] = $goods[$k1]['sell_num'] ? $goods[$k1]['sell_num'] : 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$i++;
|
|
$i++;
|
|
@@ -1486,12 +1506,18 @@ class Dhorder
|
|
|
|
|
|
foreach ($res[2] as $k1 => $v1) {
|
|
foreach ($res[2] as $k1 => $v1) {
|
|
list($type, $type_id) = explode('_', $k1);
|
|
list($type, $type_id) = explode('_', $k1);
|
|
- $sku = Dever::db('agent/member_goods')->getCardAll(array('end'=>$where['end'],'type_id'=>$type_id,'type'=>$type,'mid'=>$v['mid']));
|
|
|
|
|
|
+ $w1 = array();
|
|
|
|
+ $w1['mid'] = $v['mid'];
|
|
|
|
+ $w1['type'] = $type;
|
|
|
|
+ $w1['type_id'] = $type_id;
|
|
|
|
+ $sku = Dever::db('agent/member_goods')->getCardAll($w1);
|
|
$array = array_column($sku, 'sku_id');
|
|
$array = array_column($sku, 'sku_id');
|
|
$sku_id = implode(",",$array);
|
|
$sku_id = implode(",",$array);
|
|
|
|
|
|
if($sku_id){
|
|
if($sku_id){
|
|
- $sell_order[$k1] = Dever::db('shop/sell_order')->getCardAlls(array('end'=>$where['end'],'card_code_id'=>$sku_id));
|
|
|
|
|
|
+ $w1 = $w;
|
|
|
|
+ $w1['card_code_id'] = $sku_id;
|
|
|
|
+ $sell_order[$k1] = Dever::db('shop/sell_order')->getCardAlls($w1);
|
|
}else{
|
|
}else{
|
|
$sell_order[$k1]['total'] = 0;
|
|
$sell_order[$k1]['total'] = 0;
|
|
}
|
|
}
|