Ver código fonte

bugfix:支付方式修改

kevin_zhangl 3 anos atrás
pai
commit
23f3dbbced

+ 2 - 2
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -182,9 +182,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                             case 'cash':
                                 return '充值账户';
                             case 'exchange':
-                                return '复消积分';
-                            default:
                                 return '兑换点数';
+                            default:
+                                return '复消积分';
                         }
                     },
                     'headerOther' => ['width' => '120'],

+ 1 - 1
frontendApi/modules/v1/controllers/ShopController.php

@@ -175,7 +175,7 @@ class ShopController extends BaseController {
            //$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' ? '复消点数' : '兑换点数');
+            $data['list'][$key]['PAY_TYPE'] = $value['PAY_TYPE'] == 'cash' ? '消费点数' : ($value['PAY_TYPE'] == 'exchange' ? '兑换点数' : '复消点数');
         }
         return static::notice($data);
     }