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

Commit f266fad7 authored by GaoHu's avatar GaoHu

exit

parent f9b4d281
...@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile; ...@@ -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.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort; import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo; 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.dto.SmileShowParam;
...@@ -27,26 +28,30 @@ public class SmileShowController { ...@@ -27,26 +28,30 @@ public class SmileShowController {
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("演出列表") @ApiOperation("演出列表")
@ResponseBody @ResponseBody
public AjaxResult schoolList(SmileShowParam smileShowParam) { public TableDataInfo schoolList(SmileShowParam smileShowParam) {
List<ShowVo> list = smileShowService.listShow(smileShowParam); List<ShowVo> list = smileShowService.listShow(smileShowParam);
return AjaxResult.success(list); TableDataInfo rspData = new TableDataInfo();
// rspData.setCode(0);
// rspData.setRows(list.getList());
// rspData.setTotal(list.getTotal());
return rspData;
} }
@GetMapping("/getShowById") @GetMapping("/getShowById")
@ApiOperation("根据演出id查询演出详情") @ApiOperation("根据演出id查询演出详情")
public AjaxResult getShowById(String performancesId){ public AjaxResult getShowById(String performancesId) {
return smileShowService.getShowById(performancesId); return smileShowService.getShowById(performancesId);
} }
@PostMapping("/sort") @PostMapping("/sort")
@ApiOperation("演出排序") @ApiOperation("演出排序")
public AjaxResult sort(ShowSort showSort){ public AjaxResult sort(ShowSort showSort) {
return smileShowService.sort(showSort); return smileShowService.sort(showSort);
} }
@PostMapping("/make") @PostMapping("/make")
@ApiOperation("打款") @ApiOperation("打款")
public AjaxResult make(String performancesId){ public AjaxResult make(String performancesId) {
return smileShowService.make(performancesId); return smileShowService.make(performancesId);
} }
} }
...@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile; ...@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
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.client.admin.zhengzai.smile.service.ISmileUserService; import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
import com.liquidnet.service.smile.entity.SmileUser; import com.liquidnet.service.smile.entity.SmileUser;
...@@ -34,9 +35,13 @@ public class SmileUserController extends BaseController { ...@@ -34,9 +35,13 @@ public class SmileUserController extends BaseController {
@PostMapping("/list") @PostMapping("/list")
@ApiOperation(value = "获取用户列表") @ApiOperation(value = "获取用户列表")
@ResponseBody @ResponseBody
public AjaxResult userList(SmileUserParam smileUserParam) { public TableDataInfo userList(SmileUserParam smileUserParam) {
PageInfo<SmileUserVo> smileUserVos = iSmileUserService.userList(smileUserParam); PageInfo<SmileUserVo> smileUserVos = iSmileUserService.userList(smileUserParam);
return AjaxResult.success(smileUserVos); TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
rspData.setRows(smileUserVos.getList());
rspData.setTotal(smileUserVos.getTotal());
return rspData;
} }
@PostMapping("/getUserById") @PostMapping("/getUserById")
...@@ -75,9 +80,13 @@ public class SmileUserController extends BaseController { ...@@ -75,9 +80,13 @@ public class SmileUserController extends BaseController {
@PostMapping("/check/list") @PostMapping("/check/list")
@ApiOperation("获取审核列表") @ApiOperation("获取审核列表")
@ResponseBody @ResponseBody
public AjaxResult list(UserCheckParam userCheckParam) { public TableDataInfo list(UserCheckParam userCheckParam) {
PageInfo<SmileUserCheckDao> list = iSmileUserService.listUserCheck(userCheckParam); PageInfo<SmileUserCheckDao> list = iSmileUserService.listUserCheck(userCheckParam);
return AjaxResult.success(list); TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
rspData.setRows(list.getList());
rspData.setTotal(list.getTotal());
return rspData;
} }
@PostMapping("/check/updateById") @PostMapping("/check/updateById")
......
package com.liquidnet.client.admin.zhengzai.smile.dto;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author TT
*/
@Data
public class ShowAgentVo {
private Long id;
/**
* 演出id
*/
private String performanceId;
/**
* 票id
*/
private String ticketId;
/**
* 票种名称
*/
private String ticketName;
/**
* 总代票提
*/
private BigDecimal totalCarry;
/**
* 普代票提
*/
private BigDecimal ordCarry;
}
package com.liquidnet.client.admin.zhengzai.smile.dto;
import java.math.BigDecimal;
public class ShowTicketVo {
/**
* 票种名
*/
private String ticketName;
/**
* 单价
*/
private BigDecimal price;
/**
* 类型 票类型 1单日票 2通票
*/
private int type;
}
package com.liquidnet.client.admin.zhengzai.smile.dto;
import lombok.Data;
import java.util.List;
/**
* @author TT
*/
@Data
public class ShowVoById {
/**
* 演出id
*/
private String performancesId;
/**
* 演出图片
*/
private String imgPoster;
/**
* 演出名
*/
private String title;
/**
* 演出开始时间
*/
private String timeStart;
/**
* 演出结束时间
*/
private String timeEnd;
/**
* 城市id
*/
private Integer cityId;
/**
* 城市
*/
private String cityName;
/**
* 场地id
*/
private String fieldId;
/**
* 场地名称
*/
private String fieldName;
/**
* 票提设置
*/
private List<ShowAgentVo> showAgentVoList;
/**
* 代理票种
*/
/**
* 演出详情
*/
private String details;
}
...@@ -11,6 +11,8 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam; ...@@ -11,6 +11,8 @@ 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.service.ISmileShowService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils; import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.service.goblin.constant.SmileRedisConst; import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SellDataVO;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.KylinOrderTickets; import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.entity.KylinPerformances; import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper; import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
...@@ -23,6 +25,8 @@ import com.liquidnet.service.smile.mapper.SmileSchoolMapper; ...@@ -23,6 +25,8 @@ import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
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.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -82,14 +86,17 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -82,14 +86,17 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
//根据演出id 查询所有订单 //根据演出id 查询所有订单
List<KylinOrderTickets> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId()); List<KylinOrderTickets> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId());
Integer open = 0; int open = 0;
BigDecimal totalAmount = BigDecimal.valueOf(0); BigDecimal totalAmount = BigDecimal.valueOf(0);
for (KylinOrderTickets kylinOrderTickets : kylinOrderTicketsList) { for (KylinOrderTickets kylinOrderTickets : kylinOrderTicketsList) {
//演出张数 //演出张数
open += (kylinOrderTickets.getNumber() - kylinOrderTickets.getRefundNumber()); open = open + (kylinOrderTickets.getNumber() - kylinOrderTickets.getRefundNumber());
//总销售金额 //总销售金额
totalAmount = totalAmount.add(kylinOrderTickets.getPriceActual()).subtract(kylinOrderTickets.getPriceRefund()); totalAmount = totalAmount.add(kylinOrderTickets.getPriceActual()).subtract(kylinOrderTickets.getPriceRefund());
} }
vo.setOpen(open);
vo.setTotalAmount(totalAmount);
//根据演出id查询销售代理 //根据演出id查询销售代理
vo.setTotalOutAgent(kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformances.getPerformancesId())); vo.setTotalOutAgent(kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformances.getPerformancesId()));
//演出结束时间 //演出结束时间
...@@ -109,6 +116,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -109,6 +116,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
List<String> collect = kylinPerformancesMapper.selectByComment().stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList()); List<String> collect = kylinPerformancesMapper.selectByComment().stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
String perId = StringUtils.strip(collect.toString(), "[]"); String perId = StringUtils.strip(collect.toString(), "[]");
smileRedisUtils.set(SmileRedisConst.SMILE_SHOW, perId); smileRedisUtils.set(SmileRedisConst.SMILE_SHOW, perId);
log.info("redis show key:{}", perId);
return AjaxResult.success(); return AjaxResult.success();
} }
...@@ -124,6 +132,26 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -124,6 +132,26 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
@Override @Override
public AjaxResult getShowById(String performancesId) { public AjaxResult getShowById(String performancesId) {
if (StringUtils.isEmpty(performancesId)){
//根据演出ID查询演出数据演出数据
KylinPerformanceVo kylinPerformanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
//根据演出id查询代理用户
List<String> agentIds = kylinOrderTicketsMapper.getAgentIdListByPerId(performancesId);
for (String agentId : agentIds) {
SellDataVO sellDataVO = (SellDataVO) smileRedisUtils.get(SmileRedisConst.SELL_DATA.concat(agentId).concat(performancesId));
}
}
return null; return null;
} }
......
...@@ -52,4 +52,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> { ...@@ -52,4 +52,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
List<Map> getUserPerformance(@Param("agentId")String userId); List<Map> getUserPerformance(@Param("agentId")String userId);
List<KylinOrderTickets> selectListByPerformanceId(@Param("performancesId") String performancesId); List<KylinOrderTickets> selectListByPerformanceId(@Param("performancesId") String performancesId);
List<String> getAgentIdListByPerId(@Param("performancesId") String performancesId);
} }
...@@ -473,4 +473,13 @@ ...@@ -473,4 +473,13 @@
WHERE WHERE
kk.agent_id != 0 AND kk.performance_id = #{performancesId}; kk.agent_id != 0 AND kk.performance_id = #{performancesId};
</select> </select>
<select id="getAgentIdListByPerId" resultType="String">
SELECT agent_id
FROM kylin_order_ticket_relations
WHERE performance_id = #{performancesId}
AND agent_id != 0
GROUP BY
agent_id;
</select>
</mapper> </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