Merge branch 'new-version' into dev

# Conflicts:
#	console/controllers/ToolController.php

backendApi/modules/v1/models/lists/bonus/BalanceList.php

@@ -133,7 +133,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '150'],
 //                ],
                 'BONUS' => [
-                    'header' => '会员奖金余额',
+                    'header' => '奖金账户',
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS'],
@@ -148,7 +148,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '会员复销点数',
+                    'header' => '复消积分',
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['RECONSUME_POINTS'],
@@ -178,7 +178,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'CASH' => [
-                    'header' => '会员余额',
+                    'header' => '充值账户',
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['CASH'],

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -167,7 +167,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
                             if($row['ORDER_TYPE']=='ZC'){
-                                $orderType = '报单';
+                                $orderType = '首单';
                             }else{
 //                                $orderType = ($row['PAY_TYPE']=='cash') ? '重消' : '积分';
                                 $orderType = '复消';

backendApi/modules/v1/models/lists/shop/OrderShopList.php

@@ -61,7 +61,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'header' => '订单类型',
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? '复消' : '积分';
                     },
                 ],
                 'CONSIGNEE' => [

backendEle/src/views/config/transfer.vue

@@ -96,7 +96,7 @@
         },
         loading: true,
         submitButtonStat: false,
-        allWallet:{'bonus':'会员账户','cash':'现金钱包','point':'复销点数'}
+        allWallet:{'bonus':'奖金账户','cash':'充值账户','point':'复消积分'}
       }
     },
     methods: {
@@ -133,4 +133,4 @@
 
 <style scoped>
 
-</style>
+</style>

common/libs/taskQueue/TaskFunc.php

@@ -62,8 +62,10 @@ class TaskFunc
      * 自动送钉钉提醒
      */
     public static function autoSendDingTalkTable() {
+        $ip = 'https://fapi.ekhkad.com';
+//        $ip = 'http://16.163.228.151:8013';
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'http://16.163.228.151:8013/v1/site/send-notice');
+        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
         curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);

common/models/BalanceAudit.php

@@ -32,11 +32,11 @@ class BalanceAudit extends \common\components\ActiveRecord
     const TYPE = [
         'bonus' => [
             'name' => 'bonus',
-            'label' => '会员账户奖金',
+            'label' => '奖金账户',
         ],
         'reconsume_points' => [
             'name' => 'reconsume_points',
-            'label' => '复销点数',
+            'label' => '复消积分',
         ],
         'exchange_points' => [
             'name' => 'exchange_points',
@@ -44,7 +44,7 @@ class BalanceAudit extends \common\components\ActiveRecord
         ],
         'cash' => [
             'name' => 'cash',
-            'label' => '会员账户余额',
+            'label' => '充值账户',
         ],
 //        'cf' => [
 //            'name' => 'cf',

console/controllers/ToolController.php

@@ -126,6 +126,13 @@ class ToolController extends BaseController
         echo '清空成功'.PHP_EOL;
     }
 
+    /**
+     * 清空缓存
+     */
+    public function actionClearConfigCache() {
+        \Yii::$app->cache->delete(Cache::SYSTEM_CONFIG_KEY);
+        echo '清空成功: ' . Cache::SYSTEM_CONFIG_KEY . PHP_EOL;
+    }
 
     /**
      * 重置接点和推荐数量
@@ -172,9 +179,10 @@ class ToolController extends BaseController
      * 自动送钉钉提醒
      */
     public function actionAutoSendDingTalkTable() {
-        LoggerTool::info(__FUNCTION__);
+//        $ip = 'http://16.163.228.151:8013';
+        $ip = 'https://fapi.ekhkad.com';
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'http://16.163.228.151:8013/v1/site/send-notice');
+        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
         curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);

frontendApi/modules/v1/controllers/ShopController.php

@@ -166,7 +166,7 @@ class ShopController extends BaseController {
         ]);
         foreach ($data['list'] as $key => $value) {
             if($value['ORDER_TYPE']=='ZC'){
-                $data['list'][$key]['ORDER_TYPE'] = '报单';
+                $data['list'][$key]['ORDER_TYPE'] = '首单';
             }else{
 //                $data['list'][$key]['ORDER_TYPE'] = in_array($value['PAY_TYPE'], ['cash', 'paystack']) ? '复消': '积分';
                 $data['list'][$key]['ORDER_TYPE'] = '复消';