diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php
index ee9ce0c..f76b3c2 100644
--- a/frontend/controllers/InsurerController.php
+++ b/frontend/controllers/InsurerController.php
@@ -2400,109 +2400,6 @@ class InsurerController extends BaseController
* 出纳办结-列表
* @return string
*/
-// public function actionFinanceMng()
-// {
-// $request = Yii::$app->request;
-// //新增正本日期
-// $begin_date = $request->get('begin_date');
-// $end_date = $request->get('end_date');
-// //新增完成状态
-// $status = $request->get('status');
-//
-// $car_man = $request->get('car_man');
-// $phone = $request->get('phone');
-// $car_no = $request->get('car_no');
-// $send_date = $request->get('send_date');
-// $insurer_no = $request->get('insurer_no');
-// $caiwu_status_id = $request->get('caiwu_status_id');
-// $page = $request->get('page',1);
-// if($page < 1) $page = 1;
-//
-// $query = OrderT::find()
-// ->leftJoin('order_caiwu_t','order_caiwu_t.order_id=order_t.id')
-// ->where('order_caiwu_t.status_id>0')
-// ->orderBy('order_t.print_date asc');
-// if($car_man != '') {
-// $query = $query->andWhere('id_man="'.$car_man.'"');
-// }
-// if($phone != '') {
-// $query = $query->andWhere('link_phone="'.$phone.'"');
-// }
-// if($car_no != '') {
-// $query = $query->andWhere('car_no="'.$car_no.'"');
-// }
-// if($send_date != '') {
-// $query = $query->andWhere('send_date="'.$send_date.'"');
-// }
-// if($insurer_no != '') {
-// $query = $query->andWhere('(insurer1_no="'.$insurer_no.'" or insurer2_no="'.$insurer_no.'")');
-// }
-// //添加正本日期
-// if($begin_date != '') {
-// $query = $query->andWhere('print_date>="'.$begin_date.'"');
-// }
-// if($end_date != '') {
-// $query = $query->andWhere('print_date<="'.$end_date.'"');
-// }
-// //添加完成状态
-// if($status == 2) {
-// $query = $query->andWhere('order_caiwu_t.status_id=10 or order_caiwu_t.status_id=13');
-// } else if($status == 1) {
-// $query = $query->andWhere('order_caiwu_t.status_id=12');
-// } else {
-// $query = $query->andWhere('order_caiwu_t.status_id=13 or order_caiwu_t.status_id=10 or order_caiwu_t.status_id=12');
-// }
-// //转账状态
-// if($caiwu_status_id > 0){
-// switch($caiwu_status_id){
-// case 1:
-// $query = $query->andWhere('order_caiwu_t.caiwu_status_id=1');
-// break;
-// case 2:
-// $query = $query->andWhere('order_caiwu_t.caiwu_status_id=2');
-// break;
-// case 3:
-// $query = $query->andWhere('order_caiwu_t.caiwu_status_id=3');
-// break;
-// case 4:
-// $query = $query->andWhere('order_caiwu_t.caiwu_status_id=4');
-// break;
-// default:
-// break;
-// }
-// }
-//// if($this->my->username == 'admin')
-//// echo $query->createCommand()->rawSql;
-//// echo $query->createCommand()->rawSql;
-//// die;
-// $total = $query->count();
-//
-// $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]);
-// $pagination->setPage($page-1);
-//
-// $query = $query->offset($pagination->offset)->limit($pagination->limit);
-// $items = $query->all();
-//
-// $page_info = MyLib::getPageInfo($pagination);
-//
-// $caiwu_status = CaiwuStatusT::find()->all();
-//
-// return $this->render('finance-mng',[
-// 'items' => $items,
-// 'car_man' => $car_man,
-// 'phone' => $phone,
-// 'car_no' => $car_no,
-// 'send_date' => $send_date,
-// 'page' => $page,
-// 'page_info' => $page_info,
-// 'insurer_no' => $insurer_no,
-// 'status' => $status,
-// 'caiwu_status_id' => $caiwu_status_id,
-// 'caiwu_status' => $caiwu_status,
-// 'begin_date' => $begin_date,
-// 'end_date' => $end_date
-// ]);
-// }
public function actionFinanceMng() {
return $this->render('finance-mng');
}
@@ -2626,7 +2523,15 @@ class InsurerController extends BaseController
$data['rows'] = [];
foreach($items as $item) {
$row = $item->toArray();
- $row['user'] = $item->user?$item->user->getShowName():'';
+ $row['company_name'] = $item->company2->name;
+ $row['path'] = ($item->user && $item->user->group) ? $item->user->group->getPath():'';
+ $row['user_name'] = $item->user?$item->user->getShowName():'';
+ $row['total_user_real'] = number_format($item->total1_dis + $item->yuangong_money,2);
+ $row['transfer_date'] = $item->caiwu->transfer_date;
+ $row['caiwu_status_name'] = $item->caiwu->caiwuStatus->name;
+ $row['shoufei_name'] = MyLib::zhifufs($item->shoufei_id);
+ $row['status_name'] = $item->caiwu->status->name;
+ $row['lock_man'] = $item->caiwu->lock?$item->caiwu->lock->getShowName():'';
$data['rows'][] = $row;
}
@@ -2803,7 +2708,6 @@ class InsurerController extends BaseController
$order_info = OrderT::findOne(['id'=>$id]);
$car_info = $order_info->car;
$caiwu_info = $order_info->caiwu;
-
if($caiwu_info->lock_id == 0) {
$tran = OrderCaiwuT::getDb()->beginTransaction();
try {
@@ -2864,10 +2768,12 @@ class InsurerController extends BaseController
$tmp_row = PriceT::find()
->where('order_id='.$order_id.' and type_id='.$v->id)
->one();
- if($tmp_row->val != '' && $tmp_row->val != '0' && $tmp_row->val != '否' && $tmp_row->val != '无'){
- $new_array[$k]['zl'] = $v->name.'('.$v->code.')';
- $new_array[$k]['neir'] = $tmp_row->val;
- $new_array[$k]['bjmp'] = $tmp_row->is_nopay==1?'是':'';
+ if($tmp_row) {
+ if ($tmp_row->val != '' && $tmp_row->val != '0' && $tmp_row->val != '否' && $tmp_row->val != '无') {
+ $new_array[$k]['zl'] = $v->name . '(' . $v->code . ')';
+ $new_array[$k]['neir'] = $tmp_row->val;
+ $new_array[$k]['bjmp'] = $tmp_row->is_nopay == 1 ? '是' : '';
+ }
}
}
@@ -3076,33 +2982,8 @@ class InsurerController extends BaseController
$transfer_money = $request->post('transfer_money');
$transfer_bank_id = $request->post('transfer_bank_id');
$transfer_bank_no = $request->post('transfer_bank_no');
- $budian_rate = $request->post('budian_rate');
- $budian_money = $request->post('budian_money');
- $business_back_money = $request->post('business_back_money');
- $business_back_rate = $request->post('business_back_rate');
- $business_back_routine = $request->post('business_back_routine');
- $business_back_date = $request->post('business_back_date');
- $force_back_money = $request->post('force_back_money');
- $force_back_rate = $request->post('force_back_rate');
- $force_back_routine = $request->post('force_back_routine');
- $force_back_date = $request->post('force_back_date');
$caiwu_no = $request->post('caiwu_no');
- $rate1 = $request->post('rate1');
- $money1 = $request->post('money1');
- $rate2 = $request->post('rate2');
- $money2 = $request->post('money2');
- $rate3 = $request->post('rate3');
- $money3 = $request->post('money3');
- $rate4 = $request->post('rate4');
- $money4 = $request->post('money4');
- $rate5 = $request->post('rate5');
- $money5 = $request->post('money5');
- $send_rate = $request->post('send_rate');
- $send_money = $request->post('send_money');
$caiwu_status_id = $request->post('caiwu_status_id');
- $gift_ids = $request->post('gift_ids',array());
- $gift_prices = $request->post('gift_prices',array());
- $gift_rates = $request->post('gift_rates',array());
$tran = OrderCaiwuT::getDb()->beginTransaction();
try {
@@ -3120,213 +3001,36 @@ class InsurerController extends BaseController
$caiwu_info->transfer_money = $transfer_money;
$caiwu_info->transfer_bank_id = $transfer_bank_id;
$caiwu_info->transfer_bank_no = $transfer_bank_no;
- $caiwu_info->budian_rate = $budian_rate;
- $caiwu_info->budian_money = $budian_money;
- $caiwu_info->business_back_money = $business_back_money;
- $caiwu_info->business_back_rate = $business_back_rate;
- $caiwu_info->business_back_routine = $business_back_routine;
- $caiwu_info->business_back_date = $business_back_date;
- $caiwu_info->force_back_money = $force_back_money;
- $caiwu_info->force_back_rate = $force_back_rate;
- $caiwu_info->force_back_routine = $force_back_routine;
- $caiwu_info->force_back_date = $force_back_date;
$caiwu_info->caiwu_no = $caiwu_no;
$old_status_id = $caiwu_info->status_id;
- if($status_id > $old_status_id) {
+ if($status_id == 10) {
+ if($caiwu_status_id == 0){
+ $result['success'] = false;
+ $result['msg'] = '请先确定转账状态后,再点提交按钮!';
+ return $result;
+ }
if($caiwu_info->caiwu_status_id != $caiwu_status_id) {
$result['success'] = false;
$result['msg'] = '请先保存成功后,再点提交按钮!';
return $result;
}
+
+ $caiwu_info->lock_id = 0;
+ $this->addLog($caiwu_info->order->car_id,'返现管理完成',1);
}
$caiwu_info->caiwu_status_id = $caiwu_status_id;
- $caiwu_info->rate1 = $rate1;
- $caiwu_info->money1 = $money1;
- $caiwu_info->rate2 = $rate2;
- $caiwu_info->money2 = $money2;
- $caiwu_info->rate3 = $rate3;
- $caiwu_info->money3 = $money3;
- $caiwu_info->rate4 = $rate4;
- $caiwu_info->money4 = $money4;
- $caiwu_info->rate5 = $rate5;
- $caiwu_info->money5 = $money5;
- $caiwu_info->send_rate = $send_rate;
- $caiwu_info->send_money = $send_money;
-// $caiwu_info->send_price = $send_price;
-
$caiwu_info->status_id = $status_id;
- $caiwu_info->save();
-// echo $caiwu_info->lock_id."\r\n";
-// echo $status_id;
-// exit;
- //保存礼品价格
- foreach($gift_ids as $index => $id) {
- $rate = $gift_rates[$index];
- $price = $gift_prices[$index];
- $order_gift = OrderGiftT::findOne(['id'=>$id]);
- if($order_gift) {
- $order_gift->rate = $rate;
- $order_gift->price = $price;
- $order_gift->save();
- }
- }
-
- if($status_id > $old_status_id) {
- //处理新保、跟踪、续保提成
- $order_info = $caiwu_info->order;
- $car_info = $order_info->car;
- //删除相当记录
- PayOrderUserT::deleteAll('order_id='.$order_info->id);
-
-
-// echo $op_user1_id;
-// die;
-// var_dump($caiwu_info->pay_date);
-
- //截取日期来进行判断
- $year= (int)substr($caiwu_info->pay_date,0,4);
-
- if($year>=2018){
- $op11= substr($order_info->op1->getShowName(),0,strpos($order_info->op1->getShowName(),'('));
- $op1_user = UserT::findOne(['username'=>$op11,'is_delete'=>0]);
- if($op1_user) {
- $pay_order_user = new PayOrderUserT();
- $pay_order_user->user_id = $op1_user->id;
- $pay_order_user->order_id = $order_info->id;
- $pay_order_user->type = 5;
- $pay_order_user->is_own = 0;
- $pay_order_user->pay_date = $caiwu_info->pay_date;
- $pay_order_user->save();
- $pay_order_user->calPay();
- $pay_info = PayT::findOne(['user_id'=>$pay_order_user->user_id,'pay_date'=>$pay_order_user->pay_date]);
- if($pay_info) {
- $pay_info->calPay();
- }
- }
-
- $op22= substr($order_info->op2->getShowName(),0,strpos($order_info->op2->getShowName(),'('));
- $op2_user = UserT::findOne(['username'=>$op22,'is_delete'=>0]);
- if($op2_user) {
- $pay_order_user = new PayOrderUserT();
- $pay_order_user->user_id = $op2_user->id;
- $pay_order_user->order_id = $order_info->id;
- $pay_order_user->type = 6;
- $pay_order_user->is_own = 0;
- $pay_order_user->pay_date = $caiwu_info->pay_date;
- $pay_order_user->save();
- $pay_order_user->calPay();
- $pay_info = PayT::findOne(['user_id'=>$pay_order_user->user_id,'pay_date'=>$pay_order_user->pay_date]);
- if($pay_info) {
- $pay_info->calPay();
- }
- }
-
- }
-
-
-
-
- $op_user1_id = substr($car_info->op_user1,0,strpos($car_info->op_user1,'('));
- $pay1_user = UserT::findOne(['username'=>$op_user1_id,'is_delete'=>0]);
- if($pay1_user) {
- $pay_order_user = new PayOrderUserT();
- $pay_order_user->user_id = $pay1_user->id;
- $pay_order_user->order_id = $order_info->id;
- $pay_order_user->type = 1;
- $pay_order_user->is_own = $car_info->op_user3 != '' ? 0:1;
- $pay_order_user->pay_date = $caiwu_info->pay_date;
- $pay_order_user->save();
- $pay_order_user->calPay();
- $pay_info = PayT::findOne(['user_id'=>$pay_order_user->user_id,'pay_date'=>$pay_order_user->pay_date]);
- if($pay_info) {
- $pay_info->calPay();
- }
- }
- $op_user2_id = substr($car_info->op_user2,0,strpos($car_info->op_user2,'('));
- $pay2_user = UserT::findOne(['username'=>$op_user2_id,'is_delete'=>0]);
- if($pay2_user) {
- $pay_order_user = new PayOrderUserT();
- $pay_order_user->user_id = $pay2_user->id;
- $pay_order_user->order_id = $order_info->id;
- $pay_order_user->type = 2;
- $pay_order_user->is_own = 0;
- $pay_order_user->pay_date = $caiwu_info->pay_date;
- $pay_order_user->save();
- $pay_order_user->calPay();
- $pay_info = PayT::findOne(['user_id'=>$pay_order_user->user_id,'pay_date'=>$pay_order_user->pay_date]);
- if($pay_info) {
- $pay_info->calPay();
- }
- }
- $op_user3_id = substr($car_info->op_user3,0,strpos($car_info->op_user3,'('));
- $pay3_user = UserT::findOne(['username'=>$op_user3_id,'is_delete'=>0]);
- if($pay3_user) {
- $pay_order_user = new PayOrderUserT();
- $pay_order_user->user_id = $pay3_user->id;
- $pay_order_user->order_id = $order_info->id;
- $pay_order_user->type = 3;
- $pay_order_user->is_own = 1;
- $pay_order_user->pay_date = $caiwu_info->pay_date;
- $pay_order_user->save();
- $pay_order_user->calPay();
- $pay_info = PayT::findOne(['user_id'=>$pay_order_user->user_id,'pay_date'=>$pay_order_user->pay_date]);
- if($pay_info) {
- $pay_info->calPay();
- }
- }
- $send_info = $order_info->sendLog;
- if($send_info) {
- $pay_order_user = new PayOrderUserT();
- $pay_order_user->user_id = $send_info->user_id;
- $pay_order_user->order_id = $order_info->id;
- $pay_order_user->type = 4;
- $pay_order_user->is_own = 0;
- $pay_order_user->pay_date = $caiwu_info->pay_date;
- $pay_order_user->save();
- $pay_order_user->calPay();
- $pay_info = PayT::findOne(['user_id'=>$send_info->user_id,'pay_date'=>$pay_order_user->pay_date]);
- if($pay_info) {
- $pay_info->calPay();
- }
- }
-
-
-
-
-
-
-
-
-
-
-
- $caiwu_info->lock_id = 0;
-// $this->addLog($caiwu_info->order->car_id,'出纳办结完成,提交财务处理',1);
- if($year>=2018){
- $this->addLog($caiwu_info->order->car_id,'出纳办结完成,提交财务处理',1);
- }else{
- $this->addLog1($caiwu_info->order->car_id,'出纳办结完成,提交财务处理',1);
- }
-
- //处理操作人员状态
- $order_user_info = OrderUserT::findOne(['order_id'=>$caiwu_info->order_id,'user_id'=>$this->my->id,'type_id'=>$old_status_id,'status'=>0]);
- if($order_user_info) {
- $order_user_info->status = 1; //操作结束
- $order_user_info->save();
- }
+ if(!$caiwu_info->save()) {
+ throw new \Exception(print_r($caiwu_info->getErrors(), true));
}
- $caiwu_info->save();
+ $tran->commit();
$result['success'] = true;
$result['msg'] = '保存成功';
-
- $tran->commit();
-
} catch(\Throwable $e) {
$tran->rollBack();
- file_put_contents('log.txt',$e->getMessage());
- throw $e;
+ $result['msg'] = $e->getMessage();
}
}
return $result;
@@ -4229,6 +3933,9 @@ class InsurerController extends BaseController
}
$tran->commit();
+
+ $result['success'] = true;
+ $result['msg'] = '放弃成功';
} catch (\Exception $e) {
$tran->rollBack();
throw $e;
diff --git a/frontend/views/insurer/finance-mng-edit.php b/frontend/views/insurer/finance-mng-edit.php
index 951bb23..18a7189 100644
--- a/frontend/views/insurer/finance-mng-edit.php
+++ b/frontend/views/insurer/finance-mng-edit.php
@@ -1,571 +1,382 @@
-
-
+beginBlock('header_css'); ?>
+
+endBlock(); ?>
-
-
-
-
-
-
+
+
+
\ No newline at end of file
+
+endBlock(); ?>
diff --git a/frontend/views/insurer/finance-mng.php b/frontend/views/insurer/finance-mng.php
index 649a1db..851d9e8 100644
--- a/frontend/views/insurer/finance-mng.php
+++ b/frontend/views/insurer/finance-mng.php
@@ -34,50 +34,23 @@ use \common\libs\MyLib;
- ID |
- 被保险人 |
- 联系电话 |
- 保险公司 |
- 车牌号 |
- 正本日期 |
- 级别 |
- 销售座席 |
- 商业净保费 |
- 公司返金额 |
- 业务自付 |
- 实返现金额 |
- 转账时间 |
- 转账状态 |
- 支付方式 |
- 状态 |
- 当前操作 |
- 操作 |
-
-
- =$start_index+1?> |
- =MyLib::substr_cut($item->id_man,20)?> |
- =$item->link_phone?> |
- =$item->company?$item->company->name:''?> |
- =$item->car_no?> |
- =$item->print_date?> |
- =$nams?> |
- =$item->user?$item->user->getShowName():''?> |
- =$item->total1_clear?> |
- =$item->total1_dis?> |
- =$item->yuangong_money?> |
- =$item->non_total1_dis?> |
- =$item->total1_dis + $item->yuangong_money?> |
- =$caiwu->transfer_date?> |
- =$caiwu->caiwuStatus ? $caiwu->caiwuStatus->name : ''?> |
- =$item->shoufei_id?MyLib::zhifufs($item->shoufei_id).'-':''?>=$item->payType?$item->payType->name:''?> |
- =$caiwu->status->name?> |
- =$caiwu->lock?$caiwu->lock->getShowName():''?> |
-
-
- [解锁]
- [详情]
-
- |
+ ID |
+ 被保险人 |
+ 联系电话 |
+ 保险公司 |
+ 车牌号 |
+ 正本日期 |
+ 级别 |
+ 销售座席 |
+ 商业净保费 |
+ 公司返金额 |
+ 业务自付 |
+ 实返现金额 |
+ 转账时间 |
+ 转账状态 |
+ 状态 |
+ 当前操作 |
+ 操作 |
@@ -96,9 +69,11 @@ use \common\libs\MyLib;
var o = {};
function opFormatter(value, row, index) {
var opStr = [];
- opStr.push('');
- opStr.push('');
- opStr.push('');
+ if(row.lock_man != '') {
+ opStr.push('');
+ opStr.push('');
+ opStr.push('');
+ }
opStr.push('');
opStr.push('');
opStr.push('');
@@ -107,14 +82,14 @@ use \common\libs\MyLib;
}
function info(id) {
title = '详情';
- layer_show(title, '/car-type/edit?id=0');
+ layer_show(title, '/insurer/finance-mng-edit?id='+id);
}
function unlock(id) {
- parent.layer.confirm('是否确认删除?', {
- btn: ['删除','取消'], //按钮
+ parent.layer.confirm('是否确认解锁?', {
+ btn: ['解锁','取消'], //按钮
shade: false //不显示遮罩
}, function(){
- $.post('/car-type/delete',{id:id},function(data) {
+ $.post('/insurer/unlocked',{id:id},function(data) {
parent.layer.msg(data.msg);
refreshList();
}, 'json');