Skip to content

J
Jz-Php
提交 815757a8 authored 作者: chengye's avatar chengye
浏览文件
操作

Merge branch 'release' of ssh://39.155.253.71:33222/PHP/Jz-Php into release

上级 9370c20c 749f1be0
隐藏空白字符变更
内嵌 并排
正在显示 包含 92 行增加 和 90 行删除
.gitignore
浏览文件 @ 815757a8
......@@ -14,16 +14,13 @@
/config/database.php
/config/cache.php
/config/session.php
<<<<<<< HEAD
/config/admin.php
=======
/config/cookie.php
/config/jz.php
>>>>>>> test
/config/app.php
/public/dist
/public/dist2
/public/static/uploads
/public/static/xadmin
/public/page
/application/admin/view/staff/role.html
/config/jz.php
/config/cookie.php
/config/jz.php
\ No newline at end of file
application/api/controller/v2/common/Payment.php
浏览文件 @ 815757a8
......@@ -8,6 +8,7 @@
namespace app\api\controller\v2\common;
use app\em\controller\Account;
use app\em\controller\Invoice;
use app\em\controller\WriteOff;
use app\em\model\EmInvoice;
use app\em\model\EmPayment;
......@@ -32,6 +33,7 @@ class Payment
Log::record(date('Y-m-d H:i:s').' OA单号:'.$data['numb'].' 接口操作:单据状态更新');
return $this->update($data['numb'],$data['status'],$data['mes']);
} else {
Log::record(date('Y-m-d H:i:s').' OA单号:'.$data['numb'].' 接口操作:单据作废');
return $this->dropNumb($data['numb'],$data['status']);
}
}
......@@ -69,19 +71,20 @@ class Payment
$payment = (new EmPayment())->get(['payment_id' => $paymentFk->payment_id]);
$paymentFk->status = 0;
$paymentFk->save();
$payment->status = 9;
$payment->status = $status;
$payment->save();
//删除payment_invoice表
$delNum = (new EmPaymentInvoice())->where('payment_id', '=', $payment->payment_id)->delete();
Log::record(date('Y-m-d H:i:s').' OA单号:'.$numb. '缴费单已作废');
$invoices = (new EmPaymentInvoice())->where('payment_id', '=', $paymentFk->payment_id)->delete();
$message = ' 缴费单: '.$paymentFk->payment_id. '缴费单已作废';
Log::record(date('Y-m-d H:i:s').$message);
return json(
[
'code' => 201,
'message' => json_encode($payment->toArray()),
'data' => ''
]);
[
'code' => 201,
'message' => $message,
'data' => ''
]);
}
......
application/em/controller/Em.php
浏览文件 @ 815757a8
......@@ -201,6 +201,10 @@ class Em extends Base
//保存缴费结算数据
$emRuleModel = EmRule::order('id desc,create_time desc')->get(['em_id'=>$data['em_id']]);
//如果之前没有子表记录则插入
if(!$emRuleModel) $emRuleModel = new EmRule();
$emRuleModel->save($data);
(new Account())->createAccount($data['em_id']);
......@@ -248,10 +252,19 @@ class Em extends Base
if(!$em || !isset($em->rule)){
return false;
}
if(!isset($em->rule->settle_price) || empty($em->rule->settle_price) || !isset($em->rule->pay_price) || empty($em->rule->pay_price)){
return false;
} else {
return true;
if($em->rule->charge_type == 1)
if(!isset($em->rule->settle_price) || empty($em->rule->settle_price) || !isset($em->rule->pay_price) || empty($em->rule->pay_price)){
return false;
} else {
return true;
}
else {
if(!isset($em->rule->settle_price) || empty($em->rule->settle_price)){
return false;
} else {
return true;
}
}
}
......
application/em/controller/Invoice.php
浏览文件 @ 815757a8
......@@ -413,4 +413,9 @@ class Invoice extends Base
return $msg;
}
public function statusBack($invoice_id,$payment_id){
$eModel = EmPaymentInvoice::get(['invoice_id'=>'$invoice_id','payment_id'=>$payment_id]);
$eModel->delete();
}
}
\ No newline at end of file
application/em/controller/Payment.php
浏览文件 @ 815757a8
......@@ -97,7 +97,7 @@ class Payment extends Base
$this->assign('search_text',$search_text ?: '');
//缴费状态
if($payment_status !== '') $map[]=['pay.status','=',"$payment_status"];
if($payment_status != '') $map[]=['pay.status','=',"$payment_status"];
$this->assign('payment_status',$payment_status ?: '');
//区域
......@@ -172,7 +172,9 @@ class Payment extends Base
//过滤不可以生成缴费单的账单ID
$idsArr = [];
$amount = 0;
$inv0 = null;
foreach ($invs as $inv){
if($inv0 === null) $inv0 = $inv;
//未生成缴费或已挂起
$amount += $inv->payment_balance;
//是否已挂起
......@@ -219,10 +221,11 @@ class Payment extends Base
$pData = [];
$pData['payment_id'] = $paymentId;
$pData['status'] = 1;
$pData['account_id'] = '\\'; //占位符，表示空的无效的
$pData['em_id'] = '\\'; //占位符，表示空的无效的
$pData['account_id'] = $inv0->account_id; //占位符，表示空的无效的
$pData['em_id'] = $inv0->em_id; //占位符，表示空的无效的
$pData['payment_type'] = 1;
$pData['balance'] = $pData['amount'] = round($amount,2);
$pData['uid'] = $this->uid;
if((new EmPayment())->save($pData)){
return json(['status'=>1,'message'=>'已创建缴费单']);
......@@ -260,6 +263,12 @@ class Payment extends Base
if($payment->status > 1 && $payment->status != 7){
$fkModel = EmPaymentFk::get(['payment_id'=>$payment->payment_id]);
if(!$fkModel) {
$fkModel = new EmPaymentFk();
$fkModel->oafk_numb = '';
$fkModel->link = '';
$fkModel->oafk_id = '';
}
$fkModel->link = config('oafk.base_url').config('oafk.link') . $fkModel->oafk_id;
} else if ($payment->status == 7) {
$fkModel = EmCheckBill::get(['mode_id'=>$payment->payment_id]);
......@@ -370,7 +379,7 @@ class Payment extends Base
$paymentModel->account_id = $accountId;
$paymentModel->balance = $data['amount'];
$paymentModel->staff_id = $data['staff_id'];
$paymentModel->cid = $this->uid;
$paymentModel->uid = $this->uid;
$paymentModel->payment_type = $em->em_type_id;
// $paymentModel->is_check = $em->em_type_id == 2 || $em->em_type_id == 4 ? 0 : 1;
$paymentModel->status = 0;
......@@ -573,8 +582,8 @@ class Payment extends Base
public function getGys($email)
{
$url = config('oafk.base_url').config('oafk.gys') . $this->apiKey();
$url .= '&email='.$email;
$res = curlGet($url);
$data = ['email'=>$email,'count'=>'all'];
$res = httpPOST($url,$data);
$res = json_decode($res,true);
foreach ($res['data'] as $k => $v){
if(!empty($v['bank_info'])){
......@@ -599,9 +608,7 @@ class Payment extends Base
//创建付款编号
public function createFkNumb($data){
$url = config('oafk.base_url').config('oafk.fk') . $this->apiKey();
var_dump($url);
$res = httpPOST($url, ['data'=>json_encode($data)]);
var_dump($res);
// $end = strpos($res,'}');
// $str = substr($res,$start,$end);
$res = json_decode($res,true);
......
application/em/model/EmInvoice.php
浏览文件 @ 815757a8
......@@ -117,12 +117,15 @@ class EmInvoice extends Base
$eiu = EmInvoiceUseage::where(['invoice_id'=>$inv->invoice_id])->find();
//查询抄表信息
$useage = Useage::with('photo')->get(['useage_id'=>$eiu->useage_id]);
if($useage->photo_id) {
$receipt = Receipt::get(['id'=>$useage->photo_id]);
if($receipt) $useage['photo'] = $receipt;
$uModel = Useage::get(['useage_id'=>$eiu->useage_id]);
if(isset($uModel->cert_id) && $uModel->cert_id != ''){
$useage = Useage::with('photo')->get(['useage_id'=>$eiu->useage_id]);
if($useage->photo_id) {
$receipt = Receipt::get(['id'=>$useage->photo_id]);
if($receipt) $useage['photo'] = $receipt;
}
} else {
$useage = $uModel;
$useage['photo'] = [];
}
......
application/em/model/EmPayment.php
浏览文件 @ 815757a8
......@@ -23,50 +23,25 @@ class EmPayment extends Base
//缴费单+search
public function getPaymentList($map,$Nowpage,$limits){
//先找到账单
$data = self::alias('pay')
->field('pay.*')
->field('epi.invoice_id')
->field('em.em_numb')
->field('r.region_name,station.station_name')
->leftJoin(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
->leftJoin(['em_invoice'=>'ei'],'ei.invoice_id=epi.invoice_id')
->leftJoin(['em_account'=>'ea'],'ea.account_id=ei.account_id')
->leftJoin(['em'],'em.id=ea.em_id')
->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
->leftJoin(['region'=>'r'],'station.area_id = r.id')
->where($map)
->order('pay.id desc')
->group('pay.payment_id')
->page($Nowpage, $limits)
->select()
->toarray();
$arr = [];
foreach ($data as $v){
$arr[] = $v['payment_id'];
}
$data2 = self::alias('pay')
$data = self::alias('pay')
->field('pay.*')
->field('em.em_numb,r.region_name,station.station_name')
->leftJoin(['em_account'=>'ea'],'ea.account_id=pay.account_id')
->leftJoin(['em'],'em.id=ea.em_id')
->leftJoin(['em'],'em.id=pay.em_id')
->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
->leftJoin(['region'=>'r'],'station.area_id = r.id')
->where($map)
->whereNotIn('pay.payment_id',$arr)
->order('pay.id desc')
->group('pay.payment_id')
->page($Nowpage, $limits)
->select()
->toarray();
$data = array_merge($data,$data2);
$sortKey = [];
foreach ($data as $k=>$item){
$data[$k]['state'] = Payment::PAYMENT_STATUS[$item['status']];
$data[$k]['style'] = Payment::PAYMENT_STAUS_STYLE[$item['status']];
$data[$k]['payment_type'] = Payment::PAYMENT_TYPE[$item['payment_type']];
$sortKey[$k] = $item['create_time'];
}
......@@ -78,30 +53,14 @@ class EmPayment extends Base
//先找到账单
$data = self::alias('pay')
->field('pay.*')
->field('epi.invoice_id')
->field('em.em_numb')
->field('r.region_name,station.station_name')
->leftJoin(['em_payment_invoice'=>'epi'],'epi.payment_id = pay.payment_id')
->leftJoin(['em_invoice'=>'ei'],'ei.invoice_id=epi.invoice_id')
->leftJoin(['em_account'=>'ea'],'ea.account_id=ei.account_id')
->leftJoin(['em'],'em.id=ea.em_id')
->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
->leftJoin(['region'=>'r'],'station.area_id = r.id')
->where($map)
->count();
$data2 = self::alias('pay')
->field('pay.*')
->field('em.em_numb,r.region_name,station.station_name')
->leftJoin(['em_account'=>'ea'],'ea.account_id=pay.account_id')
->leftJoin(['em'],'em.id=ea.em_id')
->leftJoin(['em'],'em.id=pay.em_id')
->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
->leftJoin(['region'=>'r'],'station.area_id = r.id')
->where($map)
->count();
return intval($data + $data2);
return $data;
}
//通过缴费单id返回缴费单关联账单信息
public function getinvsInfo($payment_id){
......
application/em/view/em/create.html
浏览文件 @ 815757a8
......@@ -330,7 +330,7 @@
<span class="x-red">*</span>缴费周期
</label>
<div class="layui-input-inline">
<input type="text" id="pay_cycle" name="pay_cycle" autocomplete="off" class="layui-input" lay-verType="tips">
<input type="number" id="pay_cycle" name="pay_cycle" autocomplete="off" class="layui-input" lay-verType="tips">
</div>
</div>
</div>
......
application/em/view/invoice/detail.html
浏览文件 @ 815757a8
......@@ -121,7 +121,7 @@
<span class="x-red">*</span>抄表单照片
</label>
<div class="layui-input-inline">
{if $inv.useage.photo.src == ''}
{if !isset($inv.useage.photo.src) }
<input type="text"
autocomplete="off" class="layui-input layui-no-border" value="未上传抄表照片" disabled="disabled">
{else /}
......
application/em/view/payment/index.html
浏览文件 @ 815757a8
......@@ -73,7 +73,7 @@
<th lay-data="{field:'em_numb',sort: true} ">表号</th>
<th lay-data="{field:'payment_type',sort: true}">缴费类型</th>
<th lay-data="{field:'amount',sort: true}">应付金额</th>
<th lay-data="{field: 'status',sort: true}">状态</th>
<th lay-data="{templet: '#state'}">状态</th>
<th lay-data="{field: 'create_time',sort: true}">创建日期</th>
<th lay-data="{fixed: 'right', align:'center', toolbar: '#barDemo'}">操作</th>
</tr>
......@@ -87,6 +87,9 @@
</div>
</div>
</body>
<script type="text/html" id="state">
<span class="{{ d.style }}">{{d.state}}</span>
</script>
<script type="text/html" id="payment_id">
<a class="layui-link" title="查看详情" href="/payment/{{d.payment_id}}">{{d.payment_id}}</a>
</script>
......
application/em/view/useage/default.html
浏览文件 @ 815757a8
......@@ -106,7 +106,7 @@
</label>
<div class="layui-input-inline">
<input type="text" id="current_date" name="current_date"
autocomplete="off" class="layui-input" value="{$em.useage.current_date|date='Y:m:d'}">
autocomplete="off" class="layui-input" value="{$em.useage.current_date}">
</div>
</div>
</div>
......@@ -261,8 +261,7 @@
laydate.render({
elem:'#current_date',
trigger:'click',
elem:'#current_date'
})
//保存抄表单，并且返回列表
......@@ -311,7 +310,7 @@
}
});
$('#current_numb').change(function(){
var $level = 100000;
var $level = 1;
var $rate = $('#rate').val();
var $baseNum = $level*$rate;
var $rNum = $(this).val()*$baseNum - $('#last_numb').val()*$baseNum;
......@@ -322,7 +321,7 @@
return;
}
var $num = $rNum/$level;
var $num = round2($rNum);
$('#repo_numb').val($num);
if($('#pricing_type').val() == 2){
......@@ -348,6 +347,10 @@
$('#price').val($price.toFixed(4))
}
})
function round2(num){
return Math.round((num + Number.EPSILON) * 100) / 100;
}
});
</script>
{/block}
\ No newline at end of file
application/em/view/useage/update.html
浏览文件 @ 815757a8
......@@ -307,7 +307,7 @@
}
});
$('#current_numb').change(function(){
var $level = 100000;
var $level = 1;
var $rate = $('#rate').val();
var $baseNum = $level*$rate;
var $rNum = $(this).val()*$baseNum - $('#last_numb').val()*$baseNum;
......@@ -317,7 +317,8 @@
layMsg('本次抄表必须大于上次抄表读数',5);
$('#current_numb').focus();
} else{
var $num = $rNum/$level;
var $num = round2($rNum);
$('#repo_numb').val( $num )
if($amount != '' || $amount != 0){
......@@ -336,6 +337,10 @@
var $price = $('#amount').val() / $('#repo_numb').val();
$('#price').val($price.toFixed(4))
})
function round2(num){
return Math.round((num + Number.EPSILON) * 100) / 100;
}
});
</script>
{/block}
\ No newline at end of file
config/admin.php
浏览文件 @ 815757a8
......@@ -12,7 +12,7 @@ return [
'files_dir' => './static/uploads/files',
'search_area' => '1', //1按部门搜索,2全局
'order_per' =>'ZD',
'redis_host' => '192.168.1.71',
'redis_host' => '192.168.1.70',
'redis_port' => 6379,
'base_url' => 'http://oa-test.gonn.tech/'
'base_url' => 'http://oa-release.gonn.tech'
];
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论