merge

common/config/params.php

@@ -306,6 +306,14 @@ return [
             'value' => 6,
             'label' => '订单删除'
         ],
+        '-1' => [
+            'value' => -1,
+            'label' => 'Payment failed',//支付失败
+        ],
+        'failPaid' => [
+            'value' => -1,
+            'label' => 'Payment failed',//支付失败
+        ],
     ],
     'exportModule' => [
         'shop' => ['label' => '商城管理', 'value'=>'shop'],
@@ -336,4 +344,17 @@ return [
     'alarmAccessToken' => $mainConfig['alarmAccessToken'],
     // 业务环境白名单
     'allowPlatform' => $mainConfig['allowPlatform'],
+    // wst配置
+    'wst' => [
+        //  (prod)
+        'baseToken' => 'ZWxrZW5yZXN0OnNmMjM0ZmE3NHNn',
+        'agentId' => 'TP',
+        'userName' => 'elken',
+        'password' => 'elken0088',
+        // (test)
+        // 'baseToken' => 'dnRuX2FwaV90ZXN0Ond0cmV3cjI0MzI0ZmRz',
+        // 'agentId' => 'elg8',
+        // 'userName' => 'vtn',
+        // 'password' => '123456',
+    ],
 ];

common/helpers/Tool.php

@@ -10,6 +10,8 @@ namespace common\helpers;
 
 
 use common\models\AlarmCall;
+use common\models\ApproachOrderCall;
+use common\models\WstOrderCall;
 use Faker\Provider\Uuid;
 use yii\base\Exception;
 use yii\helpers\Url;
@@ -477,6 +479,7 @@ class Tool {
      * 预警日志入库
      * @param $call
      * @return void
+     * @throws \Exception
      */
     public static function alarmCall($call)
     {
@@ -488,7 +491,57 @@ class Tool {
         } catch (\yii\mongodb\Exception $e) {
             LoggerTool::error($call);
             LoggerTool::error(sprintf('[%s] [%s] [%s]', $e->getFile(), $e->getLine(), $e->getMessage()));
-        } catch (\Exception $e) {
+        }
+    }
+
+     /* iPay88订单写入MongoDB.
+     * @param $call
+     * @return void
+     * @throws \Exception
+     */
+    public static function approachOrderCall($call)
+    {
+        try {
+            $model = new ApproachOrderCall();
+            $model->sn = $call['RefNo'];
+            $model->TransId = $call['TransId'];
+            $model->Signature = $call['Signature'];
+            $model->data = $call;
+            $model->insert();
+        } catch (\yii\mongodb\Exception $e) {
+            LoggerTool::info($call);
+            LoggerTool::error(sprintf('[%s] [%s] [%s]', $e->getFile(), $e->getLine(), $e->getMessage()));
+        }
+    }
+
+    /**
+     * 订单推送wst系统回执写入mongo.
+     * @param $call
+     * @return void
+     * @throws \Exception
+     */
+    public static function wstOrderCall($call)
+    {
+        try {
+            $model = new WstOrderCall();
+            $model->order_id = $call['order_id'];
+            $model->order_no = $call['order_no'];
+            $model->warehouse_id = $call['warehouse_id'];
+            $model->delivery_method_name = $call['warehouse_id'];
+            $model->addon_service_name = $call['addon_service_name'];
+            $model->country = $call['country'];
+            $model->state = $call['state'];
+            $model->city = $call['city'];
+            $model->post_code = $call['post_code'];
+            $model->address = $call['address'];
+            $model->consignee = $call['consignee'];
+            $model->telephone = $call['telephone'];
+            $model->comment = $call['comment'];
+            $model->products = $call['products'];
+            $model->insert();
+        } catch (\yii\mongodb\Exception $e) {
+            LoggerTool::info($call);
+            LoggerTool::error(sprintf('[%s] [%s] [%s]', $e->getFile(), $e->getLine(), $e->getMessage()));
         }
     }
 }