Skip to content

T
tl_estate
Commit 7242d9e3 authored by clone's avatar clone
Browse files
Options

1

parent b49e2ef3
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 18 deletions
application/index/service/AmercementService.php
View file @ 7242d9e3
......@@ -120,16 +120,16 @@ class AmercementService
return $str;
}
public function getStatusName($status,$is_settlement)
public function getStatusName($status, $is_settlement)
{
switch ($status) {
case 0 :
$str = '待支付';
break;
case 1 :
if($is_settlement > 0){
if ($is_settlement > 0) {
$str = '已支付-已结算';
}else{
} else {
$str = '已支付-未结算';
}
......@@ -209,7 +209,7 @@ class AmercementService
$condition ['submit_agent_id'] = $agent_id;
}
$condition ['status'] = $status;
$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";
$result = $this->m_amercement->getAmercementList($condition, $field, $page_no, $page_size);
if (!$result) {
......@@ -232,7 +232,7 @@ class AmercementService
$result[$key]['money_sum'] = $money_sum;//罚款总金额
$this->updateAmercement($val['id'], ['money_sum' => $money_sum]);
}
$result[$key]['img'] = $this->getAmercementImage($val['id']);
$result[$key]['img'] = $this->getAmercementImage($val['id']);
$result[$key]['ios_pay_show'] = 1;//ios支付按钮 审核 0不显示 1显示
}
return $result;
......@@ -292,7 +292,7 @@ class AmercementService
$redis_cache = new RedisCacheService();
$result['type_name'] = $this->getTypeName($result['type']);
$result['status_name'] = $this->getStatusName($result['status'],$result['is_settlement']);
$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']);
......@@ -490,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'],$val['is_settlement']);
$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'];
......@@ -502,7 +502,7 @@ class AmercementService
}
$result_['list'] = $result;
$result_['total'] = $result = $this->m_amercement->getAmercementTotal($conditions);
$money = $this->m_amercement->getAmercementInfo($conditions, 'sum(forfeit_penalty) as forfeit_penalty,sum(money_sum) as money_sum');
$money = $this->m_amercement->getAmercementInfo($conditions, 'sum(forfeit_penalty) as forfeit_penalty,sum(money_sum) as money_sum');
$result_['money'] = $money['forfeit_penalty'] + $money['money_sum'];
return $result_;
}
......@@ -515,8 +515,8 @@ class AmercementService
public function updateBeforeAmercement()
{
$conditions["status"] = 0;
$field = "id,status";
$result = $this->m_amercement->getAmercementListAll($conditions, $field);
$field = "id,status";
$result = $this->m_amercement->getAmercementListAll($conditions, $field);
if (!$result) {
return true;
}
......@@ -524,10 +524,10 @@ class AmercementService
//该记录是否已支付
$payInfo = $this->isPay($val['id']);
if ($payInfo) {//已支付
$data = [];
$data['id'] = $val['id'];
$data['status'] = 1;
$data['operation_id'] = 0;
$data = [];
$data['id'] = $val['id'];
$data['status'] = 1;
$data['operation_id'] = 0;
$data['operation_time'] = date("Y-m-d H:i:s", time());
$this->m_amercement->updateAmercementData($data);
}
......@@ -556,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'],$val['is_settlement']);
$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']);
......@@ -604,7 +604,16 @@ class AmercementService
//状态
if (isset($params['status']) && is_numeric($params["status"])) {
$conditions["status"] = $params["status"];
if ($params['status'] == 1) {
$conditions["status"] = 1;
$conditions["is_settlement"] = 0;
} else if ($params['status'] == 3) {
$conditions["status"] = 1;
$conditions["is_settlement"] = 1;
} else {
$conditions["status"] = $params["status"];
}
}
//项目
......@@ -720,7 +729,7 @@ class AmercementService
$is_exits = true;
}
$arrCurl["oritranflow"] = $item["trade_no"];
$curlRes = $this->getPayStatusByNo($arrCurl);
$curlRes = $this->getPayStatusByNo($arrCurl);
if ($curlRes["code"] == 200 && $curlRes["status"] == 1) {
return ["code" => '101', "msg" => "订单已支付"];
} /*else if ($curlRes["code"] == 200 && $curlRes["msg"]["status"] > 1) {
......
application/index/view/finance/fineMoney.html
View file @ 7242d9e3
......@@ -187,7 +187,8 @@
<select class="form-control btn4 margin-top-ld state-pay">
<option value="">状态</option>
<option value="0">待支付</option>
<option value="1">已支付</option>
<option value="1">已支付-未结算</option>
<option value="3">已支付-已结算</option>
<option value="2">已取消</option>
</select>
<select class="form-control btn4 margin-top-ld fine-item">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment