|
@@ -1434,7 +1434,7 @@ class Dhorder
|
|
|
$goods = array();
|
|
|
foreach ($res[0] as $k1 => $v1) {
|
|
|
list($type, $type_id) = explode('_', $k1);
|
|
|
- $goods[$k1] = Dever::db('agent/member_goods')->getTotal(array('start'=>$where['start'],'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;
|
|
|
if ($goods[$k1]) {
|
|
|
if(strstr($v1[0],'卡')){
|
|
@@ -1486,12 +1486,12 @@ class Dhorder
|
|
|
|
|
|
foreach ($res[2] as $k1 => $v1) {
|
|
|
list($type, $type_id) = explode('_', $k1);
|
|
|
- $sku = Dever::db('agent/member_goods')->getCardAll(array('start'=>$where['start'],'end'=>$where['end'],'type_id'=>$type_id,'type'=>$type,'mid'=>$v['mid']));
|
|
|
+ $sku = Dever::db('agent/member_goods')->getCardAll(array('end'=>$where['end'],'type_id'=>$type_id,'type'=>$type,'mid'=>$v['mid']));
|
|
|
$array = array_column($sku, 'sku_id');
|
|
|
$sku_id = implode(",",$array);
|
|
|
|
|
|
if($sku_id){
|
|
|
- $sell_order[$k1] = Dever::db('shop/sell_order')->getCardAll(array('start'=>$where['start'],'end'=>$where['end'],'card_code_id'=>$sku_id));
|
|
|
+ $sell_order[$k1] = Dever::db('shop/sell_order')->getCardAll(array('end'=>$where['end'],'card_code_id'=>$sku_id));
|
|
|
}else{
|
|
|
$sell_order[$k1]['total'] = 0;
|
|
|
}
|