取消兑换点数支付

common/models/ShopGoods.php

@@ -42,11 +42,11 @@ class ShopGoods extends \common\components\ActiveRecord
 //            'id' => 2,
 //            'name' => '复消兑换',
 //        ],
-        3 => [
-            'id' => 3,
-            'name' => '兑换点数',
-            'label' => 'exchange',
-        ],
+//        3 => [
+//            'id' => 3,
+//            'name' => '兑换点数',
+//            'label' => 'exchange',
+//        ],
         4 => [
             'id' => 4,
             'name' => '旅游积分',
@@ -97,7 +97,7 @@ class ShopGoods extends \common\components\ActiveRecord
             'name' => '普通商品',
             'sell_type' => [
                 self::SALE_TYPE[1],
-                self::SALE_TYPE[3],
+//                self::SALE_TYPE[3],
                 self::SALE_TYPE[7],
             ]
         ],
@@ -215,9 +215,9 @@ class ShopGoods extends \common\components\ActiveRecord
             'point'=>[
                 'name'=>'积分支付'
             ],
-            'exchange' => [
-                'name' => '积分点数'
-            ],
+//            'exchange' => [
+//                'name' => '积分点数'
+//            ],
             'tourism_points'=>[
                 'name'=>'旅游积分'
             ],

frontendApi/modules/v1/controllers/ShopController.php

@@ -97,15 +97,15 @@ class ShopController extends BaseController {
             }
         }
         $userBalance = [
-            'points' => 0,
+//            'points' => 0,
             'cash' => 0,
-            'exchange' => 0,
+//            'exchange' => 0,
             'tourism_points' => 0,
             'garage_points' => 0,
         ];
         if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
-            $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
+//            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
+//            $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
             $userBalance['tourism_points'] = $userBonusResult['TOURISM_POINTS'];
             $userBalance['garage_points'] = $userBonusResult['GARAGE_POINTS'];
         }

frontendEle/src/views/shop/order.vue

@@ -95,10 +95,10 @@
                                 <div>账户余额</div>
                                 <div>￥{{ balance.cash }}元</div>
                             </div>
-                            <div class="sum_box">
-                                <div>兑换点数</div>
-                                <div>{{ balance.exchange }}</div>
-                            </div>
+<!--                            <div class="sum_box">-->
+<!--                                <div>兑换点数</div>-->
+<!--                                <div>{{ balance.exchange }}</div>-->
+<!--                            </div>-->
                         </div>
 
                         <div v-if="category_type === 4">