Merge branch 'master' of http://192.168.8.213:3000/miaxis/jkt

jkt-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.Random;
 
+import com.miaxis.vip.dto.QueryVipCodeListDTO;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,7 +36,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  */
 @RestController
 @RequestMapping("/vip/code")
-@Api(tags={"【app-激活码】"})
+@Api(tags={"【pc-激活码】"})
 public class VipCodeController extends BaseController{
     @Autowired
     private IVipCodeService vipCodeService;
@@ -50,9 +51,9 @@ public class VipCodeController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<VipCode> list(@ModelAttribute VipCode vipCode){
+    public ResponsePageInfo<VipCode> list(@ModelAttribute QueryVipCodeListDTO dto){
         startPage();
-        List<VipCode> list = vipCodeService.selectVipCodeList(vipCode);
+        List<VipCode> list = vipCodeService.selectVipCodeList(dto);
         return toResponsePageInfo(list);
     }
 
@@ -63,8 +64,8 @@ public class VipCodeController extends BaseController{
     @Log(title = "激活码", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出激活码列表Excel")
-    public Response<String> export(@ModelAttribute VipCode vipCode){
-        List<VipCode> list = vipCodeService.selectVipCodeList(vipCode);
+    public Response<String> export(@ModelAttribute QueryVipCodeListDTO queryVipCodeListDTO){
+        List<VipCode> list = vipCodeService.selectVipCodeList(queryVipCodeListDTO);
         ExcelUtil<VipCode> util = new ExcelUtil<VipCode>(VipCode.class);
         return util.exportExcel(list, "code");
     }

jkt-service/src/main/java/com/miaxis/vip/dto/QueryVipCodeListDTO.java

@@ -0,0 +1,53 @@
+package com.miaxis.vip.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 激活码对象 vip_code
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Data
+@TableName("vip_code")
+@ApiModel(value = "VipCode", description = "激活码对象 vip_code")
+public class QueryVipCodeListDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 激活码 */
+    @Excel(name = "激活码")
+    @TableField("vip_code")
+    @ApiModelProperty(value = "激活码")
+    private String vipCode;
+
+    /** 激活状态 0-未激活 1-已激活 2-已作废 */
+    @Excel(name = "激活状态 0-未激活 1-已激活 2-已作废")
+    @TableField("status")
+    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 2-已作废")
+    private Integer status;
+
+
+    @ApiModelProperty(value = "激活开始时间，格式yyyyMMdd")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private String startTime;
+
+
+    @ApiModelProperty(value = "激活结束时间，格式yyyyMMdd")
+//    @JsonFormat(pattern="yyyyMMdd",timezone = "GMT+8")
+    private String endTime;
+
+
+}

jkt-service/src/main/java/com/miaxis/vip/mapper/VipCodeMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.vip.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.vip.domain.VipCode;
+import com.miaxis.vip.dto.QueryVipCodeListDTO;
 
 /**
  * 激活码Mapper接口
@@ -17,6 +18,6 @@ public interface VipCodeMapper extends BaseMapper<VipCode> {
      * @param vipCode 激活码
      * @return 激活码集合
      */
-    public List<VipCode> selectVipCodeList(VipCode vipCode);
+    public List<VipCode> selectVipCodeList(QueryVipCodeListDTO vipCode);
 
 }

jkt-service/src/main/java/com/miaxis/vip/service/IVipCodeService.java

@@ -3,6 +3,7 @@ package com.miaxis.vip.service;
 import java.util.List;
 import com.miaxis.vip.domain.VipCode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.vip.dto.QueryVipCodeListDTO;
 
 /**
  * 激活码Service接口
@@ -17,5 +18,5 @@ public interface IVipCodeService extends IService<VipCode>{
      * @param vipCode 激活码
      * @return 激活码集合
      */
-    public List<VipCode> selectVipCodeList(VipCode vipCode);
+    public List<VipCode> selectVipCodeList(QueryVipCodeListDTO vipCode);
 }

jkt-service/src/main/java/com/miaxis/vip/service/impl/VipCodeServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.vip.dto.QueryVipCodeListDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +31,7 @@ public class VipCodeServiceImpl extends ServiceImpl<VipCodeMapper, VipCode> impl
      * @return 激活码
      */
     @Override
-    public List<VipCode> selectVipCodeList(VipCode vipCode){
+    public List<VipCode> selectVipCodeList(QueryVipCodeListDTO vipCode){
         return vipCodeMapper.selectVipCodeList(vipCode);
     }
 }

jkt-service/src/main/resources/mapper/vip/VipCodeMapper.xml

@@ -18,13 +18,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from vip_code
     </sql>
 
-    <select id="selectVipCodeList" parameterType="VipCode" resultMap="VipCodeResult">
+    <select id="selectVipCodeList" parameterType="QueryVipCodeListDTO" resultMap="VipCodeResult">
         <include refid="selectVipCodeVo"/>
         <where>
-            <if test="vipCode != null  and vipCode != ''"> and vip_code = #{vipCode}</if>
+            1=1
+            <if test="vipCode != null  and vipCode != ''"> and vip_code like concat('%', #{vipCode}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="activationTime != null "> and activation_time = #{activationTime}</if>
-            <if test="activationUserId != null "> and activation_user_id = #{activationUserId}</if>
+            <if test="startTime != null">
+                and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            </if>
+            order by create_time desc
         </where>
     </select>