新增：接口 eventSource、请求支持 event stream

module/Vendor/Docs/release.md

@@ -1,3 +1,9 @@
+## 4.4.0
+
+- 新增：订单快捷操作工具类 OrderUtil
+
+---
+
 ## 4.3.0 移动端链接识别，uniapp操作工具
 
 - 新增：有移动端链接时，后台链接选择自动识别电脑端和移动端筛选

module/Vendor/Type/OrderStatus.php

@@ -14,7 +14,9 @@ class OrderStatus implements BaseType
 
     // 订单过期，支付成功的订单
     const CANCEL_PAID = 97;
+    // 订单过期，未支付的订单
     const CANCEL_EXPIRED = 98;
+    // 用户取消
     const CANCEL = 99;
 
     // const CANCEL_QUEUE = 100;

module/Vendor/Util/ApiUtil.php

@@ -45,10 +45,16 @@ public static function config()
         ];
         $uploads = config('data.upload');
         foreach ($uploads as $category => $categoryInfo) {
-            $data['dataUpload']['category'][$category] = [
+            $info = [
                 'maxSize' => $categoryInfo['maxSize'],
                 'extensions' => $categoryInfo['extensions'],
             ];
+            if ('image' == $category) {
+                $info['compress'] = $categoryInfo['compress'];
+                $info['compressMaxWidthOrHeight'] = $categoryInfo['compressMaxWidthOrHeight'];
+                $info['compressMaxSize'] = $categoryInfo['compressMaxSize'];
+            }
+            $data['dataUpload']['category'][$category] = $info;
         }
 
         return $data;

module/Vendor/Util/OrderUtil.php

@@ -0,0 +1,80 @@
+<?php
+
+
+namespace Module\Vendor\Util;
+
+
+use ModStart\Core\Dao\ModelUtil;
+use ModStart\Core\Exception\BizException;
+use Module\Vendor\Type\OrderStatus;
+
+class OrderUtil
+{
+    public static function cancelManual($model, $where, $successCallback = null)
+    {
+        ModelUtil::transactionBegin();
+        try {
+            $order = ModelUtil::getWithLock($model, $where);
+            BizException::throwsIfEmpty('订单不存在', $order);
+            BizException::throwsIf('订单状态异常', $order['status'] != OrderStatus::WAIT_PAY);
+            $update = [
+                'status' => OrderStatus::CANCEL,
+            ];
+            if (array_key_exists('cancelTime', $order)) {
+                $update['cancelTime'] = date('Y-m-d H:i:s');
+            }
+            ModelUtil::update($model, $order['id'], $update);
+            call_user_func_array($successCallback, [$order]);
+            ModelUtil::transactionCommit();
+        } catch (BizException $e) {
+            ModelUtil::transactionRollback();
+            throw $e;
+        }
+    }
+
+    public static function cancelExpire($model, $where, $successCallback)
+    {
+        ModelUtil::transactionBegin();
+        try {
+            $order = ModelUtil::getWithLock($model, $where);
+            BizException::throwsIfEmpty('订单不存在', $order);
+            BizException::throwsIf('订单状态异常', $order['status'] != OrderStatus::WAIT_PAY);
+            $update = [
+                'status' => OrderStatus::CANCEL_EXPIRED,
+            ];
+            if (array_key_exists('cancelTime', $order)) {
+                $update['cancelTime'] = date('Y-m-d H:i:s');
+            }
+            ModelUtil::update($model, $order['id'], $update);
+            call_user_func_array($successCallback, [$order]);
+            ModelUtil::transactionCommit();
+        } catch (BizException $e) {
+            ModelUtil::transactionRollback();
+        }
+    }
+
+    public static function payed($model, $where, $successCallback, $updateStatus = null)
+    {
+        if (is_null($updateStatus)) {
+            $updateStatus = OrderStatus::COMPLETED;
+        }
+        ModelUtil::transactionBegin();
+        try {
+            $order = ModelUtil::getWithLock($model, $where);
+            BizException::throwsIfEmpty('订单不存在', $order);
+            BizException::throwsIf('订单状态异常', $order['status'] != OrderStatus::WAIT_PAY);
+            $update = [
+                'status' => $updateStatus,
+            ];
+            if (array_key_exists('payTime', $order)) {
+                $update['payTime'] = date('Y-m-d H:i:s');
+            }
+            ModelUtil::update($model, $order['id'], $update);
+            call_user_func_array($successCallback, [$order]);
+            ModelUtil::transactionCommit();
+        } catch (BizException $e) {
+            ModelUtil::transactionRollback();
+            throw $e;
+        }
+    }
+}

module/Vendor/config.json

@@ -1,7 +1,7 @@
 {
     "name": "Vendor",
     "title": "通用功能包",
-    "version": "4.3.0",
+    "version": "4.4.0",
     "author": "官方",
     "description": "提供基础功能",
     "modstartVersion": ">=3.3.0",

public/asset/vendor/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "27298710",
+      "name": "douyin",
+      "font_class": "douyin",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
     {
       "icon_id": "38459183",
       "name": "description",