记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d0594cae authored by GaoHu's avatar GaoHu
Browse files
Options

exit

parent 31086be7
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 285 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserCheckController.java deleted 100644 → 0
View file @ 31086be7
package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserCheckVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
import com.liquidnet.service.smile.entity.SmileUserCheck;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* <p>
* 前端控制器
* </p>
*
* @author liquidnet
* @since 2022-03-15
*/
@Api(value ="审核管理")
@RestController
@RequestMapping("/smile/user/check")
public class SmileUserCheckController {
@Autowired
ISmileUserCheckService smileUserCheckService;
@PostMapping("/list")
@ApiOperation("获取审核列表")
@ResponseBody
public AjaxResult list(UserCheckParam userCheckParam) {
PageInfo<SmileUserCheckDao> list = smileUserCheckService.listUserCheck(userCheckParam);
return AjaxResult.success(list);
}
@PostMapping("/create")
@ApiOperation("创建审核")
@ResponseBody
public AjaxResult create(@RequestBody SmileUserCheck smileUserCheck) {
if (smileUserCheckService.create(smileUserCheck)) {
return AjaxResult.success();
}
return AjaxResult.warn("重复创建");
}
@PostMapping("/updateById")
@ApiOperation("修改审核")
@ResponseBody
public AjaxResult updateById(@RequestBody SmileUserCheckVo smileUserCheckVo) {
return smileUserCheckService.updateUserCheckById(smileUserCheckVo);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java
View file @ d0594cae
......@@ -3,11 +3,10 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.*;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -18,7 +17,7 @@ import java.util.List;
/**
* <p>
* 前端控制器
* 前端控制器
* </p>
*
* @author liquidnet
......@@ -35,15 +34,15 @@ public class SmileUserController extends BaseController {
@PostMapping("/list")
@ApiOperation(value = "获取用户列表")
@ResponseBody
public AjaxResult userList(SmileUserParam smileUserParam){
public AjaxResult userList(SmileUserParam smileUserParam) {
PageInfo<SmileUserVo> smileUserVos = iSmileUserService.userList(smileUserParam);
return AjaxResult.success(smileUserVos);
}
@GetMapping("/getUserById")
@PostMapping("/getUserById")
@ApiOperation(value = "根据ID查询单个用户完整信息")
@ResponseBody
public AjaxResult getUserById(@RequestParam(name = "uid",required = true) String uid){
public AjaxResult getUserById(@RequestParam(name = "uid", required = true) String uid) {
SmileUser smileUser = iSmileUserService.getUserById(uid);
return AjaxResult.success(smileUser);
}
......@@ -51,25 +50,40 @@ public class SmileUserController extends BaseController {
@PostMapping("/create")
@ApiOperation(value = "保存用户")
@ResponseBody
public AjaxResult create(@RequestBody SmileUser smileUser){
if (iSmileUserService.create(smileUser)){
public AjaxResult create(@RequestBody SmileUser smileUser) {
if (iSmileUserService.create(smileUser)) {
return AjaxResult.success();
}
return AjaxResult.warn("用户已添加");
}
@GetMapping("/getUserListByOrgId")
@PostMapping("/getUserListByOrgId")
@ApiOperation(value = "根据组织ID查询相人员信息")
@ResponseBody
public AjaxResult getUserListByOrgId(@RequestParam(name = "orgId",required = true)Long orgId,@RequestParam(name = "agentId",required =true)Long agentId){
public AjaxResult getUserListByOrgId(@RequestParam(name = "orgId", required = true) Long orgId, @RequestParam(name = "agentId", required = true) Long agentId) {
List<SmileUserVoOrg> userListByOrgId = iSmileUserService.getUserListByOrgId(orgId, agentId);
return AjaxResult.success(userListByOrgId);
}
@PostMapping("/updateUserStateByUid")
@ApiOperation(value = "根据uid修改用户状态")
@ApiOperation(value = "根据uid修改用户状态 0：正常，1：黑名单")
@ResponseBody
public AjaxResult updateUserById(){
return null;
public AjaxResult updateUserStateById(@RequestParam(name = "uid", required = true) String uid, @RequestParam(name = "state", required = true) Integer state) {
return iSmileUserService.updateUserStateById(uid, state);
}
@PostMapping("/check/list")
@ApiOperation("获取审核列表")
@ResponseBody
public AjaxResult list(UserCheckParam userCheckParam) {
PageInfo<SmileUserCheckDao> list = iSmileUserService.listUserCheck(userCheckParam);
return AjaxResult.success(list);
}
@PostMapping("/check/updateById")
@ApiOperation("修改审核 通过审核 1：总代，2：普代")
@ResponseBody
public AjaxResult updateById(@RequestBody SmileUserCheckVo smileUserCheckVo) {
return iSmileUserService.updateUserCheckById(smileUserCheckVo);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserCheckParam.java
View file @ d0594cae
......@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
@Data
public class UserCheckParam {
@ApiModelProperty(value = "审核id", example = "")
@ApiModelProperty(value = "uid", example = "")
private Long id;
@ApiModelProperty(value = "姓名", example = "")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserCheckService.java deleted 100644 → 0
View file @ 31086be7
package com.liquidnet.client.admin.zhengzai.smile.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserCheckVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
import com.liquidnet.service.smile.entity.SmileUserCheck;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
/**
* <p>
* 服务类
* </p>
*
* @author liquidnet
* @since 2022-03-15
*/
public interface ISmileUserCheckService extends IService<SmileUserCheck> {
PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam);
boolean create(SmileUserCheck smileUserCheck);
AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheck);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java
View file @ d0594cae
......@@ -3,14 +3,14 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.zhengzai.smile.dto.*;
import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
import java.util.List;
public interface ISmileUserService extends IService<SmileUser> {
public interface ISmileUserService extends IService<SmileUser> {
PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam);
......@@ -20,4 +20,9 @@ public interface ISmileUserService extends IService<SmileUser> {
List<SmileUserVoOrg> getUserListByOrgId(Long orgId, Long agentId);
AjaxResult updateUserStateById(String uid, Integer state);
PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam);
AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheck);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserCheckServiceImpl.java deleted 100644 → 0
View file @ 31086be7
package com.liquidnet.client.admin.zhengzai.smile.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserCheckVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserCheckService;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.smile.entity.SmileOrganization;
import com.liquidnet.service.smile.entity.SmileUserCheck;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import com.liquidnet.service.smile.mapper.SmileUserCheckMapper;
import com.liquidnet.service.smile.mapper.SmileUserMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务实现类
* </p>
*
* @author liquidnet
* @since 2022-03-15
*/
@Service
public class SmileUserCheckServiceImpl extends ServiceImpl<SmileUserCheckMapper, SmileUserCheck> implements ISmileUserCheckService {
@Autowired
SmileUserCheckMapper smileUserCheckMapper;
@Autowired
SmileUserMapper smileUserMapper;
@Autowired
SmileSchoolMapper smileSchoolMapper;
@Autowired
SmileOrganizationMapper smileOrganizationMapper;
@Override
public PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam) {
PageInfo<SmileUserCheckDao> pageInfo;
try {
Map<String, Object> map = BeanUtil.convertBeanToMap(userCheckParam);
List<SmileUserCheckDao> smileUserCheckDaos = smileUserMapper.selectUserCheck(map);
pageInfo = new PageInfo<>(smileUserCheckDaos);
} catch (Exception e) {
e.printStackTrace();
return null;
}
return pageInfo;
}
@Override
public boolean create(SmileUserCheck smileUserCheck) {
if (smileUserCheck.getUid() != null) {
//uid=uid state！=1
LambdaQueryWrapper<SmileUserCheck> queryWrapper = Wrappers.lambdaQuery(SmileUserCheck.class);
queryWrapper.eq(SmileUserCheck::getUid, smileUserCheck.getUid());
queryWrapper.eq(SmileUserCheck::getState, 1);
if (smileUserCheckMapper.selectOne(queryWrapper) == null) {
smileUserCheck.setCreatedDate(LocalDateTime.now());
smileUserCheck.setUpdatedDate(LocalDateTime.now());
smileUserCheck.setState(1);
smileUserCheck.setDelTag(0);
return smileUserCheckMapper.insert(smileUserCheck) > 0;
}
}
return false;
}
@Override
public AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheckVo) {
//判断是否通过
if (smileUserCheckVo.getState().equals(3)) {
//申请被驳回
SmileUserCheck smileUserCheck = new SmileUserCheck();
BeanUtils.copyProperties(smileUserCheckVo, smileUserCheck);
smileUserCheck.setUpdatedDate(LocalDateTime.now());
smileUserCheckMapper.updateById(smileUserCheck);
} else {
//通过审核
//判断是否是总代
if (smileUserCheckVo.getType().equals(1)) {
//查询组织是否有总代 没有则设置 有则返回异常
LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
orgQueryWrapper.eq(SmileOrganization::getId, smileUserCheckVo.getOrgId());
orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);
SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
if (smileOrganization != null && smileOrganization.getAgentId() == null) {
//没有总代 修改代理
smileOrganization.setUpdatedDate(LocalDateTime.now());
smileOrganization.setAgentId(smileUserCheckVo.getUid());
smileOrganizationMapper.updateById(smileOrganization);
} else {
//有总代
return AjaxResult.warn("该分组已经存在总代身份");
}
}
//修改审核信息
smileUserCheckMapper.updateCheck(smileUserCheckVo.getId());
//修改user代理 id
smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType());
}
return AjaxResult.success();
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java
View file @ d0594cae
......@@ -4,15 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.smile.dto.*;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.smile.entity.SmileOrganization;
import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
import com.liquidnet.service.smile.mapper.SmileUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
......@@ -35,6 +38,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
@Autowired
SmileRedisUtils smileRedisUtils;
@Autowired
SmileOrganizationMapper smileOrganizationMapper;
@Override
public PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam) {
PageInfo<SmileUserVo> pageInfo;
......@@ -60,7 +66,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
//查询未删除,id=uid
LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
queryWrapper.eq(SmileUser::getDelTag, 0);
queryWrapper.eq(SmileUser::getUid,uid);
queryWrapper.eq(SmileUser::getUid, uid);
SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
log.info("smileUser:{}", smileUser);
return smileUser;
......@@ -74,16 +80,13 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
smileUser.setState(0);
log.debug("smileUser:{}", smileUser);
LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
queryWrapper.eq(SmileUser::getUid,smileUser.getUid());
queryWrapper.eq(SmileUser::getDelTag,0);
queryWrapper.eq(SmileUser::getUid, smileUser.getUid());
queryWrapper.eq(SmileUser::getDelTag, 0);
//查询是否有重复uid用户
if (smileUserMapper.selectOne(queryWrapper)==null){
if (smileUserMapper.selectOne(queryWrapper) == null) {
int id = smileUserMapper.insert(smileUser);
log.debug("return id:{}.", smileUser.getUid());
SmileUserVO smileUserVO = new SmileUserVO();
BeanUtils.copyProperties(smileUser, smileUserVO);
//存入redis中
smileRedisUtils.set(SmileRedisConst.SMILE_USER + smileUser.getUid(),smileUserVO);
redisSetUser(smileUser);
return true;
}
return false;
......@@ -102,4 +105,84 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
return smileUserVos;
}
@Override
public AjaxResult updateUserStateById(String uid, Integer state) {
//修改黑名单
smileUserMapper.updateUserStateById(uid, state);
updateRedisSetUser(uid,null,state,null,null,null);
return AjaxResult.success();
}
@Override
public PageInfo<SmileUserCheckDao> listUserCheck(UserCheckParam userCheckParam) {
PageInfo<SmileUserCheckDao> pageInfo;
try {
Map<String, Object> map = BeanUtil.convertBeanToMap(userCheckParam);
List<SmileUserCheckDao> smileUserCheckDaos = smileUserMapper.selectUserCheck(map);
pageInfo = new PageInfo<>(smileUserCheckDaos);
} catch (Exception e) {
e.printStackTrace();
return null;
}
return pageInfo;
}
@Override
public AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheckVo) {
//判断是否通过
if (smileUserCheckVo.getState().equals(3)) {
//申请被驳回
smileUserMapper.updateUserCheckByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getType(), smileUserCheckVo.getReason());
updateRedisSetUser(smileUserCheckVo.getUid(),null,null,null,smileUserCheckVo.getReason(),null);
} else {
//通过审核
//判断是否是总代
if (smileUserCheckVo.getType().equals(1)) {
//查询组织是否有总代 没有则设置 有则返回异常
LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
orgQueryWrapper.eq(SmileOrganization::getId, smileUserCheckVo.getOrgId());
orgQueryWrapper.eq(SmileOrganization::getDelTag, 0);
SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
if (smileOrganization != null && smileOrganization.getAgentId() == null) {
//没有总代 修改代理
smileOrganization.setUpdatedDate(LocalDateTime.now());
smileOrganization.setAgentId(smileUserCheckVo.getUid());
smileOrganizationMapper.updateById(smileOrganization);
} else {
//有总代
return AjaxResult.warn("该分组已经存在总代身份");
}
}
//更新redis
updateRedisSetUser(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(),null, smileUserCheckVo.getType(),smileUserCheckVo.getReason(),1);
//修改user代理 id 开启代理
smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType());
}
return AjaxResult.success();
}
//往redis中塞入用户
private void redisSetUser(SmileUser smileUser) {
SmileUserVO smileUserVO = new SmileUserVO();
BeanUtils.copyProperties(smileUser, smileUserVO);
//存入redis中
smileRedisUtils.set(SmileRedisConst.SMILE_USER + smileUser.getUid(), smileUserVO);
}
//更新redis中的用户数据
private void updateRedisSetUser(String uid,Long orgId,Integer state,Integer type,String reason,Integer agent) {
SmileUserVO smileUserVO = (SmileUserVO) smileRedisUtils.get(SmileRedisConst.SMILE_USER + uid);
//组织id
if (StringUtils.isNotNull(orgId)) smileUserVO.setOrgId(orgId);
//状态 0：正常，1：黑名单
if (StringUtils.isNotNull(state)) smileUserVO.setState(state);
//代理 代理类型（0：未审核，1：总代，2：普代，3：未认证）
if (StringUtils.isNotNull(type)) smileUserVO.setType(type);
//审核失败原因
if (StringUtils.isNotNull(reason)) smileUserVO.setErrorReason(reason);
//代理开启标识 type==1 type==2
if (StringUtils.isNotNull(agent)) smileUserVO.setAgent(agent);
//存入redis中
smileRedisUtils.set(SmileRedisConst.SMILE_USER + uid, smileUserVO);
}
}
\ No newline at end of file
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dao/SmileUserCheckDao.java
View file @ d0594cae
......@@ -4,6 +4,9 @@ import lombok.Data;
import java.time.LocalDate;
/**
* @author TT
*/
@Data
public class SmileUserCheckDao {
......@@ -21,6 +24,10 @@ public class SmileUserCheckDao {
private String phone;
private Integer identity;
private String schoolName;
private String provinceId;
private String province;
......@@ -35,6 +42,8 @@ public class SmileUserCheckDao {
private String address;
private Integer state;
private Integer type;
private String reason;
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserCheckMapper.java deleted 100644 → 0
View file @ 31086be7
package com.liquidnet.service.smile.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.smile.entity.SmileUserCheck;
import org.apache.ibatis.annotations.Param;
/**
* <p>
* Mapper 接口
* </p>
*
* @author liquidnet
* @since 2022-03-15
*/
public interface SmileUserCheckMapper extends BaseMapper<SmileUserCheck> {
void updateCheck(@Param("id")Long id);
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java
View file @ d0594cae
......@@ -33,4 +33,9 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
List<Map> getUserOrder(String userId);
void updateUserByUid(@Param("uid") String uid,@Param("orgId") Long orgId,@Param("type")Integer tag);
void updateUserStateById(@Param("uid") String uid,@Param("state") Integer state);
void updateUserCheckByUid(@Param("uid") String uid,@Param("type") Integer type,@Param("reason") String reason);
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserCheckMapper.xml deleted 100644 → 0
View file @ 31086be7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.smile.mapper.SmileUserCheckMapper">
<update id="updateCheck">
update smile_user_check set state = 2,updated_date = now() where id = #{id}
</update>
</mapper>
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml
View file @ d0594cae
......@@ -7,8 +7,11 @@
<result column="uid" property="uid"/>
<result column="img" property="img"/>
<result column="name" property="name"/>
<result column="birthday" property="birthday"/>
<result column="sex" property="sex"/>
<result column="birthday" property="birthday"/>
<result column="phone" property="phone"/>
<result column="identity" property="identity"/>
<result column="school_name" property="schoolName"/>
<result column="province_id" property="provinceId"/>
<result column="province" property="province"/>
<result column="city_id" property="cityId"/>
......@@ -16,7 +19,8 @@
<result column="area_id" property="areaId"/>
<result column="area" property="area"/>
<result column="address" property="address"/>
<result column="state" property="state"/>
<result column="type" property="type"/>
<result column="error_reason" property="reason"/>
</resultMap>
<select id="strip" resultType="Integer">
......@@ -50,33 +54,34 @@
<select id="selectUserCheck" parameterType="java.util.Map" resultMap="smileUserCheckDao">
SELECT
suc.id,
su.uid,
su.img,
su.`NAME`,
su.birthday,
su.sex,
su.phone,
su.identity,
su.school_name,
su.province_id,
su.province,
su.city_id,
su.city,
su.area_id,
su.area,
su.address,
suc.`state`
id,
uid,
img,
`NAME`,
birthday,
sex,
phone,
`identity`,
school_name,
province_id,
province,
city_id,
city,
area_id,
area,
address,
type,
reason
FROM
smile_user su,
smile_user_check suc
smile_user
<where>
su.uid = suc.uid
state = 0 AND del_tag = 0 AND
`type` != 1 AND `type` != 2
<if test="phone!=''">
AND phone like concat('%',#{phone},'%')
</if>
</where>
Order by id desc
Order by created_date desc
</select>
......@@ -98,4 +103,15 @@
type = #{type}
where uid = #{uid}
</update>
<update id="updateUserStateById">
update smile_user
set `state` = #{state},
where `uid` = #{uid}
</update>
<update id="updateUserCheckByUid">
update smile_user set `type` = #{type},error_reason = #{reason}
where uid = #{uid}
</update>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment