From a2b249becef3f224efa5d48159f72409a7e1c95a Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Fri, 16 Oct 2020 17:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/order/controller/Failed.php   | 53 +++++++++++++++++++++++++++++++
 app/order/controller/TbRefund.php | 21 ++++++------
 app/order/model/ProductOrder.php  | 18 +++++++++++
 config/config.php                 |  2 +-
 fastphp/func/common.php           | 35 +++++++++++++++-----
 5 files changed, 108 insertions(+), 21 deletions(-)
 create mode 100644 app/order/controller/Failed.php
 create mode 100644 app/order/model/ProductOrder.php

diff --git a/app/order/controller/Failed.php b/app/order/controller/Failed.php
new file mode 100644
index 0000000..60ce8c4
--- /dev/null
+++ b/app/order/controller/Failed.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: kangkang
+ * @Date: 2020-10-13 19:52:37
+ * @LastEditors: kangkang
+ * @LastEditTime: 2020-10-16 17:21:58
+ */
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: kangkang
+ * @Date: 2020-10-13 19:52:37
+ * @LastEditors: kangkang
+ * @LastEditTime: 2020-10-14 20:04:16
+ */
+
+namespace app\order\controller;
+
+use app\order\model\ProductOrder;
+use fastphp\base\Controller;
+
+class Failed extends Controller
+{
+    public function getFailedList()
+    {
+        $page = 0;
+        if (isset($_GET['PageIndex'])) {
+            $page = ($_GET['PageIndex'] - 1) * 50;
+        }
+        if (isset($_GET['ProductId'])){
+            $where['ProductId'] = $_GET['ProductId'];
+        }
+        if (isset($_GET['PackageId'])){
+            $where['PackageId'] = $_GET['PackageId'];
+        }
+        if (!empty($_GET['keyWord'])){
+            $where['OrderNo'] = $_GET['keyWord'];
+        }
+        $where['Remark'] = ['like','%失败%'];
+        
+        $productOrder = new ProductOrder;
+        $list = $productOrder->getListPage($where, '*', 'id desc', "$page,50");
+        $data = [
+            'Code' => 10000,
+            'Data' => $list,
+            'Message' => '',
+            'TotalCount' => (int)$productOrder->getCount(['Remark'=>['like','%失败%']]),
+        ];
+        echo json_encode($data);
+    }
+}
diff --git a/app/order/controller/TbRefund.php b/app/order/controller/TbRefund.php
index 966db4b..516fba2 100644
--- a/app/order/controller/TbRefund.php
+++ b/app/order/controller/TbRefund.php
@@ -5,7 +5,7 @@
  * @Author: kangkang
  * @Date: 2020-10-13 19:52:37
  * @LastEditors: kangkang
