优化

application/index/service/AmercementService.php

@@ -215,7 +215,10 @@ class AmercementService
                 $now_time = date("Y-m-d H:i:s", time());
                 $forfeit_penalty = $this->updateForfeitPenalty($val['id'],$val['create_time'],$now_time,$val['money']);
                 $result[$key]['forfeit_penalty'] = $forfeit_penalty;//滞纳金
-                $result[$key]['money_sum'] = $forfeit_penalty + $result[$key]['money'];//罚款总金额
+
+                $money_sum = $forfeit_penalty + $result[$key]['money'];
+                $result[$key]['money_sum'] = $money_sum;//罚款总金额
+                $this->updateAmercement($val['id'],['money_sum'=>$money_sum]);
             }elseif($status == 1){//已支付
                 $forfeit_penalty = 100;
                 $result[$key]['forfeit_penalty'] = $val['forfeit_penalty'];
@@ -337,7 +340,7 @@ class AmercementService
      * 更新数据 编辑
      * @param $id
      * @param $params
-     * @return bool
+     * @return bool money_sum
      */
     public function updateAmercement($id,$params)
     {
@@ -345,15 +348,18 @@ class AmercementService
         if ((isset($params['money'])) && ($params['money'] > 0))
             $data['money'] = $params['money'];
 
-        if ((isset($params['forfeit_penalty'])) && ($params['forfeit_penalty'] > 0))
-            $data['forfeit_penalty'] = $params['forfeit_penalty'];
-
         if ((isset($params['type'])) && (in_array($params['type'], [ 0, 1 ])))
             $data['type'] = $params['type'];
 
         if ((isset($params['remarks'])) && $params['remarks'])
             $data['remarks'] = $params['remarks'];
 
+        if ((isset($params['forfeit_penalty'])) && ($params['forfeit_penalty'] > 0))
+            $data['forfeit_penalty'] = $params['forfeit_penalty'];
+
+        if ((isset($params['money_sum'])) && ($params['money_sum'] > 0))
+            $data['money_sum'] = $params['money_sum'];
+
         if (!$data) {
             return false;
         }
@@ -405,7 +411,7 @@ class AmercementService
     public function getAmercementListPc($params,$page_no, $page_size)
     {
         $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,money_sum";
         $result = $this->m_amercement->getAmercementList($conditions, $field, $page_no, $page_size);
         $redis_cache = new RedisCacheService();
 
@@ -414,6 +420,10 @@ class AmercementService
                 $now_time = date("Y-m-d H:i:s", time());
                 $forfeit_penalty = $this->updateForfeitPenalty($val['id'],$val['create_time'],$now_time,$val['money']);
                 $result[$key]['forfeit_penalty'] = $forfeit_penalty;
+
+                $money_sum = $forfeit_penalty + $val['money'];
+                $result[$key]['money_sum'] = $money_sum;//罚款总金额
+                $this->updateAmercement($val['id'],['money_sum'=>$money_sum]);
             }
             $result[$key]['type_name'] = $this->getTypeName($val['type']);
             $result[$key]['status_name'] = $this->getStatusName($val['status']);