【程序目录】修复移动端订单管理无法正常操作退款的问题

crmeb/app/api/controller/v1/admin/StoreOrderController.php

@@ -191,9 +191,9 @@ class StoreOrderController
         }
         if ($price === '') return app('json')->fail(410175);
         if ($price < 0) return app('json')->fail(410176);
-        if ($order['pay_price'] == $price) return app('json')->success(100001);
-        $services->updateOrder($order['id'], ['total_price' => $order['total_price'], 'pay_price' => $price]);
-        return app('json')->success(100001);
+        if ($order['pay_price'] == $price) return app('json')->success(100001, ['order_id' => $order_id]);
+        $order_id = $services->updateOrder($order['id'], ['total_price' => $order['total_price'], 'pay_price' => $price]);
+        return app('json')->success(100001, ['order_id' => $order_id]);
     }
 
     /**
@@ -578,4 +578,19 @@ class StoreOrderController
         } else
             return app('json')->fail(100025);
     }
+
+    /**
+     * 同意退货
+     * @param StoreOrderRefundServices $services
+     * @param Request $request
+     * @return mixed
+     */
+    public function agreeExpress(StoreOrderRefundServices $services, Request $request)
+    {
+        [$id] = $request->postMore([
+            ['id', ''],
+        ], true);
+        $services->agreeExpress($id);
+        return app('json')->success(100010);
+    }
 }

crmeb/app/api/route/v1.php

@@ -58,6 +58,7 @@ Route::group(function () {
     Route::post('admin/order/delivery/keep/:id', 'v1.admin.StoreOrderController/delivery_keep')->name('adminOrderDeliveryKeep');//订单发货
     Route::post('admin/order/price', 'v1.admin.StoreOrderController/price')->name('adminOrderPrice');//订单改价
     Route::post('admin/order/remark', 'v1.admin.StoreOrderController/remark')->name('adminOrderRemark');//订单备注
+    Route::post('admin/order/agreeExpress', 'v1.admin.StoreOrderController/agreeExpress')->name('adminOrderAgreeExpress');//订单同意退货
     Route::post('admin/refund_order/remark', 'v1.admin.StoreOrderController/refundRemark')->name('refundRemark');//退款订单备注
     Route::get('admin/order/time', 'v1.admin.StoreOrderController/time')->name('adminOrderTime');//订单交易额时间统计
     Route::post('admin/order/offline', 'v1.admin.StoreOrderController/offline')->name('adminOrderOffline');//订单支付

crmeb/app/services/order/StoreOrderServices.php

@@ -787,7 +787,7 @@ HTML;
                 $order = $this->dao->getOne(['id' => $id, 'is_del' => 0]);
                 //改价短信提醒
                 event('notice.notice', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']);
-                return true;
+                return $data['order_id'];
             } else {
                 throw new AdminException(100007);
             }

crmeb/app/services/system/UpgradeServices.php

@@ -184,7 +184,7 @@ class UpgradeServices extends BaseServices
     {
         [$page, $limit] = $this->getPageValue();
         $this->requestData['page'] = (string)($page ?: 1);
-        $this->requestData['limit'] = (string)($limit ?: 1);
+        $this->requestData['limit'] = (string)($limit ?: 10);
         $this->getSign($this->timeStamp);
         $result = HttpService::getRequest(self::UPGRADE_URL, $this->requestData);
         if (!$result) {
@@ -563,7 +563,7 @@ class UpgradeServices extends BaseServices
             if (CacheService::get($token . 'is_execute') == 2) {
                 return true;
             }
-            CacheService::set($token . 'is_execute', 2);
+            CacheService::set($token . 'is_execute', 2, 86400);
 
             $dataBackupName = CacheService::get($token . '_database_backup_name');
             if (!$dataBackupName || !is_file(app()->getRootPath() . 'backup' . DS . $dataBackupName)) {
@@ -606,7 +606,7 @@ class UpgradeServices extends BaseServices
         if (CacheService::get($token . 'is_save') == 2) {
             return true;
         }
-        CacheService::set($token . 'is_save', 2);
+        CacheService::set($token . 'is_save', 2, 86400);
 
         $upgradeData = CacheService::get($token . '_upgrade_data');
 
@@ -742,6 +742,7 @@ class UpgradeServices extends BaseServices
         }
 
         if (empty($upgradeSql)) {
+            CacheService::set($token . '_database_upgrade', 2, 86400);
             return true;
         }