1

application/index/controller/Amercement.php

@@ -53,6 +53,10 @@ class Amercement extends Basic
     }
 
 
+    /**
+     * 后台罚款账单表
+     * @return \think\Response
+     */
     public function getAmercementListPc(){
         $params = $this->params;
 
@@ -76,6 +80,10 @@ class Amercement extends Basic
     }
 
 
+    /**
+     * 导出excel
+     * @return \think\Response
+     */
     public function getAmercementListExcel(){
         $params = $this->params;
 
@@ -91,6 +99,10 @@ class Amercement extends Basic
 
     }
 
+    /**
+     * 详情
+     * @return \think\Response
+     */
     public function getAmercementInfo(){
         $params = $this->params;
 
@@ -110,4 +122,23 @@ class Amercement extends Basic
 
     }
 
+
+    /**
+     * 编辑
+     * @return \think\Response
+     */
+    public function editAmercement(){
+        $params = $this->params;
+
+        // $params = array(
+        //     "id" => 1,
+        // );
+        $checkResult = $this->validate($params, "AmercementValidate.getAmercementInfo");
+        if (true !== $checkResult) {
+            return $this->response("101", $checkResult);
+        }
+        $this->s_amercement->editAmercement($params['id']);//int(1)
+        return $this->response("200", "成功");
+    }
+
 }
\ No newline at end of file

application/index/service/AmercementService.php

@@ -246,17 +246,23 @@ class AmercementService
 
         $field = "id,status,type,money,submit_agent_id,agent_id,remarks,create_time";
         $result = $this->m_amercement->getAmercementInfo($conditions, $field);
+
+        if(!$result){
+            return false;
+        }
         $redis_cache = new RedisCacheService();
         $result['type_name'] = $this->getTypeName($result['type']);
+        $result['status_name'] = $this->getStatusName($result['status']);
         $agent_data = $redis_cache->getRedisCache(2, $result['submit_agent_id']);
-        $result['submit_agent_name']     = $agent_data['name'];
-        $result['submit_agent_phone']    = $agent_data['phone'];
+        $result['submit_agent_name'] = $agent_data['name'];
+        $agent_data = $redis_cache->getRedisCache(2, $result['agent_id']);
+        $result['agent_name'] = $agent_data['name'];
 
-        if($result['status'] == 0){//待支付
+        if ($result['status'] == 0) {//待支付
             $forfeit_penalty = 100;
             $result['forfeit_penalty'] = $forfeit_penalty;//滞纳金
             $result['money_sum'] = $forfeit_penalty + $result['money'];//罚款总金额
-        }elseif($result['status'] == 1){//已支付
+        } elseif ($result['status'] == 1) {//已支付
             $forfeit_penalty = 100;
             $result['forfeit_penalty'] = $forfeit_penalty;
             $result['money_sum'] = $forfeit_penalty + $result['money'];
@@ -267,6 +273,31 @@ class AmercementService
         return $result;
     }
 
+    /**
+     * 更新数据
+     * @param $id
+     * @return bool
+     */
+    public function editAmercement($id)
+    {
+        $data = [];
+        if((isset($params['money'])) && ($params['money'] > 0))
+            $data['money'] = $params['money'];
+
+        if((isset($params['type'])) && (in_array($params['type'], [0,1])))
+            $data['type'] = $params['type'];
+
+        if((isset($params['remarks'])) && $params['remarks'])
+            $data['social_security_fee'] = $params['social_security_fee'];
+
+        if(!$data){
+            return false;
+        }
+
+        $data['id'] = $id;
+        $this->m_amercement->updateAmercementData($data);
+        return true;
+    }
 
     /**
      * 后台罚款账单表
@@ -334,7 +365,7 @@ class AmercementService
         $field_num = 7;
         $title  = [ '罚款ID', '罚款项目', '提交时间', '提交人', '罚款金额', '被罚款人', '状态'];
         $title2 = '罚款账单表';
-        $export->exportTable('业绩排行', $e_data_new, $field_num, $title2, $title);
+        $export->exportTable('罚款账单表', $e_data_new, $field_num, $title2, $title);
 
         return '';
     }

application/model/OAmercementModel.php

@@ -56,4 +56,18 @@ class OAmercementModel extends Model
         return $result;
     }
 
+
+    /**更新数据
+     * @param $params
+     * @return int|string
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function updateAmercementData($params)
+    {
+        $return  = $this->db_->update($params);
+        // big_log($this->getLastSql());
+        return $return;
+    }
+
 }

application/route.php

@@ -585,10 +585,11 @@ Route::group('index', [
     'recoverPayLog'     => ['index/PayLog/recoverPayLog', ['method' => 'POST']],//恢复删除收款
     'recoverCheckRefund' => ['index/Refund/recoverCheckRefund', ['method' => 'POST|get']], //已审核退款-转审核状态
 
-    'addAmercement' => ['index/Amercement/addAmercement', ['method' => 'GET|POST']],
-    'getAmercementListPc' => ['index/Amercement/getAmercementListPc', ['method' => 'GET|POST']],
-    'getAmercementListExcel' => ['index/Amercement/getAmercementListExcel', ['method' => 'GET|POST']],
-    'getAmercementInfo' => ['index/Amercement/getAmercementInfo', ['method' => 'GET|POST']],
+    'addAmercement'          => [ 'index/Amercement/addAmercement', [ 'method' => 'GET|POST' ] ],
+    'getAmercementListPc'    => [ 'index/Amercement/getAmercementListPc', [ 'method' => 'GET|POST' ] ],
+    'getAmercementListExcel' => [ 'index/Amercement/getAmercementListExcel', [ 'method' => 'GET|POST' ] ],
+    'getAmercementInfo'      => [ 'index/Amercement/getAmercementInfo', [ 'method' => 'GET|POST' ] ],
+    'editAmercement'         => [ 'index/Amercement/editAmercement', [ 'method' => 'GET|POST' ] ],
 
 ]);