会员信息接口修改

jsjp-admin/src/main/java/com/miaxis/pc/PcUserVipController.java

@@ -4,6 +4,7 @@ import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.dto.UserVipSelectDto;
 import com.miaxis.userInfo.service.IUserVipService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,9 +35,9 @@ public class PcUserVipController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<UserVip> list(@ModelAttribute UserVip userVip){
+    public ResponsePageInfo<UserVip> list(@ModelAttribute UserVipSelectDto userVipSelectDto){
         startPage();
-        List<UserVip> list = userVipService.selectUserVipList(userVip);
+        List<UserVip> list = userVipService.selectUserVipList(userVipSelectDto);
         return toResponsePageInfo(list);
     }
     

jsjp-service/src/main/java/com/miaxis/userInfo/dto/UserVipSelectDto.java

@@ -0,0 +1,37 @@
+package com.miaxis.userInfo.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 会员信息对象 user_vip
+ *
+ * @author miaxis
+ * @date 2022-06-02
+ */
+@Data
+@ApiModel(value = "UserVipSelectDto", description = "会员信息查询对象")
+public class UserVipSelectDto extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "开始时间，格式yyyy-MM-dd HH:mm:ss")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间，格式yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/userInfo/mapper/UserVipMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.userInfo.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.dto.UserVipSelectDto;
 
 /**
  * 会员信息Mapper接口
@@ -14,10 +15,10 @@ public interface UserVipMapper extends BaseMapper<UserVip> {
     /**
      * 查询会员信息列表
      *
-     * @param userVip 会员信息
+     * @param userVipSelectDto 会员信息
      * @return 会员信息集合
      */
-    public List<UserVip> selectUserVipList(UserVip userVip);
+    List<UserVip> selectUserVipList(UserVipSelectDto userVipSelectDto);
 
     UserVip getUserVipByUserId(Long userId);
 

jsjp-service/src/main/java/com/miaxis/userInfo/service/IUserVipService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.miaxis.userInfo.domain.UserVip;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.userInfo.dto.UserVipDTO;
+import com.miaxis.userInfo.dto.UserVipSelectDto;
 
 /**
  * 会员信息Service接口
@@ -16,10 +17,10 @@ public interface IUserVipService extends IService<UserVip> {
     /**
      * 查询会员信息列表
      *
-     * @param userVip 会员信息
+     * @param userVipSelectDto 会员信息
      * @return 会员信息集合
      */
-    public List<UserVip> selectUserVipList(UserVip userVip);
+    public List<UserVip> selectUserVipList(UserVipSelectDto userVipSelectDto);
 
     public UserVip getUserVipByUserId(Long userId);
 

jsjp-service/src/main/java/com/miaxis/userInfo/service/impl/UserVipServiceImpl.java

@@ -3,6 +3,7 @@ package com.miaxis.userInfo.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.userInfo.domain.UserVip;
 import com.miaxis.userInfo.dto.UserVipDTO;
+import com.miaxis.userInfo.dto.UserVipSelectDto;
 import com.miaxis.userInfo.mapper.UserVipMapper;
 import com.miaxis.userInfo.service.IUserVipService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,12 +45,12 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipMapper, UserVip> impl
     /**
      * 查询会员信息列表
      *
-     * @param userVip 会员信息
+     * @param userVipSelectDto 会员信息
      * @return 会员信息
      */
     @Override
-    public List<UserVip> selectUserVipList(UserVip userVip){
-        return userVipMapper.selectUserVipList(userVip);
+    public List<UserVip> selectUserVipList(UserVipSelectDto userVipSelectDto){
+        return userVipMapper.selectUserVipList(userVipSelectDto);
     }
 
     @Override

jsjp-service/src/main/resources/mapper/userInfo/UserVipMapper.xml

@@ -20,15 +20,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from user_vip
     </sql>
 
-    <select id="selectUserVipList" parameterType="UserVip" resultMap="UserVipResult">
+    <select id="selectUserVipList" parameterType="com.miaxis.userInfo.dto.UserVipSelectDto" resultMap="UserVipResult">
         <include refid="selectUserVipVo"/>
         <where>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="subject1 != null "> and subject1 = #{subject1}</if>
-            <if test="subject2 != null "> and subject2 = #{subject2}</if>
-            <if test="subject3 != null "> and subject3 = #{subject3}</if>
-            <if test="subject4 != null "> and subject4 = #{subject4}</if>
+
+            <if test="startTime != null and startTime != ''">
+                and DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S')<![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != '' ">
+                and DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') <![CDATA[ <= ]]> #{endTime}
+            </if>
+
         </where>
         order by id desc
     </select>