兑换码

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CdKeyMgrController.java

@@ -114,19 +114,15 @@ public class CdKeyMgrController extends BaseController {
         queryWrapper.orderByDesc("created_time");
 
         startPage();
-        List<CdKeyGroup> cdKeyGroupList = cdKeyGroupService.list(queryWrapper);
-        List<CdKeyGroupListVO> cdKeyGroupListVOS = new ArrayList<>();
+        List<CdKeyGroupVO> cdKeyGroupList = cdKeyGroupService.listCdKeyGroupListVO(queryWrapper);
         if (CollectionUtils.isNotEmpty(cdKeyGroupList)) {
-            cdKeyGroupListVOS = cdKeyGroupList.stream().map(cdKeyGroup -> {
-                CdKeyGroupListVO cdKeyGroupListVO = new CdKeyGroupListVO();
-                BeanUtils.copyProperties(cdKeyGroup, cdKeyGroupListVO);
-                Channel channel = channelService.getById(cdKeyGroup.getChannelId());
-                String siteName = channel.getSiteName() == null ? "--   " : channel.getSiteName();
-                cdKeyGroupListVO.setSiteName(siteName + "(" + channel.getMobile() + ")");
-                return cdKeyGroupListVO;
-            }).collect(Collectors.toList());
+            cdKeyGroupList.forEach(cdKeyGroupVO -> {
+                        Channel channel = channelService.getById(cdKeyGroupVO.getChannelId());
+                        String siteName = channel.getSiteName() == null ? "--   " : channel.getSiteName();
+                        cdKeyGroupVO.setSiteName(siteName + "(" + channel.getMobile() + ")");
+            });
         }
-        return getDataTable(cdKeyGroupListVOS);
+        return getDataTable(cdKeyGroupList);
     }
 
     @ApiOperation("兑换码详情")

mp-service/src/main/java/com/qs/mp/admin/mapper/CdKeyGroupMapper.java

@@ -1,7 +1,13 @@
 package com.qs.mp.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.CdKeyGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.mp.admin.domain.vo.CdKeyGroupVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @auther quanshu
@@ -10,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CdKeyGroupMapper extends BaseMapper<CdKeyGroup> {
 
+    List<CdKeyGroupVO> listCdKeyGroupListVO(@Param(Constants.WRAPPER)QueryWrapper<CdKeyGroup> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/ICdKeyGroupService.java

@@ -1,8 +1,12 @@
 package com.qs.mp.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.CdKeyGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.mp.admin.domain.param.CdKeyCreateParam;
+import com.qs.mp.admin.domain.vo.CdKeyGroupVO;
+
+import java.util.List;
 
 /**
  * @auther quanshu
@@ -24,4 +28,6 @@ public interface ICdKeyGroupService extends IService<CdKeyGroup> {
      * @param groupId
      */
     void generateCdKey(String groupId);
+
+    List<CdKeyGroupVO> listCdKeyGroupListVO(QueryWrapper<CdKeyGroup> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/CdKeyGroupServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.qs.mp.admin.domain.*;
 import com.qs.mp.admin.domain.param.CdKeyCreateParam;
+import com.qs.mp.admin.domain.vo.CdKeyGroupVO;
 import com.qs.mp.admin.mapper.CdKeyGroupMapper;
 import com.qs.mp.admin.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -68,6 +69,11 @@ public class CdKeyGroupServiceImpl extends ServiceImpl<CdKeyGroupMapper, CdKeyGr
     private IChannelService channelService;
 
 
+    @Override
+    public List<CdKeyGroupVO> listCdKeyGroupListVO(QueryWrapper<CdKeyGroup> queryWrapper) {
+        return getBaseMapper().listCdKeyGroupListVO(queryWrapper);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String createCdKeyGroup(CdKeyCreateParam param) {

mp-service/src/main/resources/mapper/admin/CdKeyGroupMapper.xml

@@ -23,4 +23,9 @@
         group_id, channel_id, site_name, quantity, cashed_qty, remain_qty, status, validity_period, created_time, updated_time, activation_time, is_deleted
     </sql>
 
+    <select id="listCdKeyGroupListVO" resultType="com.qs.mp.admin.domain.vo.CdKeyGroupVO">
+        select * from mp_cd_key_group
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>