xxxrrrdddd 3 anni fa
parent
commit
12ec6a8488

+ 4 - 1
application/admin/controller/MobileOrder.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 
 use app\common\controller\Backend;
 use app\common\model\MobileOrderOperation;
+use app\common\service\Refund;
 use think\Db;
 
 /**
@@ -112,7 +113,7 @@ class MobileOrder extends Backend
         }else{
             $data=input('row/a');
             $this->validate($data,[
-                'amount|金额'=>'require|integer|egt:0',
+                'amount|金额'=>'require|number|egt:0',
             ]);
             Db::startTrans();
             $model=$this->model->where('id',$ids)->lock(true)->findOrFail();
@@ -120,6 +121,8 @@ class MobileOrder extends Backend
                 $this->error('退款金额不能大于付款金额');
             }
             $model['amount_refund']=$data['amount'];
+            $model['refund_no']=session_create_id();
+            Refund::setType($model)->refund();
             $model->save();
 
             Db::commit();

+ 1 - 1
application/admin/view/mobile_order/index.html

@@ -3,7 +3,7 @@
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
-            <li class="active"><a href="#t-all" data-toggle="tab">{:__('All')}</a></li>
+            <li class="active"><a href="#t-all" data-toggle="tab" data-value="">{:__('All')}</a></li>
             {foreach name="status" item="vo"}
             <li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}

+ 1 - 0
application/common/service/Refund.php

@@ -16,6 +16,7 @@ class Refund{
         $a=new self;
         $a->mobileOrder=$mobileOrder;
         $a->type=$mobileOrder['pay_type'];
+        return $a;
     }
     public function refund(){
         if(!isset($this->types[$this->type])){