Browse Source

地址信息

sunhao 5 years ago
parent
commit
5ef51f1523

+ 1 - 1
app/Console/Commands/TeamOrderRateByDayHistory.php

@@ -24,7 +24,7 @@ class TeamOrderRateByDayHistory extends Command {
24 24
         foreach($team_ids as $team_id){
25 25
             #团队成员:
26 26
             $saler_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');
27
-            for($i=70; $i>1; $i--){
27
+            for($i=78; $i>1; $i--){
28 28
                 #昨天日期:
29 29
                 $date = date('Y-m-d', strtotime('-'.$i.' day'));
30 30
                 //第一步: 统计昨日数据

+ 1 - 1
app/Http/Controllers/Admin/OrderController.php

@@ -1048,7 +1048,7 @@ class OrderController extends Controller
1048 1048
         $result = json_decode(json_encode($result),true);
1049 1049
         foreach ($result as $k => &$v)
1050 1050
         {
1051
-            $v['address'] = $v['receiverState'].$v['receiverCity'].$v['receiverDistrict'].$v['receiverAddress'];                
1051
+            $v['address'] = $v['receiverState'].$v['receiverCity'].$v['receiverDistrict'].$v['receiverStreet'].$v['receiverAddress'];                
1052 1052
         }
1053 1053
 
1054 1054
         $indexKey = ['id','goods_note','receiverName','receiverMobile','address','createTime','sellerMemo','buyerMemo','cost','logistics_id','freight_cost','send_note'];