Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

addons/epay/config.html

@@ -256,7 +256,30 @@
                                 </div>
                             </td>
                         </tr>
-
+                        <tr>
+                            <td>证书(app_cert_public_key)</td>
+                            <td>
+                                <div class="row">
+                                    <div class="col-sm-8 col-xs-12">
+                                        <input type="text" name="row[alipay][app_cert_public_key]" value="{$item.value.app_cert_public_key|default=''}" class="form-control" data-rule="" data-tip=""/>
+                                        <div style="margin-top:5px;"><a href="" target="_blank"><i class="fa fa-question-circle"></i></a></div>
+                                    </div>
+                                    <div class="col-sm-4"></div>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>证书(alipay_root_cert)</td>
+                            <td>
+                                <div class="row">
+                                    <div class="col-sm-8 col-xs-12">
+                                        <input type="text" name="row[alipay][alipay_root_cert]" value="{$item.value.alipay_root_cert|default=''}" class="form-control" data-rule="" data-tip=""/>
+                                        <div style="margin-top:5px;"><a href="" target="_blank"><i class="fa fa-question-circle"></i></a></div>
+                                    </div>
+                                    <div class="col-sm-4"></div>
+                                </div>
+                            </td>
+                        </tr>
                         <tr>
                             <td>记录日志</td>
                             <td>

application/admin/controller/RecharOrder.php

@@ -108,6 +108,7 @@ class RecharOrder extends Backend
             //更新退款金额
             $data = [
                 'refund_money' => $row['money'],//退款金额
+                'status' => 2,//订单状态:-1=支付超时,0=支付中,1=支付成功,2=退款
             ];
             $where['id'] = $ids;
             $res = $this->model->update($data,$where);
@@ -131,8 +132,8 @@ class RecharOrder extends Backend
                 'refund_price' => $row['money'],
                 'remark' => '充值退款',
             ];
-            $refundParams['order']['pay_fee'] = 0.01;
-            $refundParams['refund_price'] = 0.01;
+            /*$refundParams['order']['pay_fee'] = 0.01;
+            $refundParams['refund_price'] = 0.01;*/
             $refundRes = $this->model->old_refund($refundParams);
             if ($refundRes['status'] == 0) {
                 throw new Exception($refundRes['msg']);

application/admin/controller/Withdraw.php

@@ -123,7 +123,7 @@ class Withdraw extends Backend
                 } elseif ($params['status'] == 'successed') {
                     $remark = '提现'.$row['money'].'通过';
                     //通过提现到用户账户
-                    /*if (isset($params['type']) && $params['type'] == 'alipay') {
+                    if (isset($params['type']) && $params['type'] == 'alipay') {
                         $moneyService = new MoneyService();
                         $withdrawParams = [
                             'money' => $params['real_money'],
@@ -134,7 +134,7 @@ class Withdraw extends Backend
                         if (!$withdrawRes['status']) {
                             throw new Exception($withdrawRes['msg']);
                         }
-                    }*/
+                    }
                 }
                 if (!empty($remark)) {
                     //审核结果消息通知