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

Commit 94a8bcc3 authored by sunyuntian's avatar sunyuntian

exit

parent a46805bd
...@@ -43,8 +43,8 @@ public class SmileUserVO implements Serializable { ...@@ -43,8 +43,8 @@ public class SmileUserVO implements Serializable {
/** /**
* 生日YYYY-MM-DD * 生日YYYY-MM-DD
*/ */
@ApiModelProperty(value = "生日(yyyy-MM-dd HH:mm:ss)") @ApiModelProperty(value = "生日(yyyy-MM-dd)")
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR) @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_SMALL_STR)
private LocalDate birthday; private LocalDate birthday;
/** /**
......
...@@ -30,8 +30,8 @@ public class SmileAgentController { ...@@ -30,8 +30,8 @@ public class SmileAgentController {
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("获取票提") @ApiOperation("获取票提")
@ResponseBody @ResponseBody
public AjaxResult organizationList(String performanceId, String ticketId){ public AjaxResult organizationList(@RequestBody SmileAgent smileAgent){
return AjaxResult.success(smileAgentService.listAgentByShowIdAndTicketId(performanceId,ticketId)); return AjaxResult.success(smileAgentService.getAgent(smileAgent));
} }
@PostMapping("/create") @PostMapping("/create")
......
...@@ -20,4 +20,5 @@ public interface ISmileAgentService extends IService<SmileAgent> { ...@@ -20,4 +20,5 @@ public interface ISmileAgentService extends IService<SmileAgent> {
boolean create(List<SmileAgent> smileAgents); boolean create(List<SmileAgent> smileAgents);
String getAgent(SmileAgent smileAgent);
} }
...@@ -37,8 +37,11 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg ...@@ -37,8 +37,11 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
@Override @Override
public SmileAgent listAgentByShowIdAndTicketId(String performanceId, String ticketId) { public SmileAgent listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
if (StringUtils.isNotEmpty(performanceId) && StringUtils.isNotEmpty(ticketId)) { if (StringUtils.isNotEmpty(performanceId) && StringUtils.isNotEmpty(ticketId)) {
SmileAgent smileAgent = smileAgentMapper.listAgentByShowIdAndTicketId(performanceId, ticketId); LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
return smileAgent; queryWrapper.eq(SmileAgent::getPerformanceId,performanceId);
queryWrapper.eq(SmileAgent::getTicketId,ticketId);
smileAgentMapper.selectOne(queryWrapper);
return null;
} }
return null; return null;
} }
...@@ -84,4 +87,9 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg ...@@ -84,4 +87,9 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
} }
return false; return false;
} }
@Override
public String getAgent(SmileAgent smileAgent) {
return null;
}
} }
...@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService; ...@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils; import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.goblin.constant.SmileRedisConst; import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.smile.entity.SmileUser; import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.mapper.SmileUserMapper; import com.liquidnet.service.smile.mapper.SmileUserMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -78,8 +79,10 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -78,8 +79,10 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
if (smileUserMapper.selectOne(queryWrapper)==null){ if (smileUserMapper.selectOne(queryWrapper)==null){
int id = smileUserMapper.insert(smileUser); int id = smileUserMapper.insert(smileUser);
log.debug("return id:{}.", smileUser.getUid()); log.debug("return id:{}.", smileUser.getUid());
SmileUserVO smileUserVO = new SmileUserVO();
BeanUtils.copyProperties(smileUser, smileUserVO);
//存入redis中 //存入redis中
smileRedisUtils.set(SmileRedisConst.SMILE_USER + smileUser.getUid(),smileUser); smileRedisUtils.set(SmileRedisConst.SMILE_USER + smileUser.getUid(),smileUserVO);
return true; return true;
} }
return false; return false;
...@@ -93,7 +96,6 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -93,7 +96,6 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
List<SmileUserVoOrg> smileUserVos = smileUserMapper.selectList(queryWrapper).stream().map(smileUser -> { List<SmileUserVoOrg> smileUserVos = smileUserMapper.selectList(queryWrapper).stream().map(smileUser -> {
SmileUserVoOrg smileUserVo = new SmileUserVoOrg(); SmileUserVoOrg smileUserVo = new SmileUserVoOrg();
BeanUtils.copyProperties(smileUser, smileUserVo); BeanUtils.copyProperties(smileUser, smileUserVo);
return smileUserVo; return smileUserVo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return smileUserVos; return smileUserVos;
......
...@@ -3,7 +3,6 @@ package com.liquidnet.service.smile.mapper; ...@@ -3,7 +3,6 @@ package com.liquidnet.service.smile.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.smile.entity.SmileAgent; import com.liquidnet.service.smile.entity.SmileAgent;
import org.apache.ibatis.annotations.Param;
/** /**
* <p> * <p>
...@@ -15,5 +14,4 @@ import org.apache.ibatis.annotations.Param; ...@@ -15,5 +14,4 @@ import org.apache.ibatis.annotations.Param;
*/ */
public interface SmileAgentMapper extends BaseMapper<SmileAgent> { public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
SmileAgent listAgentByShowIdAndTicketId(@Param("performanceId") String performanceId,@Param("ticketId") String ticketId);
} }
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