fix

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1049,11 +1049,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         objectLambdaUpdateWrapper.eq(User::getUserId, bo.getUserId());
         objectLambdaUpdateWrapper.set(User::getVipTag, 1);
         objectLambdaUpdateWrapper.set(User::getVipCard, vipCard);
+        objectLambdaUpdateWrapper.set(User::getVipFrom, 6);
         objectLambdaUpdateWrapper.set(User::getVipOpenTime, DateUtils.getNowTime());
         objectLambdaUpdateWrapper.set(User::getUpdateTime, DateUtils.getNowTime());
         return this.update(null, objectLambdaUpdateWrapper);
     }
 
+    @Override
+    public List<UserVo> vipUserList(UserQueryBo bo) {
+        return null;
+    }
+
     private Long findSubjectId(String subject){
         if(subject!=null){
             String key = "SUB_"+subject;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -211,4 +212,29 @@ public class UserQueryBo extends BaseEntity {
 
 	@ApiModelProperty("学员搜索关键字")
 	private String userKerWord;
+
+	/** 会员标识 1已开通 0未开通 2已注销 */
+	@ApiModelProperty("会员标识 1已开通 0未开通 2已注销")
+	private Integer vipTag;
+	/** 会员卡号 */
+	@ApiModelProperty("会员卡号")
+	private String vipCard;
+	/** 积分 */
+	@ApiModelProperty("积分")
+	private BigDecimal pointsValue;
+	/** 积分商城累计充值金额 */
+	@ApiModelProperty("积分商城累计充值金额")
+	private BigDecimal rechargeMoney;
+	/** 积分商城累计退款金额 */
+	@ApiModelProperty("积分商城累计退款金额")
+	private BigDecimal refundMoney;
+	/** 会员卡开通时间 */
+	@ApiModelProperty("会员卡开通时间")
+	private Long vipOpenTime;
+	/** 会员卡注销时间 */
+	@ApiModelProperty("会员卡注销时间")
+	private Long vipCloseTime;
+	/** 会员来源 1云学堂PC 2云学堂h5 3云学堂小程序 4e管证 5教育智慧管理系统 6中正总平台*/
+	@ApiModelProperty("会员来源 1云学堂PC 2云学堂h5 3云学堂小程序 4e管证 5教育智慧管理系统 6中正总平台")
+	private Integer vipFrom;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -129,4 +129,6 @@ public interface IUserService extends IService<User> {
 
 	Boolean openVip(UserEditBo bo);
 
+	List<UserVo> vipUserList(UserQueryBo bo);
+
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -485,4 +485,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             user_id = #{userId}
     </select>
 
+    <select id="vipUserList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="UserResult">
+        SELECT
+            *
+        FROM
+            `user` u
+        WHERE
+            u.vip_tag !=0
+        <if test="idCard != null and idCard != ''" >
+            AND u.id_card like concat('%', #{idCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
+        </if>
+        <if test="telphone != null and telphone != ''" >
+            AND u.telphone like concat('%', #{telphone,typeHandler=com.zhongzheng.common.type.EncryptHandler}, '%')
+        </if>
+        <if test="vipTag != null and vipTag != ''" >
+            AND u.vip_tag = #{vipTag}
+        </if>
+    </select>
+
 </mapper>