【程序目录】更新4.5版本优化

crmeb/app/adminapi/controller/v1/order/RefundOrder.php

@@ -50,6 +50,7 @@ class RefundOrder extends AuthController
             ['refund_type', 0]
         ]);
         $where['is_cancel'] = 0;
+        $where['is_system_del'] = 0;
         return app('json')->success($this->services->refundList($where));
     }
 

crmeb/app/adminapi/controller/v1/order/StoreOrder.php

@@ -218,9 +218,12 @@ class StoreOrder extends AuthController
         if (!$orderInfo->is_del)
             return app('json')->fail(400157);
         $orderInfo->is_system_del = 1;
-        if ($orderInfo->save())
+        if ($orderInfo->save()) {
+            /** @var StoreOrderRefundServices $refundServices */
+            $refundServices = app()->make(StoreOrderRefundServices::class);
+            $refundServices->update(['store_order_id' => $id], ['is_system_del' => 1]);
             return app('json')->success(100002);
-        else
+        } else
             return app('json')->fail(100008);
     }
 
@@ -486,7 +489,7 @@ class StoreOrder extends AuthController
             $orderInfo['_store_name'] = $storeServices->value(['id' => $orderInfo['store_id']], 'name');
         } else
             $orderInfo['_store_name'] = '';
-        $orderInfo['spread_name'] = $services->value(['uid'=>$orderInfo['spread_uid']],'nickname') ?? '无';
+        $orderInfo['spread_name'] = $services->value(['uid' => $orderInfo['spread_uid']], 'nickname') ?? '无';
         $userInfo = $userInfo->toArray();
         return app('json')->success(compact('orderInfo', 'userInfo'));
     }

crmeb/app/api/controller/v1/user/MessageSystemController.php

@@ -76,9 +76,15 @@ class MessageSystemController
         $data = $request->getMore([
             ['id', 0],
             ['key', ''],
-            ['value', '']
+            ['value', ''],
+            ['all', 0]
         ]);
-        $this->services->update($data['id'], [$data['key'] => $data['value']]);
+        $all = (int)$data['all'];
+        if ($all === 1) {
+            $this->services->update(['uid' => $request->uid()], [$data['key'] => $data['value']]);
+        } else {
+            $this->services->update($data['id'], [$data['key'] => $data['value']]);
+        }
         return app('json')->success(100014);
     }
 }

crmeb/app/api/route/v1.php

@@ -221,7 +221,7 @@ Route::group(function () {
     //消息站内信
     Route::get('user/message_system/list', 'v1.user.MessageSystemController/message_list')->name('MessageSystemList'); //站内信列表
     Route::get('user/message_system/detail/:id', 'v1.user.MessageSystemController/detail')->name('MessageSystemDetail'); //详情
-    Route::get('user/message_system/edit_message', 'v1.user.MessageSystemController/edit_message')->name('EditMessage');//站内信设为未读/删除ß
+    Route::get('user/message_system/edit_message', 'v1.user.MessageSystemController/edit_message')->name('EditMessage');//站内信设为未读/删除
 
     //积分商城订单
     Route::post('store_integral/order/confirm', 'v1.order.StoreIntegralOrderController/confirm')->name('storeIntegralOrderConfirm'); //订单确认

crmeb/app/lang/en_us.php

@@ -66,6 +66,7 @@ return [
     100101 => 'Illegal operation',
     100102 => 'Data acquisition failed',
     100103 => 'Site upgrade in progress, please visit later',
+    100104 => 'Missing Code',
 
     // 处理特殊状态码
     110000 => 'You do not have access right for the time being',
@@ -1256,4 +1257,7 @@ return [
     40003 => 'Illegal openid. Please confirm whether openid (the user) has paid attention to wechat or whether it is the openid of other wechat',
     40002 => 'Illegal voucher type',
     40001 => 'Get access_ Appsecret error in token, or access_ The token is invalid. Please carefully compare the correctness of appsecret or check whether the interface is being called for the appropriate wechat',
+    200011 => "This account has been banned and cannot be operated",
+    200012 => "The number of personal templates has reached the upper limit, the upper limit is 25",
+    200014 => "Please check the category of the applet",
 ];

crmeb/app/model/order/StoreOrderRefund.php

@@ -116,6 +116,16 @@ class StoreOrderRefund extends BaseModel
         if ($value !== '' && !is_null($value)) $query->where('is_del', $value);
     }
 
+    /**
+     * is_system_del搜索器
+     * @param Model $query
+     * @param $value
+     */
+    public function searchIsSystemDelAttr($query, $value)
+    {
+        if ($value !== '' && !is_null($value)) $query->where('is_system_del', $value);
+    }
+
     /**
      * refund_type
      * @param $query

crmeb/app/services/system/UpgradeServices.php

@@ -55,6 +55,7 @@ class UpgradeServices extends BaseServices
     public function __construct(UpgradeLogDao $dao)
     {
         $versionData = $this->getVersion();
+        if ($versionData['version_code'] < 450) return true;
         if (empty($versionData)) {
             throw new AdminException('授权信息丢失');
         }