1

app/api/service/User.php

@@ -128,9 +128,9 @@ class User extends UserService
      */
     public static function isStore(): bool
     {
-        $userType = static::getCurrentLoginUserType();
-        if ($userType && $userType == UserTypeEnum::STORE) {
-            $userId = self::getCurrentLoginUserId();
+        $userInfo = static::getCurrentLoginUser(true);
+        if ($userInfo && $userInfo['user_type'] == UserTypeEnum::STORE) {
+            $userId = $userInfo['user_id'];
             //商家表里有没有
             $model = new \app\api\model\Store();
             $store_id = $model->where(['user_id' => $userId])->value('store_id');

app/common/service/server/Order.php

@@ -64,7 +64,7 @@ class Order extends BaseService
     public static function cancelOrder(array $order): bool
     {
         //未完成 未取消
-        if (!empty($order['order_status']) && $order['order_status'] != ServerEnum::COMPLETED || $order['order_status'] != ServerEnum::CANCELLED) {
+        if (!empty($order['order_status']) && self::checkCancel($order)) {
             if (!empty($order['coupon_id'])) {
                 // 回退用户优惠券
                 $order['coupon_id'] > 0 && UserCouponModel::setIsUse($order['coupon_id'], false);