Merge branch 'feature/1598-theo-orderlist' into feature/dd-1839-1172

frontendApi/modules/v1/controllers/ShopController.php

@@ -153,7 +153,7 @@ class ShopController extends BaseController {
      */
     public function actionOrderList() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " AND IS_DELETE=0 AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
+        $condition = " AND IS_DELETE=0 AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
         $params[':USER_ID'] = \Yii::$app->user->id;
         $data = Order::lists($condition, $params, [
             'select' => 'O.*,U.REAL_NAME,OG.*',
@@ -165,6 +165,11 @@ class ShopController extends BaseController {
             ],
         ]);
         foreach ($data['list'] as $key => $value) {
+            if($value['ORDER_TYPE']=='ZC'){
+                $data['list'][$key]['ORDER_TYPE'] = '报单';
+            }else{
+                $data['list'][$key]['ORDER_TYPE'] = in_array($value['PAY_TYPE'], ['cash', 'paystack']) ? '复消': '积分';
+            }
             //$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']) : '';

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

@@ -1,32 +1,33 @@
 <template>
-    <div v-loading="loading">
-        <div class="white-box">
-            <el-table class="withdraw-table" :data="tableData" style="width: 100%;" :span-method="objectSpanMethod">
-              <el-table-column label="商品编号" prop="SKU_CODE"></el-table-column>
-              <el-table-column label="商品名称" prop="GOODS_TITLE"></el-table-column>
-                <el-table-column label="数量" prop="BUY_NUMS"></el-table-column>
-                <el-table-column label="会员价格">
-                    <template slot-scope="props">
-                        {{ props.row.REAL_PRICE * props.row.BUY_NUMS }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="会员PV">
-                    <template slot-scope="props">
-                        {{ props.row.REAL_PV * props.row.BUY_NUMS }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="订单编号" prop="SN"></el-table-column>
-                <el-table-column label="会员编号" prop="USER_NAME"></el-table-column>
-                <el-table-column label="会员姓名" prop="REAL_NAME"></el-table-column>
-                <el-table-column label="收货人" prop="CONSIGNEE"></el-table-column>
-                <el-table-column label="收货电话" prop="MOBILE"></el-table-column>
-                <el-table-column label="支付时间" prop="PAY_AT"></el-table-column>
-            </el-table>
-            <div class="white-box-footer">
-                <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
-            </div>
-        </div>
+  <div v-loading="loading">
+    <div class="white-box">
+      <el-table class="withdraw-table" :data="tableData" style="width: 100%;" :span-method="objectSpanMethod">
+        <el-table-column width="120" label="订单类型" prop="ORDER_TYPE"></el-table-column>
+        <el-table-column label="商品编号" prop="SKU_CODE"></el-table-column>
+        <el-table-column label="商品名称" prop="GOODS_TITLE"></el-table-column>
+        <el-table-column label="数量" prop="BUY_NUMS"></el-table-column>
+        <el-table-column label="会员价格">
+          <template slot-scope="props">
+            {{ props.row.REAL_PRICE * props.row.BUY_NUMS }}
+          </template>
+        </el-table-column>
+        <el-table-column label="会员PV">
+          <template slot-scope="props">
+            {{ props.row.REAL_PV * props.row.BUY_NUMS }}
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号" prop="SN"></el-table-column>
+        <el-table-column label="会员编号" prop="USER_NAME"></el-table-column>
+        <el-table-column label="会员姓名" prop="REAL_NAME"></el-table-column>
+        <el-table-column label="收货人" prop="CONSIGNEE"></el-table-column>
+        <el-table-column label="收货电话" prop="MOBILE"></el-table-column>
+        <el-table-column label="支付时间" prop="PAY_AT"></el-table-column>
+      </el-table>
+      <div class="white-box-footer">
+        <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>