update

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java

@@ -108,12 +108,4 @@ public class MemberGroupController extends BaseController {
         return getDataTable(memberGroupService.queryMemberList(dto));
     }
 
-    /**
-     * 查询会员组的订单列表
-     */
-    @PostMapping("/queryOrderList")
-    public TableDataInfo queryOrderList(@RequestBody MemberGroupDTO dto) {
-        startPage();
-        return getDataTable(memberGroupService.queryOrderList(dto));
-    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java

@@ -5,7 +5,6 @@ import com.jsowell.pile.dto.MemberGroupDTO;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.web.MemberDiscountVO;
 import com.jsowell.pile.vo.web.MemberGroupVO;
-import com.jsowell.pile.vo.web.OrderListVO;
 
 import java.util.List;
 
@@ -78,5 +77,4 @@ public interface MemberGroupService
 
     List<MemberVO> queryMemberList(MemberGroupDTO dto);
 
-    List<OrderListVO> queryOrderList(MemberGroupDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java

@@ -6,14 +6,12 @@ import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.pile.domain.MemberGroup;
 import com.jsowell.pile.dto.MemberGroupDTO;
-import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.mapper.MemberGroupMapper;
 import com.jsowell.pile.service.MemberGroupService;
 import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.web.MemberDiscountVO;
 import com.jsowell.pile.vo.web.MemberGroupVO;
-import com.jsowell.pile.vo.web.OrderListVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -157,10 +155,4 @@ public class MemberGroupServiceImpl implements MemberGroupService {
         return list;
     }
 
-    @Override
-    public List<OrderListVO> queryOrderList(MemberGroupDTO dto) {
-        QueryOrderDTO queryOrderDTO = new QueryOrderDTO();
-        queryOrderDTO.setGroupCode(dto.getGroupCode());
-        return orderBasicInfoService.selectOrderBasicInfoList(queryOrderDTO);
-    }
 }

jsowell-ui/src/api/member/memberGroup.js

@@ -61,11 +61,3 @@ export function queryMemberList(data) {
     })
 }
 
-// 查询会员组中的订单列表
-export function queryOrderList(data) {
-    return request({
-        url: '/member/memberGroup/queryOrderList',
-        method: 'post',
-        data: data
-    })
-}

jsowell-ui/src/views/member/memberGroup/detail.vue

@@ -23,7 +23,7 @@
                             <el-button type="primary" size="mini" icon="el-icon-plus"
                                 @click="handleAddMember">添加会员</el-button>
                         </el-col>
-                        <el-table :data="memberGroupList" stripe style="width: 100%">
+                        <el-table :data="memberGroupList" stripe style="width: 100%" v-loading="loading">
                             <el-table-column label="会员id" align="center" prop="memberId" />
                             <el-table-column label="昵称" align="center" prop="nickName" />
                             <el-table-column label="状态" align="center" prop="status">
@@ -42,11 +42,11 @@
                         </el-table>
                         <!--分页-->
                         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                            :limit.sync="queryParams.pageSize" @pagination="getList" style="margin-bottom: 20px" />
+                            :limit.sync="queryParams.pageSize" @pagination="getMemberList" style="margin-bottom: 20px" />
                     </el-tab-pane>
                     <!-- 交易明细 -->
                     <el-tab-pane label="交易明细">
-                        <el-table :data="details" stripe style="width: 100%">
+                        <el-table :data="details" stripe style="width: 100%" v-loading="loading">
                             <el-table-column label="订单编号" align="center" prop="orderCode" width="280px">
                                 <template slot-scope="scope">
                                     <router-link :to="'/order/index/orderDetail/' + scope.row.orderCode" class="link-type">
@@ -85,7 +85,7 @@
                         </el-table>
                         <!--分页-->
                         <pagination v-show="getTotal > 0" :total="getTotal" :page.sync="from.pageNum"
-                            :limit.sync="from.pageSize" @pagination="getDetails" style="margin-bottom: 20px" />
+                            :limit.sync="from.pageSize" @pagination="getOrderList" style="margin-bottom: 20px" />
                     </el-tab-pane>
                 </el-tabs>
             </el-col>
@@ -103,11 +103,14 @@
 
 <script>
 import { queryOrderList, addMember, queryMemberList } from "@/api/member/memberGroup";
+import {listOrder} from "@/api/order/order";
 export default {
     name: 'JsowellUiDetail',
     dicts: ['member_status', 'start_mode', 'pay_mode', 'pay_status'],
     data() {
         return {
+            // 遮罩
+            loading: false,
             openAddMember: false,
             from: {
                 pageNum: 1,
@@ -140,8 +143,8 @@ export default {
 
     mounted() {
         console.log(this.$route.params.groupCode);
-        this.getList();
+        this.getMemberList();
-        this.getDetails();
+        this.getOrderList();
     },
 
     methods: {
@@ -162,27 +165,31 @@ export default {
                 this.$modal.msgSuccess("添加成功");
                 this.openAddMember = false;
                 this.queryParams.phoneNumber = '';
-                this.getList();
+                this.getMemberList();
             });
         },
         cancel() {
             this.openAddMember = false;
             this.queryParams.phoneNumber = '';
         },
-        getList() {
+        getMemberList() {
+            this.loading = true;
             console.log(this.queryParams);
             queryMemberList(this.queryParams).then(response => {
                 console.log(response);
                 this.memberGroupList = response.rows;
                 this.total = response.total;
+                this.loading = false;
             });
         },
-        getDetails() {
+        getOrderList() {
-            console.log(this.from);
+            this.loading = true;
-            queryOrderList(this.from).then(response => {
+            listOrder(this.from).then((response) => {
-                console.log(response);
                 this.details = response.rows;
+                console.log("this.from", this.from);
+                console.log("response", response);
                 this.getTotal = response.total;
+                this.loading = false;
             });
         }
     },