集团详情

jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.dto;
 
+import com.jsowell.common.core.domain.BaseEntity;
 import lombok.*;
 
 @Getter
@@ -7,7 +8,9 @@ import lombok.*;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class MemberGroupDTO {
+public class MemberGroupDTO extends BaseEntity {
+    private int pageSize;
+    private int pageNum;
     private String phoneNumber;
 
     private String groupCode;

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java

@@ -1,6 +1,7 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.MemberGroup;
+import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.web.MemberDiscountVO;
 import com.jsowell.pile.vo.web.MemberGroupVO;
 import org.apache.ibatis.annotations.Param;
@@ -74,4 +75,6 @@ public interface MemberGroupMapper {
      * @return
      */
     MemberDiscountVO queryMemberDiscount(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("memberId") String memberId);
+
+    List<MemberVO> queryMemberList(@Param("groupCode") String groupCode);
 }

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

@@ -6,10 +6,14 @@ 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;
@@ -29,6 +33,9 @@ public class MemberGroupServiceImpl implements MemberGroupService {
     @Autowired
     private MemberGroupMapper memberGroupMapper;
 
+    @Autowired
+    private OrderBasicInfoService orderBasicInfoService;
+
     /**
      * 查询会员组
      *
@@ -141,6 +148,19 @@ public class MemberGroupServiceImpl implements MemberGroupService {
 
     @Override
     public int addMember(MemberGroupDTO dto) {
-        return 0;
+        return 1;
+    }
+
+    @Override
+    public List<MemberVO> queryMemberList(MemberGroupDTO dto) {
+        List<MemberVO> list = memberGroupMapper.queryMemberList(dto.getGroupCode());
+        return list;
+    }
+
+    @Override
+    public List<OrderListVO> queryOrderList(MemberGroupDTO dto) {
+        QueryOrderDTO queryOrderDTO = new QueryOrderDTO();
+        queryOrderDTO.setGroupCode(dto.getGroupCode());
+        return orderBasicInfoService.selectOrderBasicInfoList(queryOrderDTO);
     }
 }

jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml

@@ -139,4 +139,23 @@
           AND t1.station_id = #{stationId,jdbcType=VARCHAR}
           AND t2.member_id = #{memberId,jdbcType=VARCHAR}
     </select>
+
+    <select id="queryMemberList" resultType="com.jsowell.pile.vo.uniapp.MemberVO">
+        SELECT
+            t1.merchant_id as merchantId,
+            t1.member_id as memberId,
+            t1.STATUS as status,
+            t1.nick_name as nickName,
+            t1.mobile_number as mobileNumber,
+            t1.avatar_url as avatarUrl
+        FROM
+        member_basic_info t1
+        JOIN member_group_relation t2 ON t2.member_id = t1.member_id and t2.del_flag = '0'
+        where
+            t2.group_code = #{groupCode,jdbcType=VARCHAR}
+    </select>
+
+    <select id="queryOrderList" resultType="com.jsowell.pile.vo.web.OrderListVO">
+
+    </select>
 </mapper>

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

@@ -183,4 +183,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>

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

@@ -111,8 +111,6 @@
                         v-hasPermi="['member:memberGroup:edit']">修改</el-button>
                     <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                         v-hasPermi="['member:memberGroup:remove']">删除</el-button>
-                    <!-- <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddMember(scope.row)"
-                        v-hasPermi="['member:memberGroup:edit']">添加会员</el-button> -->
                 </template>
             </el-table-column>
         </el-table>
@@ -336,15 +334,6 @@ export default {
                 ...this.queryParams
             }, `memberGroup_${new Date().getTime()}.xlsx`)
         },
-        /** 添加会员按钮 */
-        handleAddMember(row) {
-            this.reset();
-            const id = row.id || this.ids
-            getMemberGroup(id).then(response => {
-                this.form = response.data;
-                this.openAddMember = true;
-            });
-        },
     }
 };
 </script>