修改删除订单

@@ -1585,12 +1585,12 @@ class Order extends Api
             $userModel = new \app\api\model\User();
             $userModel = new \app\api\model\User();
             if ($orderInfo['pay_type'] == 1){
             if ($orderInfo['pay_type'] == 1){
                 //微信退款
                 //微信退款
-                $result = $pay->refund($orderInfo['order_num'],$orderInfo['pay_total'],$refund_note,$orderInfo['goods_total']);
+                $result = $pay->refundGoods($orderInfo['order_num'],$orderInfo['pay_total'],$orderInfo['id'],$refund_note,$orderInfo['goods_total']);
             }else{
             }else{
                 //余额退款
                 //余额退款
-                $result = $userModel->refund($orderInfo['user_id'],$orderInfo['goods_total'],$orderInfo['id'],$refund_note);
+                $result = $userModel->refundGoods($orderInfo['user_id'],$orderInfo['goods_total'],$orderInfo['id'],$refund_note);
             }
             }
-            $msg = '确认收货';
+            $msg = '退款';
         }else{
         }else{
             //提交审核
             //提交审核
             $result = $orderInfoModel->where('id',$order_info_id)->update(['status'=>'2','refund_note'=>$refund_note,'refund_time' => time()]);
             $result = $orderInfoModel->where('id',$order_info_id)->update(['status'=>'2','refund_note'=>$refund_note,'refund_time' => time()]);

@@ -27,7 +27,7 @@ class Order extends Model
 
 
     public function getStatusList()
     public function getStatusList()
     {
     {
-        return ['-1' => '已取消', '1' => '待支付', '2' => '待发货', '3' => '待收货', '4' => '待评价', '5' => '已完成', '6' => '待成团', '8' => '已退款', '10' => '待审核'];
+        return ['-1' => '已取消', '1' => '待支付', '2' => '待发货', '3' => '待收货', '4' => '待评价', '5' => '已完成', '6' => '待成团', '7' => '退款中', '8' => '已退款', '10' => '待审核'];
     }
     }
 
 
     public function getStatusTextAttr($value, $data)
     public function getStatusTextAttr($value, $data)