|
|
@@ -498,9 +498,26 @@ Class Manage
|
|
|
foreach ($data as $k =>$v) {
|
|
|
$cdata = '';
|
|
|
$leixing = '';
|
|
|
+ $member_goods_name = '';
|
|
|
+ if (isset($v['name']) && $v['name']) {
|
|
|
+ $member_goods_name = $v['name'];
|
|
|
+ }
|
|
|
if ($v['cdate']) {
|
|
|
$cdate = date('Y-m-d H:i',$v['cdate']);
|
|
|
}
|
|
|
+ $total_num = '';
|
|
|
+ if(isset($v['total_num']) && $v['total_num']) {
|
|
|
+ $total_num = $v['total_num'];
|
|
|
+ }
|
|
|
+ $price = '';
|
|
|
+ if (isset($v['price']) && $v['price']) {
|
|
|
+ $price = $v['price'];
|
|
|
+ }
|
|
|
+ $cash = '';
|
|
|
+ if (isset($v['cash']) && $v['cash']) {
|
|
|
+ $cash = $v['cash'];
|
|
|
+ }
|
|
|
+
|
|
|
if ($where['types'] == 1 || $where['types'] == -1) {
|
|
|
$leixing = '发放权益';
|
|
|
}
|
|
|
@@ -581,41 +598,42 @@ Class Manage
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
- $sell_order = Dever::db('shop/sell_order')->find(array('card_code_id'=>$v['sku_id']));
|
|
|
- if ($sell_order) {
|
|
|
- if ($where['types'] == 3 || $where['types'] == -1) {
|
|
|
- $leixing = '使用权益';
|
|
|
- $w = $this->common($sell_order);
|
|
|
- if ($w) {
|
|
|
- $shop_name = $w['shop_name'];
|
|
|
- $shop_type = $w['shop_type'];
|
|
|
- $shop_sid = $w['shop_sid'];
|
|
|
- $order_num = $w['order_num'];
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ if (isset($v['sku_id']) && $v['sku_id']){
|
|
|
+ $sell_order = Dever::db('shop/sell_order')->find(array('card_code_id'=>$v['sku_id']));
|
|
|
+ if ($sell_order) {
|
|
|
+ if ($where['types'] == 3 || $where['types'] == -1) {
|
|
|
+ $leixing = '使用权益';
|
|
|
+ $w = $this->common($sell_order);
|
|
|
+ if ($w) {
|
|
|
+ $shop_name = $w['shop_name'];
|
|
|
+ $shop_type = $w['shop_type'];
|
|
|
+ $shop_sid = $w['shop_sid'];
|
|
|
+ $order_num = $w['order_num'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
if ($leixing) {
|
|
|
$d = array
|
|
|
(
|
|
|
$cdate,
|
|
|
- $v['name'],
|
|
|
+ $member_goods_name,
|
|
|
$role_name,
|
|
|
$member_name,
|
|
|
$member_mobile,
|
|
|
$card,
|
|
|
$leixing,
|
|
|
- $v['total_num'],
|
|
|
- $v['price'],
|
|
|
- $v['cash'],
|
|
|
+ $total_num,
|
|
|
+ $price,
|
|
|
+ $cash,
|
|
|
$shop_type,
|
|
|
$shop_sid,
|
|
|
$shop_name,
|
|
|
$order_num,
|
|
|
$desc,
|
|
|
'',
|
|
|
- date('Y-m-d H:i',$v['cdate']),
|
|
|
+ $cdate,
|
|
|
$member_cdate,
|
|
|
$youxiao,
|
|
|
);
|
rabin