Browse Source

update: order service

tokumeikoi 3 years ago
parent
commit
9ff76dedd7
2 changed files with 11 additions and 2 deletions
  1. 2 1
      app/Services/OrderService.php
  2. 9 1
      public/theme/v2board/assets/env.example.js

+ 2 - 1
app/Services/OrderService.php

@@ -120,6 +120,7 @@ class OrderService
         if ($user->invite_user_id && ($order->total_amount <= 0)) return;
         $order->invite_user_id = $user->invite_user_id;
         $inviter = User::find($user->invite_user_id);
+        if (!$inviter) return;
         $isCommission = false;
         switch ((int)$inviter->commission_type) {
             case 0:
@@ -134,7 +135,7 @@ class OrderService
                 break;
         }
 
-        if ($isCommission) return;
+        if (!$isCommission) return;
         if ($inviter && $inviter->commission_rate) {
             $order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100);
         } else {

+ 9 - 1
public/theme/v2board/assets/env.example.js

@@ -14,5 +14,13 @@ window.settings = {
   // 背景
   background_url: '',
   // crisp
-  crisp_id: ''
+  crisp_id: '',
+  i18n: [
+    'zh-CN',
+    'en-US',
+    'ja-JP',
+    'vi-VN',
+    'ko-KR',
+    'zh-TW'
+  ]
 }