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

application/em/controller/Payment.php

@@ -159,26 +159,26 @@ class Payment extends Base
         foreach ($invs as $inv){
             //未生成缴费或已挂起
             $amount += $inv->payment_balance;
-            if($inv->payment_amount >= $inv->payment_balance){
-                //是否已挂起
-                $paymentField = EmPaymentInvoice::field('payment_id')
-                                                ->where('invoice_id','=',$inv->invoice_id)
-                                                ->order('create_time desc')->find();
-                if($paymentField){
-                    //找到关联的缴费单
-                    $payment = EmPayment::where('payment_id','=',$paymentField->payment_id)->find();
-
-                     //如果缴费单并未缴费
-                    if($payment->amount == 0){
-                        $message = '账单号: '.$inv->invoice_id.' 已经挂起,无法生成缴费单';
-                        return json(['status'=>0,'message'=>$message]);
-                    } else {
-                        $idsArr[] = $inv->invoice_id;
-                    }
+            //是否已挂起
+            $epiModel = EmPaymentInvoice::field('payment_id')
+                                            ->where('invoice_id','=',$inv->invoice_id)
+                                            ->order('create_time desc')->find();
+            if($epiModel){
+                //找到关联的缴费单
+                $payment = EmPayment::where('payment_id','=',$epiModel->payment_id)->find();
+
+                if(!$payment) return json(['status'=>0,'message'=>'单据：'.$epiModel->payment_id.'出现异常，单据与账单关系存在，但缴费单不存在!']);
+                 //如果缴费单并未缴费
+                if($payment->amount == 0){
+                    $message = '账单号: '.$inv->invoice_id.' 已经挂起,无法生成缴费单';
+                    return json(['status'=>0,'message'=>$message]);
                 } else {
                     $idsArr[] = $inv->invoice_id;
                 }
+            } else {
+                $idsArr[] = $inv->invoice_id;
             }
+
         }
         $ids = $idsArr;
 
@@ -198,13 +198,14 @@ class Payment extends Base
             throw new Exception('保存账单与缴费关联数据失败');
         };
 
-        $account = (new EmAccount())->getIdByInvoiceID($paymentInvoiceArr[0]['invoice_id']);
 
         //3.将账单数据汇总写入缴费表
         $pData  = [];
         $pData['payment_id'] = $paymentId;
-        $pData['status'] = 0;
-        $pData['account_id'] = $account->account_id;
+        $pData['status'] = 1;
+        $pData['account_id'] = '\\';  //占位符，表示空的无效的
+        $pData['em_id'] = '\\';    //占位符，表示空的无效的
+        $pData['payment_type'] = 1;
         $pData['balance'] = $pData['amount'] = round($amount,2);
 
         if((new EmPayment())->save($pData)){

application/em/view/invoice/merge_list.html

@@ -84,19 +84,7 @@
         function () {
             $ = layui.jquery;
             var form = layui.form,
-                layer = layui.layer,
-                laydate = layui.laydate,
-                upload = layui.upload;
-
- 
-            //消息提示
-            function layMsg(msg,type=6,time=1000){
-                layer.msg(msg,{
-                  icon: type,
-                  time: time,
-                });
-            }
-
+                layer = layui.layer;
 
             //生成缴费单
             form.on('submit(payment)',
@@ -108,14 +96,14 @@
                         dataType: "json",
                         success: function (data) {
                             if (data.status == 1) {
-                                layer.msg(data.message,{icon: 6,time: 1000 },function(){
+                                layer.msg(data.message,{icon: 6,time: 4000 },function(){
                                     if(data.data){
                                         var url = "/payment"
                                         window.location.href=url
                                     }
                                 })
                             } else {
-                                layer.msg(data.message,{icon: 5,time: 1000 })
+                                layer.msg(data.message,{icon: 5,time: 4000 })
                             }
                         }
                     });
@@ -132,11 +120,11 @@
                         dataType: "json",
                         success: function (data) {
                             if (data.status == 1) {
-                                layer.msg(data.message,{icon: 6,time: 1000},function(){
+                                layer.msg(data.message,{icon: 6,time: 4000},function(){
                                     window.location.href='/settle';
                                 })
                             } else {
-                                layer.msg(data.message,{icon: 5,time: 1000 })
+                                layer.msg(data.message,{icon: 5,time: 4000 })
                             }
                         }
                     });

application/em/view/payment/detail.html

@@ -163,12 +163,11 @@
                                     审核
                                 </button>
                                 {/if}
-                                {if $fk.oafk_numb == '' && $payment.is_check == 1 &&
-                                check_ele_permission('payment/payoa')}
+                                {if $fk.oafk_numb == '' && check_ele_permission('payment/payoa')}
                                 <button class="layui-btn" lay-filter="pay" lay-submit="">
                                     提交付款
                                 </button>
-                                {elseif check_ele_permission('payment/checkPayment')/}
+                                {elseif check_ele_permission('payment/checkPayment') && $payment.status == 0 /}
                                 <button class="layui-btn" lay-filter="pass" lay-submit="">
                                     通过
                                 </button>