Merge branch 'feature/dd-1500-namechange' into bugfix/dd-deduct-no300

common/helpers/goods/GoodsTimes.php

@@ -27,7 +27,7 @@ class GoodsTimes extends BaseObject
 
        foreach ($goods as $k => $v){
            $goodsdata = ShopGoods::find()->where(['ID' => $goods[$k]['ID']])->one();
-           if (Date::nowTime()>=($goodsdata->GOODS_DATE/1000)){
+           if (Date::nowTime()>=($goodsdata->GOODS_DATE)){
                if ($goodsdata->GOODS_STATUS_DATE == 0){
                    $goodsdata->STATUS = 0;
                    $goodsdata->UPDATED_AT = Date::nowTime();
@@ -44,7 +44,7 @@ class GoodsTimes extends BaseObject
             $package = DeclarationPackage::findAllAsArray('STATUS_DATE=1');
        foreach ($package as $a => $b){
            $packagedata = DeclarationPackage::find()->where(['ID' => $package[$a]['ID']])->one();
-           if (Date::nowTime()>=($packagedata->PACKAGE_DATE/1000)){
+           if (Date::nowTime()>=($packagedata->PACKAGE_DATE)){
                 if ($packagedata->PACKAGE_STATUS_DATE == 0){
                     $packagedata->STATUS = 0;
                     $packagedata->UPDATED_AT = Date::nowTime();

common/models/ShopGoods.php

@@ -161,11 +161,11 @@ class ShopGoods extends \common\components\ActiveRecord
     public static function payTypes(){
         return [
             'cash'=>[
-                'name'=>'余额支付'
-            ],
-            'point'=>[
-                'name'=>'积分支付'
+                'name'=>'消费点数支付'
             ],
+            // 'point'=>[
+            //     'name'=>'积分支付'
+            // ],
             'exchange' => [
                 'name' => '无业绩兑换点数'
             ]

common/models/Transfer.php

@@ -35,8 +35,8 @@ class Transfer extends \common\components\ActiveRecord
 {
 
     const WALLET_NAME = [
-        'bonus'=>'奖金',
-        'cash'=>'余额',
+        'bonus'=>'增值点数',
+        'cash'=>'消费点数',
         'point'=>'复消积分'
     ];
 

frontendApi/modules/v1/controllers/BonusController.php

@@ -71,8 +71,9 @@ class BonusController extends BaseController {
 //                $showCFLX = true;
 //            }
 //        }
-        $wallet[] = ['walletType' => 'bonus', 'walletName' => '会员奖金', 'amount' => Tool::formatPrice($data['BONUS'])];
-        $wallet[] = ['walletType' => 'cash', 'walletName' => '会员余额', 'amount' => Tool::formatPrice($data['CASH'])];
+        // 会员奖金->增值点数      会员余额->消费点数
+        $wallet[] = ['walletType' => 'bonus', 'walletName' => '增值点数', 'amount' => Tool::formatPrice($data['BONUS'])];
+        $wallet[] = ['walletType' => 'cash', 'walletName' => '消费点数', 'amount' => Tool::formatPrice($data['CASH'])];
         $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
         $wallet[] = ['walletType' => 'exchange', 'walletName' => '兑换点数', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];
 //        if ($showCFLX) {

frontendApi/modules/v1/controllers/ShopController.php

@@ -204,7 +204,7 @@ class ShopController extends BaseController {
      */
     public function actionReconsumeCart(){
         $userId = \Yii::$app->user->id;
-        $payList = ['cash'=>['name'=>'余额支付'],];
+        $payList = ['cash'=>['name'=>'消费点数支付'],];
         $userBalance = [
             'points' => 0,
             'cash' => 0

frontendEle/src/components/FilteTransfer.vue

@@ -108,11 +108,11 @@ export default {
       walletType: [
           {
               type:"bonus",
-              label:"奖金"
+              label:"增值点数"
           },
           {
               type:"cash",
-              label:"余额"
+              label:"消费点数"
           },
       ],
     }

frontendEle/src/views/finance/transfer-add.vue

@@ -7,10 +7,10 @@
             <el-option v-for="(item,key) in transferConfig" :label="item.outName+'转'+item.inName" :value="item.typeId" :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="当前可用奖金">
+        <el-form-item label="当前可用增值点数">
           <el-tag type="success">{{balance}}元</el-tag>
         </el-form-item>
-        <el-form-item label="当前可用余额">
+        <el-form-item label="当前可用消费点数">
           <el-tag type="success">{{cash}}元</el-tag>
         </el-form-item>
         <el-form-item label="当前可用复消积分">

frontendEle/src/views/shop/order.vue

@@ -71,7 +71,7 @@
                         <div>{{balance.points}}</div>
                     </div>
                     <div class="sum_box">
-                        <div>账户余额</div>
+                        <div>账户消费点数</div>
                         <div>￥{{balance.cash}}元</div>
                     </div>
                     <div class="sum_box">

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

@@ -132,7 +132,7 @@
                         <!--<div>{{balance.points}}</div>-->
                     <!--</div>-->
                     <div class="sum_box">
-                        <div>账户余额</div>
+                        <div>账户消费点数</div>
                         <div>￥{{balance.cash}}元</div>
                     </div>
                 </div>