Merge branch 'feature/2210-changeOrderType' into new-version

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,13 +167,28 @@ 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 = ($row['PAY_TYPE']=='cash') ? '重消' : '积分';
+                                $orderType = '复消';
                             }
                         return $orderType;
                     },
                 ],
+                'PAY_TYPE' => [
+                    'header' => '支付方式',
+                    'value' => function ($row) {
+                        switch ($row['PAY_TYPE']) {
+                            case 'cash':
+                                return '充值账户支付';
+                            case 'exchange':
+                                return '复消积分支付';
+                            default:
+                                return '无业绩兑换点数支付';
+                        }
+                    },
+                    'headerOther' => ['width' => '190'],
+                ],
                 'IS_AUTO' => [
                     'header' => 'Is Auto', // 是否自动
                     'value' => function ($row) {

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/config/params.php

@@ -44,7 +44,7 @@ return [
     'shopWalletType' => [
         'cash' =>[
             'value'=>'cash',
-            'title'=>'现金钱包',
+            'title'=>'充值账户',
         ],
     ],
     'shopFlowType' => [

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',

frontendApi/modules/v1/controllers/ShopController.php

@@ -166,14 +166,16 @@ 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'] = in_array($value['PAY_TYPE'], ['cash', 'paystack']) ? '复消': '积分';
+                $data['list'][$key]['ORDER_TYPE'] = '复消';
             }
             //$data['list'][$key]['PROVINCE_NAME'] = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
            //$data['list'][$key]['CITY_NAME'] = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
             //$data['list'][$key]['COUNTY_NAME'] = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
             $data['list'][$key]['PAY_AT'] = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
+            $data['list'][$key]['PAY_TYPE'] = $value['PAY_TYPE'] == 'cash' ? '消费点数支付' : ($value['PAY_TYPE'] == 'exchange' ? '复消点数支付' : '业绩兑换点数支付');
         }
         return static::notice($data);
     }

frontendEle/src/views/shop/order-list.vue

@@ -22,6 +22,7 @@
         <el-table-column label="收货电话" prop="MOBILE"></el-table-column>
         <el-table-column label="支付时间" prop="PAY_AT"></el-table-column>
         <el-table-column label="订单类型" prop="ORDER_TYPE"></el-table-column>
+        <el-table-column label="支付类型" prop="PAY_TYPE"></el-table-column>
       </el-table>
       <div class="white-box-footer">
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>