兑换码

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

@@ -11,6 +11,7 @@ import com.qs.mp.admin.domain.param.CdKeyQueryParam;
 import com.qs.mp.admin.domain.vo.CdKeyExchangeVO;
 import com.qs.mp.admin.domain.vo.CdKeyGroupListVO;
 import com.qs.mp.admin.domain.vo.CdKeyGroupVO;
+import com.qs.mp.admin.domain.vo.CdKeyVO;
 import com.qs.mp.admin.service.*;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.service.IChannelService;
@@ -116,11 +117,11 @@ public class CdKeyMgrController extends BaseController {
             queryWrapper.eq("status", param.getStatus());
         }
 
-        if (Objects.nonNull(param.getTitle())) {
-            queryWrapper.eq("title", param.getTitle());
+        if (StringUtils.isNotEmpty(param.getTitle())) {
+            queryWrapper.like("title", param.getTitle());
         }
-        queryWrapper.orderByDesc("created_time");
-        queryWrapper.orderByDesc("FIELD(`status`,'waiting','noactive','activated','invalid')");
+        queryWrapper.orderByAsc("FIELD(`status`,'waiting','noactive','activated','invalid')");
+        queryWrapper.orderByAsc("created_time");
 
         startPage();
         List<CdKeyGroupVO> cdKeyGroupList = cdKeyGroupService.listCdKeyGroupListVO(queryWrapper);
@@ -132,14 +133,14 @@ public class CdKeyMgrController extends BaseController {
                         cdKeyGroupVO.setSiteName(siteName + "(" + channel.getMobile() + ")");
                         if (CdKeyGroupStatusEnum.ACTIVATED == cdKeyGroupVO.getStatus()) {
                             int validityPeriod = ValidityPeriodEnum.getByValue(cdKeyGroupVO.getValidityPeriod().getValue());
-                            if (validityPeriod == 3 && DateUtils.diffMonth(cdKeyGroupVO.getActivationTime(), new Date()) > 3) {
+                            if (validityPeriod == 3 && DateUtils.diffMonth(cdKeyGroupVO.getActivationTime(), new Date()) >= 3) {
                                 CdKeyGroup cdKeyGroup = new CdKeyGroup();
                                 cdKeyGroup.setGroupId(cdKeyGroupVO.getGroupId());
                                 cdKeyGroup.setStatus(CdKeyGroupStatusEnum.INVALID);
                                 inValid.add(cdKeyGroup);
                                 cdKeyGroupVO.setStatus(CdKeyGroupStatusEnum.INVALID);
                             }
-                            if (validityPeriod == 6 && DateUtils.diffMonth(cdKeyGroupVO.getActivationTime(), new Date()) > 6) {
+                            if (validityPeriod == 6 && DateUtils.diffMonth(cdKeyGroupVO.getActivationTime(), new Date()) >= 6) {
                                 CdKeyGroup cdKeyGroup = new CdKeyGroup();
                                 cdKeyGroup.setGroupId(cdKeyGroupVO.getGroupId());
                                 cdKeyGroup.setStatus(CdKeyGroupStatusEnum.INVALID);
@@ -239,22 +240,22 @@ public class CdKeyMgrController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:cdKey:export')")
     @PostMapping("/export")
     public AjaxResult export(@RequestBody CdKeyExportParam param) {
-        List<CdKey> cdKeyExportList = cdKeyService.list(new QueryWrapper<CdKey>().in("group_id", param.getGroupIdList()));
+        List<CdKeyVO> cdKeyExportList = cdKeyService.listExportVO(new QueryWrapper<CdKey>().in("t1.group_id", param.getGroupIdList()));
         List<CdKeyOrderExcel> excelList = new ArrayList<>();
-        cdKeyExportList.forEach(cdKey -> {
+        cdKeyExportList.forEach(CdKeyVO -> {
             CdKeyOrderExcel cdKeyOrderExcel = new CdKeyOrderExcel();
-            cdKeyOrderExcel.setCdKey(cdKey.getCdKey());
-            if (CdKeyGroupGoodsTypeEnum.COIN.equals(cdKey.getType())) {
-                cdKeyOrderExcel.setGoodsName(cdKey.getGoodsName() + " x" + cdKey.getValue());
+            cdKeyOrderExcel.setCdKey(CdKeyVO.getCdKey());
+            if (CdKeyGroupGoodsTypeEnum.COIN.equals(CdKeyVO.getType())) {
+                cdKeyOrderExcel.setGoodsName(CdKeyVO.getGoodsName() + " x" + CdKeyVO.getValue());
             } else {
-                cdKeyOrderExcel.setGoodsName(cdKey.getGoodsName());
+                cdKeyOrderExcel.setGoodsName(CdKeyVO.getGoodsName());
             }
-            String picUrl = "https://" + publicBucketName + ".cos." + region + ".myqcloud.com/" + cdKey.getPicUrl();
+            String picUrl = "https://" + publicBucketName + ".cos." + region + ".myqcloud.com/" + CdKeyVO.getPicUrl();
             cdKeyOrderExcel.setPicUrl(picUrl);
             excelList.add(cdKeyOrderExcel);
         });
 
         ExcelUtil<CdKeyOrderExcel> excelUtil = new ExcelUtil<>(CdKeyOrderExcel.class);
-        return excelUtil.exportExcel(excelList, cdKeyExportList.get(0) + "兑换码订单导出", false);
+        return excelUtil.exportExcel(excelList, cdKeyExportList.get(0).getTitle() + "兑换码订单导出", false);
     }
 }

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

@@ -430,9 +430,9 @@ public class UserMineController extends BaseApiController {
         CdKeyGroup cdKeyGroup = cdKeyGroupService.getById(cdKey.getGroupId());
         if (CdKeyGroupStatusEnum.ACTIVATED == cdKeyGroup.getStatus()) {
             int validityPeriod = ValidityPeriodEnum.getByValue(cdKeyGroup.getValidityPeriod().getValue());
-            if (validityPeriod == 3 && DateUtils.diffMonth(cdKeyGroup.getActivationTime(), new Date()) > 3) {
+            if (validityPeriod == 3 && DateUtils.diffMonth(cdKeyGroup.getActivationTime(), new Date()) >= 3) {
                 return AjaxResult.error("兑换码只有三个月有效期，现已失效");
-            } else if (validityPeriod == 6 && DateUtils.diffMonth(cdKeyGroup.getActivationTime(), new Date()) > 6) {
+            } else if (validityPeriod == 6 && DateUtils.diffMonth(cdKeyGroup.getActivationTime(), new Date()) >= 6) {
                 return AjaxResult.error("兑换码只有六个月有效期，现已失效");
             }
         } else {

mp-service/src/main/java/com/qs/mp/admin/domain/vo/CdKeyVO.java

@@ -0,0 +1,14 @@
+package com.qs.mp.admin.domain.vo;
+
+import com.qs.mp.admin.domain.CdKey;
+import lombok.Data;
+
+/**
+ * @author zhangkaikai
+ * @create 2023-05-22 11:27 AM
+ **/
+@Data
+public class CdKeyVO extends CdKey {
+
+    private String title;
+}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.mp.admin.domain.CdKeyGroup;
 import com.qs.mp.admin.domain.vo.CdKeyExchangeVO;
 import com.qs.mp.admin.domain.vo.CdKeyGroupListVO;
+import com.qs.mp.admin.domain.vo.CdKeyVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +22,6 @@ public interface CdKeyMapper extends BaseMapper<CdKey> {
     List<CdKeyGroupListVO> listCdKeyVO(@Param(Constants.WRAPPER) QueryWrapper<CdKeyGroup> queryWrapper);
 
     List<CdKeyExchangeVO> listCdKeyExchangeVO(@Param(Constants.WRAPPER) QueryWrapper<CdKey> queryWrapper);
+
+    List<CdKeyVO> listExportVO(@Param(Constants.WRAPPER) QueryWrapper<CdKey> queryWrapper);
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.mp.admin.domain.CdKeyGroup;
 import com.qs.mp.admin.domain.vo.CdKeyExchangeVO;
 import com.qs.mp.admin.domain.vo.CdKeyGroupListVO;
+import com.qs.mp.admin.domain.vo.CdKeyVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,4 +24,6 @@ public interface ICdKeyService extends IService<CdKey> {
     List<CdKeyExchangeVO> listCdKeyExchangeVO(@Param(Constants.WRAPPER) QueryWrapper<CdKey> queryWrapper);
 
     void exchangeCdKey(Long keyId);
+
+    List<CdKeyVO> listExportVO(QueryWrapper<CdKey> groupId);
 }

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

@@ -7,6 +7,7 @@ import com.qs.mp.admin.domain.CdKeyExchange;
 import com.qs.mp.admin.domain.CdKeyGroup;
 import com.qs.mp.admin.domain.vo.CdKeyExchangeVO;
 import com.qs.mp.admin.domain.vo.CdKeyGroupListVO;
+import com.qs.mp.admin.domain.vo.CdKeyVO;
 import com.qs.mp.admin.mapper.CdKeyMapper;
 import com.qs.mp.admin.service.ICdKeyExchangeService;
 import com.qs.mp.admin.service.ICdKeyService;
@@ -48,6 +49,12 @@ public class CdKeyServiceImpl extends ServiceImpl<CdKeyMapper, CdKey> implements
         return getBaseMapper().listCdKeyExchangeVO(queryWrapper);
     }
 
+
+    @Override
+    public List<CdKeyVO> listExportVO(QueryWrapper<CdKey> queryWrapper) {
+        return getBaseMapper().listExportVO(queryWrapper);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void exchangeCdKey(Long keyId) {
@@ -75,4 +82,5 @@ public class CdKeyServiceImpl extends ServiceImpl<CdKeyMapper, CdKey> implements
 
 
     }
+
 }

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

@@ -30,6 +30,11 @@
         from mp_cd_key t1 left join mp_cd_key_exchange t2 on t1.key_id = t2.key_id
             ${ew.customSqlSegment}
     </select>
+    <select id="listExportVO" resultType="com.qs.mp.admin.domain.vo.CdKeyVO">
+        select t1.*,t2.title
+        from mp_cd_key t1 left join mp_cd_key_group t2 on t1.group_id = t2.group_id
+            ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>