优化打款配置

Application/Payment/Controller/PaymentController.class.php

@@ -1261,31 +1261,37 @@ class PaymentController extends BaseController
         }
 
         $count = M("pay_statement_info","tab_")->field("sum(final_statement_money) statement_money")->where("id in ({$ids})")->find();
+        $paymentInfo = D("Admin/TransferMerchant")->getUnderPaymentInfo();
         $this->getAccountMoney();
         // dd($CompanyInfo);
 
         $this->assign("CompanyInfo",$CompanyInfo);
         $this->assign("mobile",$this->admininfo['mobile']);
         $this->assign("count",$count);
+        $this->assign("paymentInfo",$paymentInfo);
         $this->display();
 
         // $this->display();
 
     }
     public function getAccountMoney(){
+
         Vendor("Alipay2020/Fund");
+        $isCanPayment = true;
         if(empty(C("ALI_PAYMENT"))){
+            $isCanPayment = false;
             $money = "测试站无法查看";
         }else{
-            $fund = new \Fund(C("ALI_PAYMENT"));
+            $fund = new \Fund(D("Admin/TransferMerchant")->getStatementPaymentConfig());
             $money = $fund->account();
             if($money !== -1){
                 $money = $money['amount'];
             }else{
+                $isCanPayment = false;
                 $money = "--";
             }
         }
-        
+        $this->assign("isCanPayment",$isCanPayment);
         $this->assign("money",$money);
     }
     //以下打款流程
@@ -1308,7 +1314,7 @@ class PaymentController extends BaseController
             $this->ajaxReturn(["success"=>"配置错误，无法打款","data"=>["status"=>0]]);
         }
         Vendor("Alipay2020/Fund");
-        $fund = new \Fund(C("ALI_PAYMENT"));
+        $fund = new \Fund(D("Admin/TransferMerchant")->getStatementPaymentConfig());
         $dbres = M("pay_statement_info", "tab_")->where("id='{$id}'")->find();
 
         $company_statement = M("company_statement_info", "tab_")->field("pay_check")->where(['id'=>$dbres['statement_info_id']])->find();

Application/Payment/View/ExcelPayment/showPayment.html

@@ -171,7 +171,7 @@
             支付宝账号:{$paymentInfo['account']}      接口类型:{$paymentInfo['is_free_str']}
         </div>
 
-
+        <if condition="$isCanPayment">
             <div style="display: flex;padding:20px 10px;line-height: 40px;justify-content:center;">
                 <input name="verify" type="text" class="login_input verify" value="" placeholder="请填写验证码"/>
                 <div id="sendSasfeCode" class="g-btn" style="margin-left: 20px;">获取验证码</div>
@@ -179,12 +179,13 @@
             </div>
             
             <div class="search_list" style="display:flex;margin: 0;align-items:center;margin-right: 20px;">
-            <if condition="$isCanPayment">
                 <a class="sch-btn" href="javascript:;" id="setPayment" style="width: 150px;height: 40px;line-height: 40px;">确认打款</a>
+            </div>
         <else />
+            <div style="font-size: 18px;line-height: 82px;">
                 打款接口错误，无法打款
-            </if>
             </div>
+        </if>
     </div>
     
     

Application/Payment/View/Payment/showPayment.html

@@ -163,16 +163,26 @@
         </div>
     </div>
 
+    <div style="display: flex;justify-content:space-between;">
+        <div style="color: red;font-size: 18px;line-height: 82px;">
+            支付宝账号:{$paymentInfo['account']} &nbsp;&nbsp;&nbsp;  接口类型:{$paymentInfo['is_free_str']}
+        </div>
+
+        <if condition="$isCanPayment">
             <div style="display: flex;padding:20px 10px;line-height: 40px;justify-content:center;">
                 <input name="verify" type="text" class="login_input verify" value="" placeholder="请填写验证码"/>
                 <div id="sendSasfeCode" class="g-btn" style="margin-left: 20px;">获取验证码</div>
                 <div style="margin-left: 20px;">接收验证码手机:{$mobile}</div>
             </div>
             
-    <div class="search_list" style="display:flex;justify-content:flex-end;width:100%;">
-        <div class="input-list" style="margin-left: 30px;float: right;">
-            <a class="sch-btn" href="javascript:;" id="setPayment" style="width: 150px;">确认打款</a>
+            <div class="search_list" style="display:flex;margin: 0;align-items:center;margin-right: 20px;">
+                <a class="sch-btn" href="javascript:;" id="setPayment" style="width: 150px;height: 40px;line-height: 40px;">确认打款</a>
+            </div>
+        <else />
+            <div style="font-size: 18px;line-height: 82px;">
+                打款接口错误，无法打款
             </div>
+        </if>
     </div>
 
     <div style="width: 100vw;height: 100vh;padding: 0;position: absolute;top: 0;z-index: 9999;display: none;" id="creat_msg">