From 83b6e4e1d2f6c1f3b531953953b53ab2b78e7f7b Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sun, 22 Dec 2019 19:54:17 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-admin,=20litemall-admin-api]:=20?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E6=B4=BB=E5=8A=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/web/AdminGrouponController.java     |  4 +--
 .../src/views/promotion/grouponActivity.vue   | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
index f3fdd5da..9fb00669 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
@@ -48,12 +48,12 @@ public class AdminGrouponController {
     @RequiresPermissions("admin:groupon:read")
     @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "详情")
     @GetMapping("/listRecord")
-    public Object listRecord(String grouponId,
+    public Object listRecord(String grouponRuleId,
                              @RequestParam(defaultValue = "1") Integer page,
                              @RequestParam(defaultValue = "10") Integer limit,
                              @Sort @RequestParam(defaultValue = "add_time") String sort,
                              @Order @RequestParam(defaultValue = "desc") String order) {
-        List<LitemallGroupon> grouponList = grouponService.querySelective(grouponId, page, limit, sort, order);
+        List<LitemallGroupon> grouponList = grouponService.querySelective(grouponRuleId, page, limit, sort, order);
 
         List<Map<String, Object>> groupons = new ArrayList<>();
         for (LitemallGroupon groupon : grouponList) {
diff --git a/litemall-admin/src/views/promotion/grouponActivity.vue b/litemall-admin/src/views/promotion/grouponActivity.vue
index 64bc2076..70ef5e9d 100644
--- a/litemall-admin/src/views/promotion/grouponActivity.vue
+++ b/litemall-admin/src/views/promotion/grouponActivity.vue
@@ -3,14 +3,15 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
-      <el-input v-model="listQuery.goodsId" clearable class="filter-item" style="width: 200px;" placeholder="请输入商品编号"/>
+      <el-input v-model="listQuery.grouponRuleId" clearable class="filter-item" style="width: 200px;" placeholder="请输入团购规则ID" />
       <el-button v-permission="['GET /admin/groupon/listRecord']" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button
         :loading="downloadLoading"
         class="filter-item"
         type="primary"
         icon="el-icon-download"
-        @click="handleDownload">导出
+        @click="handleDownload"
+      >导出
       </el-button>
     </div>
 
@@ -20,21 +21,21 @@
       <el-table-column type="expand">
         <template slot-scope="scope">
           <el-table :data="scope.row.subGroupons" border style="width: 100%">
-            <el-table-column align="center" label="订单ID" prop="orderId"/>
-            <el-table-column align="center" label="用户ID" prop="userId"/>
+            <el-table-column align="center" label="订单ID" prop="orderId" />
+            <el-table-column align="center" label="用户ID" prop="userId" />
           </el-table>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="订单ID" prop="groupon.orderId"/>
+      <el-table-column align="center" label="订单ID" prop="groupon.orderId" />
 
-      <el-table-column align="center" label="用户ID" prop="groupon.userId"/>
+      <el-table-column align="center" label="用户ID" prop="groupon.userId" />
 
-      <el-table-column align="center" label="参与人数" prop="subGroupons.length"/>
+      <el-table-column align="center" label="参与人数" prop="subGroupons.length" />
 
-      <el-table-column align="center" label="团购折扣" prop="rules.discount"/>
+      <el-table-column align="center" label="团购折扣" prop="rules.discount" />
 
-      <el-table-column align="center" label="团购要求" prop="rules.discountMember"/>
+      <el-table-column align="center" label="团购要求" prop="rules.discountMember" />
 
       <el-table-column align="center" property="iconUrl" label="分享图片">
         <template slot-scope="scope">
@@ -42,15 +43,15 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="开始时间" prop="rules.addTime"/>
+      <el-table-column align="center" label="开始时间" prop="rules.addTime" />
 
-      <el-table-column align="center" label="结束时间" prop="rules.expireTime"/>
+      <el-table-column align="center" label="结束时间" prop="rules.expireTime" />
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
 
     <el-tooltip placement="top" content="返回顶部">
-      <back-to-top :visibility-height="100"/>
+      <back-to-top :visibility-height="100" />
     </el-tooltip>
 
   </div>
@@ -93,7 +94,7 @@ export default {
       listQuery: {
         page: 1,
         limit: 20,
-        goodsId: undefined,
+        grouponRuleId: undefined,
         sort: 'add_time',
         order: 'desc'
       },