|
|
@@ -1860,29 +1860,31 @@ class Order
|
|
|
foreach($data as $k => $v){
|
|
|
$member_shop = Dever::db('agent/member_shop_log')->find(array('mid'=>$v['parent_mid']));
|
|
|
if ($member_shop) {
|
|
|
- $member = Dever::db('agent/member')->find($v['mid']);
|
|
|
- $role = Dever::db('setting/role')->find($member['role']);
|
|
|
- $shop = Dever::db('shop/info')->find($member_shop['new_shop_id']);
|
|
|
- $fdate = '';
|
|
|
- if ($v['fdate']) {
|
|
|
- $fdate = date('Y-m-d H:i',$v['fdate']);
|
|
|
- }
|
|
|
- $gcdate = '';
|
|
|
- if ($member_shop['cdate']) {
|
|
|
- $gcdate = date('Y-m-d H:i',$member_shop['cdate']);
|
|
|
+ if ($v['fdate'] > $member_shop['cdate'] || ($v['fdate'] < $member_shop['cdate'] && date('Ym',$v['fdate']) == date('Ym',$member_shop['cdate']))) {
|
|
|
+ $member = Dever::db('agent/member')->find($v['mid']);
|
|
|
+ $role = Dever::db('setting/role')->find($member['role']);
|
|
|
+ $shop = Dever::db('shop/info')->find($member_shop['new_shop_id']);
|
|
|
+ $fdate = '';
|
|
|
+ if ($v['fdate']) {
|
|
|
+ $fdate = date('Y-m-d H:i',$v['fdate']);
|
|
|
+ }
|
|
|
+ $gcdate = '';
|
|
|
+ if ($member_shop['cdate']) {
|
|
|
+ $gcdate = date('Y-m-d H:i',$member_shop['cdate']);
|
|
|
+ }
|
|
|
+ $d = array
|
|
|
+ (
|
|
|
+ $member['name'],
|
|
|
+ $member['mobile'],
|
|
|
+ $role['name'],
|
|
|
+ $fdate,
|
|
|
+ $v['price'],
|
|
|
+ $shop['name'],
|
|
|
+ $shop['sid'],
|
|
|
+ $gcdate,
|
|
|
+ );
|
|
|
+ $body[] = $d;
|
|
|
}
|
|
|
- $d = array
|
|
|
- (
|
|
|
- $member['name'],
|
|
|
- $member['mobile'],
|
|
|
- $role['name'],
|
|
|
- $fdate,
|
|
|
- $v['price'],
|
|
|
- $shop['name'],
|
|
|
- $shop['sid'],
|
|
|
- $gcdate,
|
|
|
- );
|
|
|
- $body[] = $d;
|
|
|
}
|
|
|
}
|
|
|
$file = Dever::input('excel_name');
|
Your Name