- * @LastEditTime: 2020-10-15 17:51:08
+ * @LastEditTime: 2020-10-16 11:15:13
  */
 /*
  * @Descripttion:
@@ -29,9 +29,11 @@ class TbRefund extends Controller
     public function refundList()
     {
         $refund = new RefundMOdel;
+        $userModel = new UserModel;
         $list = $refund->getListPage();
         foreach ($list as &$v) {
             $v['status'] = RefundEnum::$refundStatus[$v['status']];
+            $v['account'] = $userModel->getOne(['LoginCode' => $v['Phone']])['RestAmount'];
         }
         $count = $refund->getCount();
         $data = [
@@ -49,9 +51,11 @@ class TbRefund extends Controller
         }
         $page = ($_GET['page'] - 1) * 50;
         $refund = new RefundMOdel;
+        $userModel = new UserModel;
         $list = $refund->getListPage([], '*', 'id desc', "$page,50");
         foreach ($list as &$v) {
             $v['status'] = RefundEnum::$refundStatus[$v['status']];
+            $v['account'] = $userModel->getOne(['LoginCode' => $v['Phone']])['RestAmount'];
         }
         $data = [
             'Code' => 10000,
@@ -65,6 +69,7 @@ class TbRefund extends Controller
     {
         $Phone = json_decode(file_get_contents("php://input"), true)['Phone'];
         $refund = new RefundMOdel;
+        $userModel = new UserModel;
         if ($Phone) {
             $list = $refund->getListPage(['Phone' => $Phone], '*', 'id desc', '100');
         } else {
@@ -73,6 +78,7 @@ class TbRefund extends Controller
         }
         foreach ($list as &$v) {
             $v['status'] = RefundEnum::$refundStatus[$v['status']];
+            $v['account'] = $userModel->getOne(['LoginCode' => $v['Phone']])['RestAmount'];
         }
         $data = [
             'Code' => 10000,
@@ -96,11 +102,7 @@ class TbRefund extends Controller
         $refund = new RefundMOdel;
         $where = ['Id' => $id];
         $info = $refund->getOne($where);
-        $data = [
-            'Code' => 10000,
-            'data' => $info,
-        ];
-        echo json_encode($data);
+        \result($info);
     }
 
     /**
@@ -124,12 +126,7 @@ class TbRefund extends Controller
         //判断余额是否大于退款金额
         $returnOk = $user_info['RestAmount'] - $refund_info["RefundFee"];
         if ($returnOk < 0) {
-            $return = [
-                'Code' => 30000,
-                'msg' => '余额不足',
-            ];
-            echo json_encode($return);
-            die;
+            \result([],'余额不足',30000);
         } else {
             $update_data['f_balance'] = $user_info['RestAmount'];
             if ($refund->updateOne(['Id' => $id], $update_data)) {
diff --git a/app/order/model/ProductOrder.php b/app/order/model/ProductOrder.php
new file mode 100644
index 0000000..d6c1a39
--- /dev/null
+++ b/app/order/model/ProductOrder.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: kangkang
+ * @Date: 2020-10-16 14:44:02
+ * @LastEditors: kangkang
+ * @LastEditTime: 2020-10-16 15:53:03
+ */
+
+namespace app\order\model;
+
+use fastphp\base\Model;
+
+class ProductOrder extends Model
+{
+    protected $table = 'product_order';
+}
diff --git a/config/config.php b/config/config.php
index a901af9..bf24be2 100644
--- a/config/config.php
+++ b/config/config.php
@@ -5,7 +5,7 @@
  * @Author: kangkang
  * @Date: 2020-09-30 17:32:46
  * @LastEditors: kangkang
- * @LastEditTime: 2020-10-15 17:31:20
+ * @LastEditTime: 2020-10-16 17:44:31
  */
 
 return [
diff --git a/fastphp/func/common.php b/fastphp/func/common.php
index 0d89697..8606a6f 100644
--- a/fastphp/func/common.php
+++ b/fastphp/func/common.php
@@ -1,4 +1,12 @@
 <?php
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: kangkang
+ * @Date: 2020-09-30 17:32:46
+ * @LastEditors: kangkang
+ * @LastEditTime: 2020-10-16 11:14:25
+ */
 /**
  * 浏览器友好的变量输出
  * @param mixed $var 变量
@@ -7,8 +15,9 @@
  * @param boolean $strict 是否严谨 默认为true
  * @return void|string
  */
-function dd($var, $echo=true, $label=null, $strict=true) {
-    echo(echoBase($var, $echo=true, $label=null, $strict=true));
+function dd($var, $echo = true, $label = null, $strict = true)
+{
+    echo (echoBase($var, $echo = true, $label = null, $strict = true));
     exit;
 }
 
@@ -20,11 +29,13 @@ function dd($var, $echo=true, $label=null, $strict=true) {
  * @param boolean $strict 是否严谨 默认为true
  * @return void|string
  */
-function dump($var, $echo=true, $label=null, $strict=true) {
-    echo(echoBase($var, $echo=true, $label=null, $strict=true));
+function dump($var, $echo = true, $label = null, $strict = true)
+{
+    echo (echoBase($var, $echo = true, $label = null, $strict = true));
 }
 
-function echoBase($var, $echo=true, $label=null, $strict=true) {
+function echoBase($var, $echo = true, $label = null, $strict = true)
+{
     $label = ($label === null) ? '' : rtrim($label) . ' ';
     if (!$strict) {
         if (ini_get('html_errors')) {
@@ -45,6 +56,14 @@ function echoBase($var, $echo=true, $label=null, $strict=true) {
     return $output;
 }
 
-function JWTDecode($token,$_secret,$verify = true){
-
-}
\ No newline at end of file
+//接口返回函数
+function result($data = [], $msg = '', $code = 10000)
+{
+    $info = [
+        'Code' => $code,
+        'msg' => $msg,
+        'data' => $data,
+    ];
+    echo json_encode($info);
+    die;
+}