fix bug

app/api/controller/Order.php

@@ -230,6 +230,17 @@ class Order extends \app\BaseController
         return $this->ok($r);
     }
 
+    /**
+     * @return \think\response\Json
+     * @throws BaseException
+     */
+    public function paymentDone() {
+        $params = $this->request->param();
+        predicate(isset($params['order_id']) && $params['order_id'] > 0, '订单ID不存在!');
+        $r = $this->service->paymentDone($params['admin_id'], $params['order_id'], $params['remarks'] ?? null);
+        predicate($r->bool, $r->message);
+        return $this->ok($r->data);
+    }
 
 }
 

app/api/route/app.php

@@ -38,6 +38,7 @@ Route::group('api/order', function () {
     Route::rule('returnOrderProduct', 'api/order/returnOrderProduct');
     Route::rule('findByOrderNo', 'api/order/findByOrderNo');
     Route::rule('exchange', 'api/order/exchange');
+    Route::rule('paymentDone', 'api/order/paymentDone');
 })->middleware(\app\common\middleware\VerifySessionToken::class);
 
 Route::group('api/payment', function () {

app/common/model/OrderProductModel.php

@@ -15,14 +15,16 @@ class OrderProductModel extends BaseModel
 
     /**
      * @param $o_id
+     * @param int $is_pay
      * @return OrderProductModel[]|array|\think\Collection
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function findByOrderId($o_id) {
+    public function findByOrderId($o_id, $is_pay = 1) {
         return $this->where('is_delete', 0)
             ->where('order_id',$o_id)
+            ->where('is_pay', $is_pay)
             ->select();
     }
 

public/css/chunk-08fa61fc.12906fed.css

@@ -0,0 +1 @@
+.annualFee-main{height:calc(100vh - 100px);font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.annualFee-main .search>div{margin-bottom:28px}.annualFee-main .search .el-date-editor,.annualFee-main .search .el-input{margin-right:17px}

public/css/chunk-1f3bd948.a917d32f.css

@@ -0,0 +1 @@
+.deposit-main{height:calc(100vh - 100px);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.deposit-main .search-div{padding-bottom:10px}

public/css/chunk-275e8883.7d59a155.css

@@ -0,0 +1 @@
+.el-main[data-v-1d12a8be]{padding:0}.el-main>div[data-v-1d12a8be]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:20px 40px}

public/css/chunk-638c6980.b492bcae.css

@@ -0,0 +1 @@
+.orderHistory-main{height:calc(100vh - 100px);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.orderHistory-main .search-div{padding-bottom:10px}

public/js/chunk-275e8883.60e3250a.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-275e8883"],{"2f6a":function(e,n,t){"use strict";t.r(n);var a=function(){var e=this,n=e._self._c;return n("div",[n("el-container",{staticClass:"layout-main"},[n("el-header",[n("statusBarIndex")],1),n("el-main",[n("router-view")],1)],1)],1)},i=[],s={},u=s,c=(t("f079"),t("2877")),r=Object(c["a"])(u,a,i,!1,null,"1d12a8be",null);n["default"]=r.exports},"6ea7":function(e,n,t){},f079:function(e,n,t){"use strict";t("6ea7")}}]);
+//# sourceMappingURL=chunk-275e8883.60e3250a.js.map