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

Commit 46bf3567 authored by GaoHu's avatar GaoHu

特邀代理详情返回

parent 10b5dc21
...@@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
public class SmileUserVo implements Serializable, Cloneable{ public class SmileUserVo implements Serializable, Cloneable {
private Long id; private Long id;
...@@ -19,7 +20,7 @@ public class SmileUserVo implements Serializable, Cloneable{ ...@@ -19,7 +20,7 @@ public class SmileUserVo implements Serializable, Cloneable{
/** /**
* 照片 * 照片
*/ */
@ApiModelProperty("照片d") @ApiModelProperty("照片")
private String img; private String img;
/** /**
...@@ -183,10 +184,19 @@ public class SmileUserVo implements Serializable, Cloneable{ ...@@ -183,10 +184,19 @@ public class SmileUserVo implements Serializable, Cloneable{
*/ */
@ApiModelProperty("擅长3") @ApiModelProperty("擅长3")
private String specialty3; private String specialty3;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private LocalDateTime createdDate; private LocalDateTime createdDate;
@ApiModelProperty("票提")
private BigDecimal ticket;
@ApiModelProperty("代理演出名称")
private String title;
@ApiModelProperty("代理描述")
private String describe;
private static final SmileUserVo obj = new SmileUserVo(); private static final SmileUserVo obj = new SmileUserVo();
public static SmileUserVo getNew() { public static SmileUserVo getNew() {
...@@ -198,4 +208,47 @@ public class SmileUserVo implements Serializable, Cloneable{ ...@@ -198,4 +208,47 @@ public class SmileUserVo implements Serializable, Cloneable{
return new SmileUserVo(); return new SmileUserVo();
} }
public SmileUserVo copy(SmileUser smileUser) {
if (null == smileUser) return this;
this.setId(smileUser.getId());
this.setImg(smileUser.getImg());
this.setBirthday(smileUser.getBirthday());
this.setAgent(smileUser.getAgent());
this.setArea(smileUser.getArea());
this.setAreaId(smileUser.getAreaId());
this.setAddress(smileUser.getAddress());
this.setCity(smileUser.getCity());
this.setCityId(smileUser.getCityId());
this.setCreatedDate(smileUser.getCreatedDate());
this.setErrorReason(smileUser.getErrorReason());
this.setName(smileUser.getName());
this.setIdentity(smileUser.getIdentity());
this.setIntroduce(smileUser.getIntroduce());
this.setPhone(smileUser.getPhone());
this.setOrgId(smileUser.getOrgId());
this.setSchoolId(smileUser.getSchoolId());
this.setSchoolMajor(smileUser.getSchoolMajor());
this.setSchoolName(smileUser.getSchoolName());
this.setSex(smileUser.getSex());
this.setIdCard(smileUser.getIdCard());
this.setProvince(smileUser.getProvince());
this.setProvinceId(smileUser.getProvinceId());
this.setSpecialty1(smileUser.getSpecialty1());
this.setSpecialty2(smileUser.getSpecialty2());
this.setSpecialty3(smileUser.getSpecialty3());
this.setWechat(smileUser.getWechat());
this.setType(smileUser.getType());
this.setTag(smileUser.getTag());
return this;
}
public SmileUserVo copyInvited(SmileUser smileUser) {
if (null == smileUser) return this;
this.setId(smileUser.getId());
this.setUid(smileUser.getUid());
this.setPhone(smileUser.getPhone());
this.setDescribe(smileUser.getIntroduce());
this.setType(smileUser.getType());
return this;
}
} }
...@@ -4,7 +4,6 @@ package com.liquidnet.client.admin.zhengzai.smile.service; ...@@ -4,7 +4,6 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.*; import com.liquidnet.client.admin.zhengzai.smile.dto.*;
import com.liquidnet.service.smile.entity.SmileUser; import com.liquidnet.service.smile.entity.SmileUser;
import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao; import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
......
...@@ -37,22 +37,15 @@ import com.liquidnet.service.smile.mapper.SmilePriceMapper; ...@@ -37,22 +37,15 @@ import com.liquidnet.service.smile.mapper.SmilePriceMapper;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper; import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import com.liquidnet.service.smile.mapper.SmileUserMapper; import com.liquidnet.service.smile.mapper.SmileUserMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
...@@ -101,9 +94,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -101,9 +94,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
@Autowired @Autowired
KylinPerformanceStatusMapper kylinPerformanceStatusMapper; KylinPerformanceStatusMapper kylinPerformanceStatusMapper;
@Autowired
private KylinOrderTicketsMapper orderTicketsMapper;
@Override @Override
public TableDataInfo listShow(SmileShowParam smileShowParam) { public TableDataInfo listShow(SmileShowParam smileShowParam) {
PageHelper.startPage(smileShowParam.getPageNum(), smileShowParam.getPageSize()); PageHelper.startPage(smileShowParam.getPageNum(), smileShowParam.getPageSize());
......
...@@ -13,6 +13,8 @@ import com.liquidnet.commons.lang.util.BeanUtil; ...@@ -13,6 +13,8 @@ import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.goblin.dto.vo.SmileAgentVo; import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO; import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import com.liquidnet.service.smile.entity.SmileAgent; import com.liquidnet.service.smile.entity.SmileAgent;
import com.liquidnet.service.smile.entity.SmileOrganization; import com.liquidnet.service.smile.entity.SmileOrganization;
import com.liquidnet.service.smile.entity.SmileSchool; import com.liquidnet.service.smile.entity.SmileSchool;
...@@ -53,6 +55,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -53,6 +55,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
@Autowired @Autowired
SmileAgentMapper smileAgentMapper; SmileAgentMapper smileAgentMapper;
@Autowired
KylinPerformancesMapper kylinPerformancesMapper;
@Override @Override
public List<SmileUser> userList(SmileUserParam smileUserParam) { public List<SmileUser> userList(SmileUserParam smileUserParam) {
try { try {
...@@ -89,9 +94,23 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser ...@@ -89,9 +94,23 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
queryWrapper.eq(SmileUser::getDelTag, 0); queryWrapper.eq(SmileUser::getDelTag, 0);
queryWrapper.eq(SmileUser::getUid, uid); queryWrapper.eq(SmileUser::getUid, uid);
SmileUser smileUser = smileUserMapper.selectOne(queryWrapper); SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
SmileUserVo smileUserVo = new SmileUserVo(); //判断是否为特邀代理
BeanUtils.copyProperties(smileUser, smileUserVo); SmileUserVo smileUserVo = null;
log.debug("smileUser:{}", smileUser); if (smileUser.getType() == 5) {
smileUserVo = new SmileUserVo().copyInvited(smileUser);
LambdaQueryWrapper<SmileAgent> agentLambdaQueryWrapper = new LambdaQueryWrapper<>();
agentLambdaQueryWrapper.eq(SmileAgent::getTicketId,smileUserVo.getUid());
agentLambdaQueryWrapper.eq(SmileAgent::getDelTag,0);
SmileAgent smileAgent = smileAgentMapper.selectOne(agentLambdaQueryWrapper);
smileUserVo.setTicket(smileAgent.getTotalCarry().multiply(new BigDecimal("100")));
//获取演出名
KylinPerformances kylinPerformances = kylinPerformancesMapper.selectOne(Wrappers.lambdaQuery(KylinPerformances.getNew())
.eq(KylinPerformances::getPerformancesId, smileAgent.getPerformanceId())
.select(KylinPerformances::getTitle));
smileUserVo.setTitle(kylinPerformances.getTitle());
}else {
smileUserVo = new SmileUserVo().copy(smileUser);
}
return smileUserVo; return smileUserVo;
} }
......
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