20201

app/api/controller/Payorder.php

@@ -32,24 +32,31 @@ class Payorder extends Base
                     $where['type'] = $key;
                     //总金额
                     $data= Db::name('cost')->where($where)->sum('pay_money');
-                    $all_list[$key] = $data;
+
+                    $time = Db::name('cost')->where($where)->order('create_time','desc')->value('create_time');
+                    if(!$data) {
+                        continue;
+                    }
+                    $rest['money'] = $data;
+                    $rest['type'] = $key;
+                    $rest['type_zh'] = $convertArr[$key];
+                    $rest['create_time'] = $time;
+
+                    $vacancys[$k]['pay_list'][] = Common::changeField($rest);;
                 }
-                $vacancys[$k]['pay_list'] = $all_list;
+
                 //获取自定义的
                 unset($where['type']);
-                $vacancys[$k]['pay_list']['other'] = Db::name('cost')->where($where)->whereNotIn('type',array_keys($convertArr))->sum('pay_money');
-            }
-            foreach ($vacancys as $k =>$v) {
-                foreach ($array_keys as $val ) { //删除水电物业费为0的记录
-                    if($v['pay_list'][$val] ==0) {
-                        unset($vacancys[$k]['pay_list'][$val]);
+                $money = Db::name('cost')->where($where)->whereNotIn('type',$array_keys)->sum('pay_money');
+                $time = Db::name('cost')->where($where)->whereNotIn('type',$array_keys)->order('create_time','desc')->value('create_time');
+                if($money){
+                    $rest_other['money'] = $money;
+                    $rest_other['type'] = "other";
+                    $rest_other['type_zh'] = "自定义";
+                    $rest_other['create_time'] = $time;
                 }
+                $vacancys[$k]['pay_list'][] = Common::changeField($rest_other);
             }
-                if($v['pay_list']['other'] ==0) {
-                    unset($vacancys[$k]['pay_list']['other']);
-                }
-            }
-
         } else {
             $vacancys = [];
         }
@@ -192,6 +199,8 @@ class Payorder extends Base
         $cost_id = Request::param('cost_id');
         $data = Db::name('cost')->where(['cost_id'=>$cost_id])->find();
         $typeArr = $this->convertArr;
+        $myunit = $this->myUnit;
+        $priceUnit = $this->priceUnit;
         $vacancyInfo = Db::name('house_vacancy')->where(['vacancy_id'=>$data['vacancy_id']])->field('vacancy_code,layout_id')->find();
         $vacancyAddress = Common::getVacancyAddress($vacancyInfo['vacancy_code'],$vacancyInfo['layout_id']);
         $data['vacancy_address'] = $vacancyAddress['vacancy_address'];
@@ -209,13 +218,12 @@ class Payorder extends Base
             $data['pay_type'] = "暂无";
             $data['order_num'] = "暂无";
         }
-        $myunit = $this->myUnit;
-        $priceUnit = $this->priceUnit;
         if(in_array($data['type'],['water','electric','gas','property'])) {
             $data['area'] = $data['area'].$myunit[$data['type']];
             $data['price'] = $data['price'].$priceUnit[$data['type']];
         } else{
             $data['area'] = "无";
+            $data['price'] = "暂无";
         }
         return $this->returnJson(Common::changeField($data,['pay_time','create_time']));
     }