shish hace 4 años
padre
commit
8c8428ced4
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. 1 1
      app-ghs/controllers/OrderController.php
  2. 2 2
      common/components/dict.php

+ 1 - 1
app-ghs/controllers/OrderController.php

@@ -727,7 +727,7 @@ class OrderController extends BaseController
         $post['sjId'] = $this->sjId;
         $post['shopId'] = $shopId;
         $post['mainId'] = $this->mainId;
-        $post['fromType'] = 1;
+        $post['fromType'] = $post['fromType'] ?? 3;
         $post['expressId'] = $post['expressId'] ?? 0;
         $post['sendCost'] = $post['sendCost'] ?? '0.00';
         $post['book'] = $post['book'] ?? 0;

+ 2 - 2
common/components/dict.php

@@ -317,14 +317,14 @@ class dict
         'fromType' => [
             'shop' => 1,//门店
             'mall' => 2,//商城
-            'friend' => 3,//朋友圈
+            'friend' => 3,//微信
             'mt' => 4,//美团
             'elm' => 5,//饿了么
         ],
         'fromTypeMap' => [
             1 => '门店',
             2 => '商城',
-            3 => '朋友圈',
+            3 => '微信',
             4 => '美团',
             5 => '饿了么',
         ],