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

Commit a9bb7fb6 authored by GaoHu's avatar GaoHu

add show

parent 1fec8ce6
......@@ -9,6 +9,8 @@ import java.time.format.DateTimeFormatter;
@Data
public class PerformanceAdminListParam {
@ApiModelProperty(value = "演出ID", example = "")
private String performancesId;
@ApiModelProperty(value = "演出名称", example = "")
private String title;
@ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
......
......@@ -20,4 +20,7 @@ public class SmileRedisConst {
public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:"); //打款信息 SELL_SHOW_PAYMENT+演出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
}
......@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
import io.swagger.annotations.Api;
......@@ -29,7 +30,7 @@ public class SmileShowController {
@ApiOperation("演出列表")
@ResponseBody
public AjaxResult schoolList(SmileShowParam smileShowParam) {
List<SmileShowParam> list = smileShowService.listShow(smileShowParam);
List<ShowVo> list = smileShowService.listShow(smileShowParam);
return AjaxResult.success(list);
}
......
......@@ -10,8 +10,10 @@ import com.liquidnet.client.admin.zhengzai.kylin.service.InnerService;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationRecordsAdminService;
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.constant.SmileRedisConst;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*;
......@@ -85,6 +87,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Autowired
InnerService innerService;
@Autowired
SmileRedisUtils smileRedisUtils;
@Override
public void test() {
// //同步演出
......@@ -584,6 +589,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
ticketStatus.setIsAgent(status);
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketId));
performanceVoUtils.performanceVoStatus(performancesId);
//开启/关闭代理存 redis
if (status.equals(1)) {
smileRedisUtils.lSet(SmileRedisConst.SMILE_SHOW.concat(":performancesId"),performancesId);
}else {
smileRedisUtils.lRemove(SmileRedisConst.SMILE_SHOW.concat(":performancesId"), 1, performancesId);
}
return true;
} catch (Exception e) {
return false;
......
package com.liquidnet.client.admin.zhengzai.smile.dto;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @author TT
*/
@Data
@Builder
public class ShowVo {
/**
* 演出id
*/
private String performancesId;
/**
* 演出名
*/
private String title;
/**
* 城市
*/
private String cityName;
/**
* 总销售数量 -张 saleGeneral
*/
private String open;
/**
* 总销售金额 totalSalePrice
*/
private BigDecimal totalAmount;
/**
* 总销售代理
*/
private String totalOutAgent;
/**
* 演出结束时间
*/
private LocalDateTime timeEnd;
}
......@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
import com.liquidnet.service.smile.entity.SmileSchool;
......@@ -17,5 +18,6 @@ import java.util.List;
*/
public interface ISmileShowService extends IService<SmileSchool> {
List<SmileShowParam> listShow(SmileShowParam smileShowParam);
List<ShowVo> listShow(SmileShowParam smileShowParam);
}
......@@ -2,14 +2,24 @@ package com.liquidnet.client.admin.zhengzai.smile.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.smile.dto.SchoolVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
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.PerformanceAdminListDao;
import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import com.liquidnet.service.kylin.mapper.KylinTicketStatusMapper;
import com.liquidnet.service.smile.entity.SmileSchool;
import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
......@@ -23,10 +33,27 @@ import java.util.List;
@Service
public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSchool> implements ISmileShowService {
@Autowired
KylinTicketStatusMapper ticketStatusMapper;
@Autowired
SmileRedisUtils smileRedisUtils;
@Autowired
private KylinPerformancesMapper performancesMapper;
@Override
public List<SmileShowParam> listShow(SmileShowParam smileShowParam) {
//获取开启代理的演出id
return null;
public List<ShowVo> listShow(SmileShowParam smileShowParam) {
//从redis 中查出开启代理的演出
List<Object> objects = smileRedisUtils.lGet(SmileRedisConst.SMILE_SHOW.concat(":performancesId"), 0, -1);
List<ShowVo> showVos = objects.stream().map(performancesId -> {
PerformanceAdminListDao performanceData = performancesMapper.misPerformanceById((String) performancesId);
return ShowVo.builder()
.performancesId(performanceData.getPerformancesId())
.title(performanceData.getTitle())
.build();
}).collect(Collectors.toList());
return showVos;
}
}
......@@ -4,6 +4,8 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class SmileRedisUtils {
......@@ -21,4 +23,32 @@ public class SmileRedisUtils {
public void del(String s) {
redisDataSourceUtil.getRedisSweetUtil().del(s);
}
public boolean hset(String key, String item, Object value){
return redisDataSourceUtil.getRedisAdamUtil().hset(key,item,value);
}
public boolean lSet(String key, Object value){
return redisDataSourceUtil.getRedisSweetUtil().lSet(key,value);
}
public boolean lSet(String key, List<Object> value){
return redisDataSourceUtil.getRedisSweetUtil().lSet(key,value);
}
public List<Object> lGet(String key, long start, long end) {
return redisDataSourceUtil.getRedisSweetUtil().lGet(key, start, end);
}
public long lGetListSize(String key) {
return redisDataSourceUtil.getRedisSweetUtil().lGetListSize(key);
}
public Object lGetIndex(String key, long index) {
return redisDataSourceUtil.getRedisSweetUtil().lGetIndex(key,index);
}
public long lRemove(String key, long count, Object value){
return redisDataSourceUtil.getRedisSweetUtil().lRemove(key, count, value);
}
}
......@@ -59,4 +59,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
PerformanceSimpleAllDao getPerformanceSimpleByPerformancesId(String performancesId);
PerformanceSimpleAllDao getPerformanceSimpleByTimesId(String timesId);
PerformanceSimpleAllDao getPerformanceSimpleByTicketId(String ticketId);
PerformanceAdminListDao misPerformanceById(@Param("performancesId") String performancesId);
}
......@@ -318,6 +318,74 @@
ORDER BY ${orderItem} ${orderSc}
</if>
</select>
<select id="misPerformanceById" resultType="misPerformanceListResult">
SELECT
p.performances_id ,
p.sponsor,
p.audit_time,
p.sort,
p.title ,
p.type,
p.time_start ,
p.time_end ,
ps.sync_damai ,
t.time_sell,
t.time_stop,
IFNULL(t.total_general , 0) AS 'total_general' ,
IFNULL(ot.sale_general , 0) AS 'sale_general' ,
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
IFNULL(
(
t.total_general - ot.sale_general
) ,
t.total_general
) AS 'surplus_general' ,
ps.`status` ,
ps.audit_status ,
ps.field_audit_status,
p.reject_txt ,
p.created_at
FROM
kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
LEFT JOIN kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
LEFT JOIN(
SELECT
ttr.performance_id ,
sum(ts.total_general) AS 'total_general' ,
MIN(
DATE_SUB(
t.time_start ,
INTERVAL pay_countdown_minute MINUTE
)
) AS 'time_sell' ,
MAX(t.time_end) AS 'time_stop'
FROM
kylin_ticket_status AS ts
LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
GROUP BY
ttr.performance_id
) AS t ON p.performances_id = t.performance_id
LEFT JOIN(
SELECT
(sum(ot.number)- sum(ot.refund_number)) AS 'sale_general' ,
(sum(ot.price_actual) - sum(ot.price_refund)) AS 'total_sale_price' ,
otr.performance_id AS 'performance_id'
FROM
kylin_order_tickets AS ot
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
WHERE
(ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) and coupon_type ='no' and
ots.transfer_status in (0,1,2,5)
GROUP BY otr.performance_id
) AS ot ON ot.performance_id = p.performances_id
where performances_id = #{performancesId}
</select>
<!-- Mis 根据巡演查询演出列表 -->
<select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
SELECT performances_id,
......
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