1

application/index/service/AmercementService.php

@@ -120,14 +120,19 @@ class AmercementService
         return $str;
     }
 
-    public function getStatusName($status)
+    public function getStatusName($status,$is_settlement)
     {
         switch ($status) {
             case 0 :
                 $str = '待支付';
                 break;
             case 1 :
-                $str = '已支付';
+                if($is_settlement > 0){
+                    $str = '已支付-已结算';
+                }else{
+                    $str = '已支付-未结算';
+                }
+
                 break;
             case 2 :
                 $str = '已取消';
@@ -278,7 +283,7 @@ class AmercementService
         $conditions["id"] = $id;
 
         $field  = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time,
-        operation_id,operation_time,forfeit_penalty,money_sum";
+        operation_id,operation_time,forfeit_penalty,money_sum,is_settlement";
         $result = $this->m_amercement->getAmercementInfo($conditions, $field);
 
         if (!$result) {
@@ -287,7 +292,7 @@ class AmercementService
 
         $redis_cache                 = new RedisCacheService();
         $result['type_name']         = $this->getTypeName($result['type']);
-        $result['status_name']       = $this->getStatusName($result['status']);
+        $result['status_name']       = $this->getStatusName($result['status'],$result['is_settlement']);
         $agent_data                  = $redis_cache->getRedisCache(2, $result['submit_agent_id']);
         $result['submit_agent_name'] = $agent_data['name'];
         $agent_data                  = $redis_cache->getRedisCache(2, $result['agent_id']);
@@ -469,7 +474,7 @@ class AmercementService
         $this->updateBeforeAmercement();//将已支付罚款状态改掉
 
         $conditions  = $this->buildConditions($params);
-        $field       = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time,forfeit_penalty,money_sum";
+        $field       = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time,forfeit_penalty,money_sum,is_settlement";
         $result      = $this->m_amercement->getAmercementList($conditions, $field, $page_no, $page_size);
         $redis_cache = new RedisCacheService();
 
@@ -485,7 +490,7 @@ class AmercementService
                 $this->updateAmercement($val['id'], ['money_sum' => $money_sum]);
             }
             $result[$key]['type_name']   = $this->getTypeName($val['type']);
-            $result[$key]['status_name'] = $this->getStatusName($val['status']);
+            $result[$key]['status_name'] = $this->getStatusName($val['status'],$val['is_settlement']);
 
             $agent_data                        = $redis_cache->getRedisCache(2, $val['submit_agent_id']);
             $result[$key]['submit_agent_name'] = $agent_data['name'];
@@ -540,7 +545,7 @@ class AmercementService
     {
         $this->updateBeforeAmercement();//将已支付罚款状态改掉
         $conditions  = $this->buildConditions($params);
-        $field       = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time,forfeit_penalty";
+        $field       = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time,forfeit_penalty,is_settlement";
         $result      = $this->m_amercement->getAmercementListExcel($conditions, $field);
         $redis_cache = new RedisCacheService();
 
@@ -551,7 +556,7 @@ class AmercementService
                 $result[$key]['forfeit_penalty'] = $forfeit_penalty;
             }
             $result[$key]['type_name']         = $this->getTypeName($val['type']);
-            $result[$key]['status_name']       = $this->getStatusName($val['status']);
+            $result[$key]['status_name']       = $this->getStatusName($val['status'],$val['is_settlement']);
             $agent_data                        = $redis_cache->getRedisCache(2, $val['submit_agent_id']);
             $result[$key]['submit_agent_name'] = $agent_data['name'];
             $agent_data                        = $redis_cache->getRedisCache(2, $val['agent_id']);