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

Skip to content

L
liquidnet-bus-v1
Commit 03e1ffc1 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/master' into jxl_2267_saleTime

parents 16c9d675 8653580a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 494 additions and 71 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExActivityVo.java
View file @ 03e1ffc1
......@@ -91,11 +91,17 @@ public class GoblinNftExActivityVo implements Serializable, Cloneable {
/**
*
* 是否展示生效中
*/
@ApiModelProperty(position = 18, required = true, value = "是否展示生效中 0：否 1：是")
private Integer isDisplay;
/**
* 是否展示延期按钮
*/
@ApiModelProperty(position = 19, required = true, value = "是否展示延期按钮 0不展示 1展示")
private Integer isDelay;
private final static GoblinNftExActivityVo obj = new GoblinNftExActivityVo();
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityDelayParam.java 0 → 100644
View file @ 03e1ffc1
package com.liquidnet.service.goblin.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value = "GoblinNftExActivityDelayParam", description = "该活动下兑换码延期入参")
@Data
public class GoblinNftExActivityDelayParam implements Serializable {
private static final long serialVersionUID = 5608646910502058970L;
@ApiModelProperty(position = 10, required = true, value = "老的活动id")
@NotBlank(message = "老的活动i不能为空")
private String activityId;
@ApiModelProperty(position = 11, required = true, value = "活动标题", example = "")
@NotBlank(message = "活动标题不能为空")
private String title;
@ApiModelProperty(position = 12, required = true, value = "用户id", example = "")
@NotBlank(message = "用户id不能为空")
private String uid;
@ApiModelProperty(position = 12, required = true, value = "开始时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
@NotNull(message = "开始时间不能为空")
private LocalDateTime startTime;
@ApiModelProperty(position = 13, required = true, value = "结束时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
@NotNull(message = "结束时间不能为空")
private LocalDateTime endTime;
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityParam.java
View file @ 03e1ffc1
......@@ -7,32 +7,31 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value ="GoblinNftExActivityParam",description = "添加方法入参")
@ApiModel(value = "GoblinNftExActivityParam", description = "添加方法入参")
@Data
public class GoblinNftExActivityParam implements Serializable {
@ApiModelProperty(position = 10,required = false,value = "nft活动id")
@ApiModelProperty(position = 10, required = false, value = "nft活动id")
private String activityId;
@ApiModelProperty(position = 11,required = true,value = "活动标题" ,example = "草莓音乐节")
@ApiModelProperty(position = 11, required = true, value = "活动标题", example = "")
private String title;
@ApiModelProperty(position = 12,required = true,value = "用户id",example = "用户id")
@ApiModelProperty(position = 12, required = true, value = "用户id", example = "")
private String uid;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
@ApiModelProperty(position = 12,required = false,value = "开始时间")
@ApiModelProperty(position = 12, required = false, value = "开始时间")
private LocalDateTime startTime;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
@ApiModelProperty(position = 13,required = false,value = "结束时间")
@ApiModelProperty(position = 13, required = false, value = "结束时间")
private LocalDateTime endTime;
@ApiModelProperty(position = 14,required = true,value = "当前页(查询时传入)")
@ApiModelProperty(position = 14, required = true, value = "当前页(查询时传入)", example = "1")
private Integer pageNum;
}
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExActivityService.java
View file @ 03e1ffc1
......@@ -5,6 +5,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.param.GoblinNftExActivityDelayParam;
import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
import javax.servlet.http.HttpServletResponse;
......@@ -43,4 +44,6 @@ public interface IGoblinNftExActivityService {
* @param goblinNftExActivityParam
*/
void excel(HttpServletResponse httpServletResponse, GoblinNftExActivityParam goblinNftExActivityParam);
ResponseDto delay(GoblinNftExActivityDelayParam goblinNftExActivityDelayParam);
}
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java
View file @ 03e1ffc1
......@@ -21,6 +21,8 @@ public class SmileRedisConst {
public static final String SELL_DATA_COMMISSION = PREFIX.concat("sellDataCommission:"); //销售数据 第一步
public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:"); //打款信息 SELL_SHOW_PAYMENT+演出id+uid
public static final String SELL_SHOW_PAYMENT_ENDJOB = PREFIX.concat("show:payment:endJob"); //定时任务结算信息 SELL_SHOW_PAYMENT_ENDJOB+演出id+uid
public static final String SELL_USER_REVENUE = PREFIX.concat("user:revenue:"); //用户总营收 SELL_USER_REVENUE+uid
public static final String SELL_TEST = PREFIX.concat("test"); //用户总营收 SELL_USER_REVENUE+uid
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java
View file @ 03e1ffc1
......@@ -27,6 +27,8 @@ public class SmileAgentController {
@Autowired
ISmileAgentService smileAgentService;
private Boolean tag = true;
@PostMapping("/list")
@ApiOperation("根据PerId获取票提")
@ResponseBody
......@@ -41,5 +43,17 @@ public class SmileAgentController {
return smileAgentService.create(smileAgents);
}
@PostMapping("/delPerId")
@ApiOperation("删除（旧版）演出id集合")
@ResponseBody
public AjaxResult delPerId(){
if (tag){
smileAgentService.delPerId();
tag = false;
return AjaxResult.success();
}
return AjaxResult.warn("已删除");
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java
View file @ 03e1ffc1
......@@ -58,4 +58,10 @@ public class SmileShowController {
return smileShowService.allPrice(smilePriceParam);
}
@GetMapping("/updateRedis")
@ApiOperation("修改原保存演出id的数据类型,分支dev_0507kids 部署完执行接口（演出列表重复问题修复也可以运行此接口）")
public AjaxResult updateRedis(){
return smileShowService.updateRedis();
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/detail.html
View file @ 03e1ffc1
......@@ -134,11 +134,11 @@
<span id="identity2">已毕业</span>
</div>
<div class="items">
<p>学校全称/单位名称:</p>
<p>在读学校全称/毕业院校名称:</p>
<input type="text" disabled id="schoolName" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div>
<div class="items">
<p>所学专业/所在部门:</p>
<p>所学专业:</p>
<input type="text" disabled id="schoolMajor" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
</div>
<!-- <div class="items">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html
View file @ 03e1ffc1
......@@ -9,7 +9,7 @@
<div class="detail_status">用户状态：<span></span></div>
<p class="detail_title">基础资料</p>
<p>照片</p>
<div class="detail_inner detail_img"><img src=""></div>
<div class="detail_inner detail_img"><img style="height: 120px;" src=""></div>
<p>真实姓名</p>
<div class="detail_inner detail_name"></div>
<p>出生日期</p>
......@@ -20,9 +20,9 @@
<div class="detail_inner detail_city"></div>
<p>你的身份</p>
<div class="detail_inner detail_id"></div>
<p>学校全称/单位名称</p>
<p>在读学校全称/毕业院校名称</p>
<div class="detail_inner detail_school"></div>
<p>所学专业/所在部门</p>
<p>所学专业</p>
<div class="detail_inner detail_acc"></div>
<!--<p>微信号</p>-->
<!--<div class="detail_inner detail_wx"></div>-->
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @ 03e1ffc1
......@@ -15,6 +15,7 @@ import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationReco
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*;
......@@ -598,7 +599,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
ticketStatus.setIsAgent(status);
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketId));
performanceVoUtils.performanceVoStatus(performancesId);
List<KylinPerformances> kylinPerformances = kylinPerformancesMapper.selectPerIdByAgent();
//存入票提默认 总代 普代都为0 默认0.000
SmileAgent smileAgent = new SmileAgent();
smileAgent.setPerformanceId(performancesId);
......@@ -617,13 +617,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
smileAgentMapper.update(smileAgent,queryWrapper);
//删除票提redis
smileRedisUtils.delAgent(performancesId,ticketId);
}
List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
String perId = StringUtils.join(collect,",");
if (!"".equals(perId)){
smileRedisUtils.setShowIds(perId);
//查询是否还有设置过开启的票种
agentCarryGtZeroByPerId(performancesId);
}
return true;
} catch (Exception e) {
......@@ -631,6 +626,34 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
}
}
//校验该演出是否有其他票提设置 用于删除redis中演出id List
private void agentCarryGtZeroByPerId(String performancesId) {
List<SmileAgent> agents = smileAgentMapper.selectAgentCarryGtZeroByPerId(performancesId);
if (agents.size()>0){
//是否设置过票提
boolean tag = true;
for (SmileAgent agent : agents) {
SmileAgentVo agent1 = smileRedisUtils.getAgent(agent.getPerformanceId(), agent.getTicketId());
if (agent1!=null){
tag = false;
break;
}
}
if (tag) {
//redis中删除演出id
log.debug("查询没有设置过perId:{},删除演出列表id", performancesId);
List<String> showIds = smileRedisUtils.getShowIds();
showIds.remove(performancesId);
smileRedisUtils.setShowIds(showIds);
}
}else {
//删除演出ids
List<String> showIds = smileRedisUtils.getShowIds();
showIds.remove(performancesId);
smileRedisUtils.setShowIds(showIds);
}
}
@Override
public boolean changeTicketPayTxt(String performancesId, String ticketId, String payTxt) {
dataUtils.setTicketPayTxt(ticketId, payTxt);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowTicketVo.java
View file @ 03e1ffc1
......@@ -21,7 +21,7 @@ public class ShowTicketVo {
/**
* 类型 票类型 1.单日票 2.通票
*/
private int type;
private String type;
/**
* 适用开始时间
......@@ -48,4 +48,5 @@ public class ShowTicketVo {
*/
private BigDecimal totalPrice;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileAgentService.java
View file @ 03e1ffc1
......@@ -30,4 +30,6 @@ public interface ISmileAgentService extends IService<SmileAgent> {
* @return ：AjaxResult
*/
AjaxResult getAgent(String performancesId);
void delPerId();
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileShowService.java
View file @ 03e1ffc1
......@@ -61,4 +61,11 @@ public interface ISmileShowService extends IService<SmileSchool> {
* @return ： AjaxResult
*/
AjaxResult allPrice(SmilePriceParam smilePriceParam);
/**
* 修改原保存演出id的数据类型
* @return
*/
AjaxResult updateRedis();
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileAgentServiceImpl.java
View file @ 03e1ffc1
......@@ -11,10 +11,12 @@ import com.liquidnet.service.smile.entity.SmileAgent;
import com.liquidnet.service.smile.entity.dao.SmileAgentDao;
import com.liquidnet.service.smile.mapper.SmileAgentMapper;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.annotation.Before;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
......@@ -46,25 +48,32 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
}
if (result) {
try {
for (SmileAgent smileAgent : smileAgents){
SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId());
if (agent!=null){
log.info("SmileAgent:{}",agent);
for (SmileAgent smileAgent : smileAgents) {
SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId());
if (agent != null) {
log.info("SmileAgent:{}", agent);
//修改过票提则无法再次修改
return AjaxResult.warn("票提一但设置，无法修改！");
}
}
smileAgents.forEach(smileAgent -> {
//是否是修改票提
smileAgentMapper.updateAgentById(smileAgent.getId(),smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN),smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100),2,RoundingMode.DOWN));
smileAgent.setTotalCarry(smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
smileAgent.setOrdCarry(smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
smileAgentMapper.updateAgentById(smileAgent.getId(), smileAgent.getTotalCarry(), smileAgent.getOrdCarry());
SmileAgentVo smileAgentVo = new SmileAgentVo();
BeanUtils.copyProperties(smileAgent, smileAgentVo);
smileRedisUtils.setAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId(), smileAgentVo);
smileRedisUtils.setAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId(), smileAgentVo);
log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
smileAgent.getId(),
smileAgent.getPerformanceId(),
smileAgent.getTicketId());
});
//设置票提的时候将该演出放到前端显示的演出列表中
List<String> showIds = smileRedisUtils.getShowIds();
showIds.add(smileAgents.get(0).getPerformanceId());
smileRedisUtils.setShowIds(showIds);
return AjaxResult.success();
} catch (Exception e) {
e.printStackTrace();
......@@ -83,4 +92,9 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
}
return AjaxResult.warn("演出未开启代理");
}
@Override
public void delPerId() {
smileRedisUtils.delShow();
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java
View file @ 03e1ffc1
......@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.smile.dto.*;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
......@@ -34,12 +35,8 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -135,17 +132,29 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
@Override
public AjaxResult sort(ShowSort showSort) {
//查询数据库是否又该顺序的演出
kylinPerformancesMapper.updateComment(showSort.getSort());
kylinPerformancesMapper.updateCommentByPer(showSort.getSort(), showSort.getPerformancesId());
log.info("redis show key:{}", showSort.getPerformancesId());
//判断该演出是否修改过票提
if (smileRedisUtils.getShowIds().stream().anyMatch(showId -> showSort.getPerformancesId().equals(showId))){
List<String> showIds = smileRedisUtils.getShowIds();
showIds.remove(showSort.getPerformancesId());
showIds.add(0,showSort.getPerformancesId());
smileRedisUtils.setShowIds(showIds);
return AjaxResult.success();
}else {
return AjaxResult.warn("清先为演出设置票提！");
}
//获取排序演出id
/*//获取排序演出id
List<String> collect = kylinPerformancesMapper.selectPerIdByAgent().stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
String perId = StringUtils.join(collect, ",");
//保存所有演出id带顺序
smileRedisUtils.setShowIds(perId);
log.info("redis show key:{}", perId);
return AjaxResult.success();
smileRedisUtils.setShowIds(perId);*/
}
@Override
......@@ -224,7 +233,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
showTicketVo.setTitle(ticketAndStatusDao.getTitle());
//单价
showTicketVo.setPrice(ticketAndStatusDao.getPrice());
showTicketVo.setType(ticketAndStatusDao.getType());
showTicketVo.setType(ticketAndStatusDao.getType()==1?"单日票":"通票");
showTicketVo.setUseEnd(ticketAndStatusDao.getUseEnd());
showTicketVo.setUseStart(ticketAndStatusDao.getUseStart());
showTicketVo.setTotalGeneral(ticketAndStatusDao.getTotalGeneral());
......@@ -335,6 +344,22 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
return AjaxResult.success();
}
@Override
public AjaxResult updateRedis() {
try {
String perIds = (String) smileRedisUtils.get(SmileRedisConst.SMILE_SHOW);
if(StringUtils.isNotBlank(perIds)){
List<String> list = new ArrayList<>(Arrays.asList(perIds.split(",")));
smileRedisUtils.setShowIds(list);
}
} catch (Exception e) {
log.error("updateRedis()");
}
ArrayList<String> showIds = (ArrayList<String>) smileRedisUtils.getShowIds().stream().distinct().collect(Collectors.toList());
smileRedisUtils.setShowIds(showIds);
return AjaxResult.success(showIds);
}
private UserData getUserData(String performancesId, SmileUser smileUser, Map<String, SmileAgent> map, List<TicketAndStatusDao> smileAgentList) {
UserData userData = new UserData();
//个人用户的演出数据详情
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java
View file @ 03e1ffc1
......@@ -10,14 +10,19 @@ import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@Component
@Slf4j
public class SmileRedisUtils {
@Autowired
......@@ -28,6 +33,10 @@ public class SmileRedisUtils {
return redisDataSourceUtil.getRedisSweetUtil();
}
public Object get(String key){
return redisDataSourceUtil.getRedisSweetUtil().get(key);
}
/**
* redis保存用户
*/
......@@ -80,10 +89,44 @@ public class SmileRedisUtils {
/**
* 保存演出ids
*/
public void setShowIds(String perId) {
public void setShowIds(List<String> perId) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
}
/**
* 获取演出ids
*/
public List<String> getShowIds(){
String rdk = SmileRedisConst.SMILE_SHOW;
Object obj = getRedis().get(rdk);
if (obj == null) {
return CollectionUtil.arrayListString();
} else {
return (List<String>) obj;
}
}
public void delShow(){
String rdk = SmileRedisConst.SMILE_SHOW;
Object obj = getRedis().get(rdk);
if (obj != null) {
try {
List<String> obj1 = (List<String>) obj;
} catch (Exception e) {
log.debug("不是新存ids，需要删除！");
getRedis().del(rdk);
ArrayList<String> arrayList = CollectionUtil.arrayListString();
//旧版转换
String perforManceIds = (String) obj;
if (StringUtils.isNotBlank(perforManceIds)) {
arrayList.addAll(Arrays.asList(perforManceIds.split(",")));
}
setShowIds(arrayList);
}
}
}
/**
* 保存个人打款
*/
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @ 03e1ffc1
......@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) {
String[] keys = {
"kylin:member:uid:809406",
"smile:show",
};
for (String key : keys) {
long value = key.hashCode();
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/GoblinNftExCodeNumDto.java 0 → 100644
View file @ 03e1ffc1
package com.liquidnet.service.goblin.dto;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class GoblinNftExCodeNumDto {
private String activityId;
private String storeId;
private String spuId;
private String skuId;
private String unbox;
private LocalDateTime exStartTime;
private LocalDateTime exStopTime;
private Integer num;
private String boxSkuId;
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftExActivity.java
View file @ 03e1ffc1
......@@ -37,6 +37,11 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
*/
private String title;
/**
* 延期后的新活动id
*/
private String newActivityId;
/**
* 创建时间
*/
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftExCodeTask.java
View file @ 03e1ffc1
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -60,6 +62,23 @@ public class GoblinNftExCodeTask implements Serializable {
}
}
public GoblinNftExCodeTask copy(GoblinNftExCodeNumDto vo) {
if (null == vo) return this;
this.setActivityId(vo.getActivityId());
this.setStoreId(vo.getStoreId());
this.setSpuId(vo.getSpuId());
this.setSkuId(vo.getSkuId());
this.setUnbox(vo.getUnbox());
this.setExStock(vo.getNum());
this.setExLimit(0);
this.setExStartTime(vo.getExStartTime());
this.setExStopTime(vo.getExStopTime());
this.setTyp(1);
return this;
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftExSkuMapper.java
View file @ 03e1ffc1
package com.liquidnet.service.goblin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto;
import com.liquidnet.service.goblin.entity.GoblinNftExSku;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
......@@ -32,4 +33,8 @@ public interface GoblinNftExSkuMapper extends BaseMapper<GoblinNftExSku> {
* @return
*/
List<GoblinNftExSku> selectGoblinNftExSkuByActivityIds(@Param("activityIds")String activityIds);
List<GoblinNftExCodeNumDto> selectExCodeNumAll(@Param("oldActivityId") String oldActivityId);
List<GoblinNftExCodeNumDto> selectExCodeNumBox(@Param("oldActivityId") String oldActivityId, @Param("skuId") String skuId);
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExActivityMapper.xml
View file @ 03e1ffc1
......@@ -6,6 +6,7 @@
<result column="activity_id" property="activityId" jdbcType="VARCHAR"/>
<result column="uid" property="uid" jdbcType="VARCHAR"/>
<result column="title" property="title" jdbcType="VARCHAR"/>
<result column="new_activity_id" property="newActivityId" jdbcType="VARCHAR"/>
<result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
<result column="updated_at" property="updatedAt" jdbcType="TIMESTAMP"/>
</resultMap>
......@@ -17,7 +18,7 @@
</select>
<select id="selectPageList" resultMap="BaseResult">
select activity_id,uid,title,created_at from goblin_nft_ex_activity
select activity_id,uid,title,created_at,new_activity_id from goblin_nft_ex_activity
<where>
<if test="uid != null and uid != ''">
and uid = #{uid,jdbcType=VARCHAR}
......@@ -37,7 +38,7 @@
</select>
<select id="selectByActivityId" resultMap="BaseResult">
select activity_id, title, created_at
select activity_id, title, new_activity_id,created_at
from goblin_nft_ex_activity
where activity_id = #{activityId,jdbcType=VARCHAR}
</select>
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExSkuMapper.xml
View file @ 03e1ffc1
......@@ -17,14 +17,39 @@
<select id="selectGoblinNftExSkuByActivityIds" resultMap="BaseResult">
select activity_id,sku_id,unbox,store_id,ex_start_time,ex_stop_time from goblin_nft_ex_sku where
activity_id in
<foreach collection="activityIds.split(',')" item="activityId" open="(" separator="," close=")" >
#{activityId,jdbcType=VARCHAR}
</foreach>
activity_id in
<foreach collection="activityIds.split(',')" item="activityId" open="(" separator="," close=")">
#{activityId,jdbcType=VARCHAR}
</foreach>
</select>
<select id="selectExCodeNumAll" resultType="com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto">
select gnes.activity_id, gnes.store_id, gnes.spu_id, gnes.sku_id, gnes.unbox, gnes.ex_start_time, gnes.ex_stop_time, count(*) as num, gnec.box_sku_id
from goblin_nft_ex_sku as gnes
left join goblin_nft_ex_code as gnec on gnes.activity_id = gnec.activity_id and gnes.sku_id =
gnec.sku_id
<where>
gnes.activity_id = #{oldActivityId}
and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
group by gnes.sku_id
</where>
</select>
<select id="selectExCodeNumBox" resultType="com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto">
select gnes.activity_id, gnes.store_id, gnes.spu_id, gnes.sku_id, gnes.unbox, gnes.ex_start_time, gnes.ex_stop_time, count(*) as num, gnec.box_sku_id
from goblin_nft_ex_sku as gnes
left join goblin_nft_ex_code as gnec on gnes.activity_id = gnec.activity_id and gnes.sku_id =
gnec.sku_id
<where>
gnes.activity_id = #{oldActivityId}
and gnes.sku_id = #{skuId}
and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
and gnes.unbox = '1'
group by gnec.box_sku_id
</where>
</select>
<insert id="addGoblinNftExSkus">
insert into goblin_nft_ex_sku (activity_id,spu_id,sku_id,store_id,unbox,ex_stock,ex_limit,ex_start_time,ex_stop_time,created_at)
insert into goblin_nft_ex_sku
(activity_id,spu_id,sku_id,store_id,unbox,ex_stock,ex_limit,ex_start_time,ex_stop_time,created_at)
values
<foreach collection="goblinNftExSkus" item="goblinNftExSku" separator=",">
(
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 03e1ffc1
......@@ -717,6 +717,7 @@ GROUP BY user_mobile;
left join kylin_ticket_relations as ktr on ktr.times_id = kttr.times_id
inner join kylin_ticket_status as kts on kts.ticket_id = ktr.ticket_id
where kts.is_agent = 1
AND kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
group by kp.performances_id
order by kp.comment desc, kp.time_start asc
</select>
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java
View file @ 03e1ffc1
......@@ -29,4 +29,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
Map getUserOrgByPerIdAndUidAndAgentMaster(@Param("performancesId") String performancesId,@Param("uid") String uid,@Param("ticketId") String ticketId);
List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
List<SmileAgent> selectAgentCarryGtZeroByPerId(@Param("performancesId")String performancesId);
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml
View file @ 03e1ffc1
......@@ -108,4 +108,13 @@
AND sa.del_tag = 0
</select>
<select id="selectAgentCarryGtZeroByPerId" resultType="com.liquidnet.service.smile.entity.SmileAgent">
SELECT id,
performance_id,
ticket_id
FROM smile_agent
WHERE performance_id = #{performancesId}
AND del_tag = 0
</select>
</mapper>
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml
View file @ 03e1ffc1
......@@ -161,7 +161,7 @@
address
FROM smile_user su
LEFT JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
LEFT JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid OR kotr.agent_id_master = su.uid
WHERE kotr.performance_id = #{performancesId}
group by uid
</select>
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql
View file @ 03e1ffc1
......@@ -38,6 +38,8 @@ CREATE TABLE `goblin_nft_ex_activity`
PRIMARY KEY (`mid`) USING BTREE,
INDEX `idx_nft_activity_id`(`activity_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'NFT兑换活动表' ROW_FORMAT = Dynamic;
ALTER TABLE `goblin_nft_ex_activity` ADD `new_activity_id` varchar(64) NOT NULL DEFAULT '' COMMENT '延期后的新活动id' after title;
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/activity/GoblinNftExActivityController.java
View file @ 03e1ffc1
package com.liquidnet.service.platform.controller.goblin.activity;
import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.param.GoblinNftExActivityDelayParam;
import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
import com.liquidnet.service.goblin.service.IGoblinNftExActivityService;
import io.swagger.annotations.Api;
......@@ -64,4 +63,11 @@ public class GoblinNftExActivityController {
iGoblinNftExActivityService.excel(httpServletResponse, goblinNftExActivityParam);
}
@ApiOperationSupport(order = 5)
@ApiOperation(value = "该活动下兑换码延期")
@PutMapping("delay")
public ResponseDto delay(@Valid @RequestBody GoblinNftExActivityDelayParam goblinNftExActivityDelayParam) {
return iGoblinNftExActivityService.delay(goblinNftExActivityDelayParam);
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java
View file @ 03e1ffc1
......@@ -78,6 +78,10 @@ public class SellDataInfoImpl {
for(Map a:list1){
String performanceId=a.get("yanchuId")==null?"":a.get("yanchuId").toString();
String yanChuName=a.get("title")==null?"":a.get("title").toString();
//判断是否 已经跑过一遍了
if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
continue;
}
//获取 该人 该演出 的所有订单
List<Map> list2=orderTicketsMapper.getUserSellOneDate(smileUser.getUid(),performanceId);
ArrayList<SellDataOneVO> listSellDataOneVo= ObjectUtil.getSellDataOneVOArrayList();
......@@ -129,8 +133,11 @@ public class SellDataInfoImpl {
//mongodb 里面放入
mongoTemplate.insert(smileSellDataVO, SmileSellDataVO.class.getSimpleName());*/
}
if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
}
}
}catch (Exception e){
log.info(String.valueOf(e));
log.info("用户的uid{}",smileUser.getUid());
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java
View file @ 03e1ffc1
package com.liquidnet.service.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.IdentityUtils;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.service.manage.SmileFrontService;
......@@ -16,7 +12,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.springframework.validation.annotation.Validated;
......@@ -99,6 +94,9 @@ public class SmileUserController {
if(smileUserVORedis.getAuthStatus()==1&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
return ResponseDto.success(true);
} else{
if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){
return ResponseDto.failure("用户信息不全，请填写后提交认证");
}
if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){
smileFrontService.deleteUser(userId);
}
......@@ -132,6 +130,7 @@ public class SmileUserController {
//说明已经验证过
return ResponseDto.failure("用户状态不对");
}
smileUserVO.setTag("1");
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"1");
return ResponseDto.success();
}
......@@ -155,6 +154,7 @@ public class SmileUserController {
//说明已经验证过
return ResponseDto.failure("用户状态不对");
}
smileUserVO.setTag("2");
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
}else {
return ResponseDto.failure("验证身份证失败！");
......@@ -181,6 +181,7 @@ public class SmileUserController {
//说明已经验证过
return ResponseDto.failure("用户状态不对");
}
smileUserVO.setTag("3");
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"3");
return ResponseDto.success();
}
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileFrontServiceImpl.java
View file @ 03e1ffc1
......@@ -93,14 +93,14 @@ public class SmileFrontServiceImpl implements SmileFrontService {
public List<KylinPerformanceVo> getPerformance() {
ArrayList<KylinPerformanceVo> list = ObjectUtil.kylinPerformanceVoList();
/* List<String> list1= (List<String>) redisUtil.get(SmileRedisConst.SMILE_SHOW);
for(String s:list1){
KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(s);
if(null!=kylinPerformanceVo){
List<String> smileShow = smileRedisUtils.getSmileShow();
for(String id:smileShow){
KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
if (null != kylinPerformanceVo && LocalDateTime.now().isBefore(LocalDateTime.parse(kylinPerformanceVo.getTimeEnd(), DTF_YMD_HMS))) {//演出结束不显示在列表
list.add(kylinPerformanceVo);
}
}*/
String perforManceIds = smileRedisUtils.getSmileShow();
}
/*String perforManceIds = smileRedisUtils.getSmileShow();
if (StringUtils.isNotBlank(perforManceIds)) {
for (String id : perforManceIds.split(",")) {
KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
......@@ -108,7 +108,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
list.add(kylinPerformanceVo);
}
}
}
}*/
return list;
}
......@@ -176,7 +176,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
redisVo.setSchoolId(smileUserVO.getSchoolId());
redisVo.setSchoolMajor(smileUserVO.getSchoolMajor());
redisVo.setIdentity(smileUserVO.getIdentity());
redisVo.setTag(smileUserVO.getTag());
redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
redisVo.setUpdatedDate(LocalDateTime.now());
redisVo.setUid(smileUserVO.getUid());
redisVo.setDelTag(0);
......@@ -190,6 +190,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
redisVo.setUpdatedDate(LocalDateTime.now());
redisVo.setUid(smileUserVO.getUid());
redisVo.setDelTag(0);
redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
//redisVo.setType(smileUserVO.getType());
} else if (type.equals("3")) {
redisVo.setIntroduce(smileUserVO.getIntroduce());
......@@ -199,6 +200,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
redisVo.setUpdatedDate(LocalDateTime.now());
redisVo.setUid(smileUserVO.getUid());
redisVo.setDelTag(0);
redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
//redisVo.setType(smileUserVO.getType());
}
}
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileRedisUtils.java
View file @ 03e1ffc1
......@@ -58,8 +58,16 @@ public class SmileRedisUtils {
}
/* ---------------------------------------- 演出列表数据 ---------------------------------------- */
public String getSmileShow() {
return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
public List<String> getSmileShow() {
String rdk = SmileRedisConst.SMILE_SHOW;
Object obj = redisUtil.get(rdk);
if (obj == null) {
return CollectionUtil.arrayListString();
} else {
return (List<String>) obj;
}
// return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
}
/* ---------------------------------------- 代理数据 ---------------------------------------- */
......
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