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

Skip to content

L
liquidnet-bus-v1
Commit 45179f62 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

快递恢复

parent 25381496
Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 253 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressAdminListParam.java deleted 100644 → 0
View file @ 25381496
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class PerformanceExpressAdminListParam {
@ApiModelProperty(value = "演出名称", example = "")
private String title;
@ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
private Integer status;
@ApiModelProperty(value = "城市名称", example = "")
private String cityName;
@ApiModelProperty(value = "-2全部,0审核中，2审核拒绝", example = "0")
private Integer auditStatus;
@ApiModelProperty(value = "停售时间（天）-2全部", example = "-2")
private long stopSellDay;
@ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00", hidden = true)
private String stopSellTime;
@ApiModelProperty(value = "页数", example = "0")
private Integer pageSize;
@ApiModelProperty(value = "数量", example = "20")
private Integer pageNum;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressSearchAdminParam.java 0 → 100644
View file @ 45179f62
package com.liquidnet.service.kylin.dto.param;
import lombok.Data;
@Data
public class PerformanceExpressSearchAdminParam {
// 演出搜索
private String title;
private String performancesId;
// 分页
private Integer pageSize;
private Integer pageNum;
// 订单搜索
private String orderCode;
private String orderTicketsId;
private String userMobile;
private String orderStatus;
private String expressStatus;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java
View file @ 45179f62
...@@ -87,12 +87,6 @@ public class KylinBannersAdminController extends BaseController { ...@@ -87,12 +87,6 @@ public class KylinBannersAdminController extends BaseController {
@Autowired @Autowired
private KylinBannersServiceImpl kylinBannersServiceImpl; private KylinBannersServiceImpl kylinBannersServiceImpl;
@RequiresPermissions("kylin:banners:view")
@GetMapping()
public String banners() {
return prefix + "/banners";
}
@GetMapping("/create") @GetMapping("/create")
public String create(ModelMap mmap) { public String create(ModelMap mmap) {
List<Object> bannersTargetType = BannersTargetType.getResultType(); List<Object> bannersTargetType = BannersTargetType.getResultType();
...@@ -184,6 +178,12 @@ public class KylinBannersAdminController extends BaseController { ...@@ -184,6 +178,12 @@ public class KylinBannersAdminController extends BaseController {
return prefix + "/details"; return prefix + "/details";
}*/ }*/
@RequiresPermissions("kylin:banners:view")
@GetMapping()
public String banners() {
return prefix + "/banners";
}
@RequiresPermissions("kylin:banners:list") @RequiresPermissions("kylin:banners:list")
@PostMapping("list") @PostMapping("list")
@ResponseBody @ResponseBody
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java
View file @ 45179f62
...@@ -3,12 +3,14 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin; ...@@ -3,12 +3,14 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
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.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl;
import com.liquidnet.service.kylin.dao.PerformanceExpressAdminListDao; import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
import com.liquidnet.service.kylin.dto.param.PerformanceExpressAdminListParam; import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
...@@ -38,20 +40,38 @@ public class PerformancesExpressController extends BaseController { ...@@ -38,20 +40,38 @@ public class PerformancesExpressController extends BaseController {
@Autowired @Autowired
private PerformancesExpressServiceImpl performancesExpressServiceImpl; private PerformancesExpressServiceImpl performancesExpressServiceImpl;
/**
* 查询演出列表
*/
@RequiresPermissions("kylin:performancesExpress:view") @RequiresPermissions("kylin:performancesExpress:view")
@GetMapping() @GetMapping()
public String banners() { public String performancesListView() {
return prefix + "/performancesExpress"; return prefix + "/performancesList";
}
@RequiresPermissions("kylin:performancesExpress:performancesList")
@PostMapping("/performancesList")
@ResponseBody
public TableDataInfo performancesList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<PerformanceExpressPerformanceListAdminDao> result = performancesExpressServiceImpl.getPerformancesList(performanceExpressSearchAdminParam);
return getDataTable(result);
} }
/** /**
* 查询演出列表 * 查询演出订单列表
*/ */
@RequiresPermissions("kylin:performances:list") @RequiresPermissions("kylin:performancesExpress:performanceOrderList")
@PostMapping("/list") @GetMapping("performanceOrderList/{id}")
public String performanceOrderListView(@PathVariable("id") String id, ModelMap mmap) {
mmap.put("performancesId", id);
return prefix + "/performanceOrderList";
}
@RequiresPermissions("kylin:performancesExpress:performanceOrderList")
@PostMapping("/performanceOrderList")
@ResponseBody @ResponseBody
public TableDataInfo list(PerformanceExpressAdminListParam performanceExpressAdminListParam) { public TableDataInfo performanceOrderList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<PerformanceExpressAdminListDao> result = performancesExpressServiceImpl.getList(performanceExpressAdminListParam); List<PerformanceExpressPerformanceOrderListAdminDao> result = performancesExpressServiceImpl.getPerformancesOrderList(performanceExpressSearchAdminParam);
return getDataTable(result); return getDataTable(result);
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
View file @ 45179f62
...@@ -5,7 +5,7 @@ liquidnet: ...@@ -5,7 +5,7 @@ liquidnet:
context: context:
name: liquidnet-client-admin-web name: liquidnet-client-admin-web
logfile: logfile:
path: /data/logs path: ./logs
name: client-admin-web name: client-admin-web
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
View file @ 45179f62
...@@ -5,7 +5,7 @@ liquidnet: ...@@ -5,7 +5,7 @@ liquidnet:
context: context:
name: liquidnet-client-admin-web name: liquidnet-client-admin-web
logfile: logfile:
path: /data/logs path: ./logs
name: client-admin-web name: client-admin-web
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
...@@ -15,46 +15,34 @@ liquidnet: ...@@ -15,46 +15,34 @@ liquidnet:
level-root: info level-root: info
mysql: mysql:
master: master:
urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306 urlHostAndPort: 39.106.122.201:3308
username: zhengzai username: testmall
password: $hAh4SGcDQ password: zhengzai!mYT
database-name: test_ln_scene database-name: test_ln_scene
slave: slave:
urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306 urlHostAndPort: 39.106.122.201:3308
username: zhengzai username: testmall
password: $hAh4SGcDQ password: zhengzai!mYT
database-name: test_ln_scene database-name: test_ln_scene
mongodb:
host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
port: 3717
user: root
pwd: $hAh4SGcDQ
sslEnabled: false
database: test_ln_scene
redis:
host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
# host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
port: 6380
password: PO@B!Iud32
url-refund: url-refund:
apply: "http://testpay.zhengzai.tv/refund/single" apply: "http://pay.zhengzai.tv/refund/single"
notify: "https://testkylin.zhengzai.tv/kylin/refund/callback" notify: "https://kylin.zhengzai.tv/kylin/refund/callback"
url-banner: url-banner:
provinces: "https://testservice.zhengzai.tv/provinces" #省份 provinces: "https://service.zhengzai.tv/provinces" #省份
url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播 url1: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播 url2: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地 url5: "https://mall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务 url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品 url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://testkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演 url8: "https://kylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城 url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://testmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合 url14: "https://mall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人 url20: "https://merchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://testmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲 url21: "https://merchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://testmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑 url22: "https://merchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://testmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单 url23: "https://mediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集 url24: "https://merchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://testpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员 url26: "https://passport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
al-oss: al-oss:
imgUrl: "https://img.zhengzai.tv/" imgUrl: "https://img.zhengzai.tv/"
endpoint: http://oss-cn-hangzhou.aliyuncs.com endpoint: http://oss-cn-hangzhou.aliyuncs.com
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
View file @ 45179f62
...@@ -5,7 +5,7 @@ liquidnet: ...@@ -5,7 +5,7 @@ liquidnet:
context: context:
name: liquidnet-client-admin-web name: liquidnet-client-admin-web
logfile: logfile:
path: /data/logs path: ./logs
name: client-admin-web name: client-admin-web
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js
View file @ 45179f62
...@@ -1011,7 +1011,7 @@ var table = { ...@@ -1011,7 +1011,7 @@ var table = {
if ($.common.isNotEmpty(id)) { if ($.common.isNotEmpty(id)) {
url = table.options.detailUrl.replace("{id}", id); url = table.options.detailUrl.replace("{id}", id);
} else { } else {
var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (id.length == 0) { if (id.length == 0) {
$.modal.alertWarning("请至少选择一条记录"); $.modal.alertWarning("请至少选择一条记录");
return; return;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html 0 → 100644
View file @ 45179f62
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('演出订单列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<input hidden type="text" name="performancesId" th:value="${id}">
<div class="select-list">
<ul>
<li>
<label>订单号：</label>
<input type="text" name="orderCode"/>
</li>
<li>
<label>订单号ID：</label>
<input type="text" name="orderTicketsId"/>
</li>
<li>
<label>购买人电话：</label>
<input type="text" name="userMobile"/>
</li>
<li>
<label>购买人姓名：</label>
<input type="text" name="userName"/>
</li>
<li>
<label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>快递状态：</label>
<select name="expressStatus" th:with="type=${@dict.getType('zhengzai_express_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var prefix = ctx + "kylin/performancesExpress";
var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]];
$(function () {
var options = {
url: prefix + "/performanceOrderList",
modalName: "演出订单",
columns: [{
checkbox: true
},
{
field: 'orderTicketsId',
title: '订单ID'
},
{
field: 'orderCode',
title: '订单号'
},
{
field: 'status',
title: '订单状态',
formatter: function (value, row, index) {
return $.table.selectDictLabel(orderStatusDic, value);
}
},
{
field: 'priceActual',
title: '总价格'
},
{
field: 'number',
title: '购票量'
},
{
field: 'userId',
title: '用户ID'
},
{
field: 'userMobile',
title: '账户名'
},
{
field: 'userMobile',
title: '手机号'
},
{
title: '操作',
align: 'center',
formatter: function (value, row, index) {
var actions = [];
// actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesExpress.html → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html
View file @ 45179f62
...@@ -15,39 +15,8 @@ ...@@ -15,39 +15,8 @@
<input type="text" name="title"/> <input type="text" name="title"/>
</li> </li>
<li> <li>
<label>城市名称：</label> <label>演出ID：</label>
<input type="text" name="cityName"/> <input type="text" name="performanceId"/>
</li>
<li>
<label>演出状态：</label>
<select name="status">
<option value="-2">全部</option>
<option value="1">审核中</option>
<option value="3">审核通过</option>
<option value="4">审核拒绝</option>
<option value="6">售卖</option>
<option value="7">已下架</option>
<option value="8">售罄</option>
<option value="9">未开始</option>
<option value="10">演出结束</option>
</select>
</li>
<li>
<label>审核状态：</label>
<select name="auditStatus">
<option value="-2">全部</option>
<option value="0">审核中</option>
<option value="2">审核拒绝</option>
</select>
</li>
<li>
<label>停售时间：</label>
<select name="stopSellDay">
<option value="-2">全部</option>
<option value="0">今天</option>
<option value="1">明天</option>
<option value="-1">昨天</option>
</select>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
...@@ -67,18 +36,13 @@ ...@@ -67,18 +36,13 @@
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:performancesExpress:detail')}]]; var performanceOrderListFlag = [[${@permission.hasPermi('kylin:performancesExpress:performanceOrderList')}]];
var expertFlag = [[${@permission.hasPermi('kylin:performancesExpress:expert')}]];
var prefix = ctx + "kylin/performancesExpress"; var prefix = ctx + "kylin/performancesExpress";
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/performancesList",
detailUrl: prefix + "/details/{id}", detailUrl: prefix + "/performanceOrderList/{id}",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "演出快递", modalName: "演出快递",
columns: [{ columns: [{
checkbox: true checkbox: true
...@@ -95,10 +59,6 @@ ...@@ -95,10 +59,6 @@
field: 'timeStart', field: 'timeStart',
title: '开演时间' title: '开演时间'
}, },
{
field: 'statusName',
title: '演出状态'
},
{ {
field: '22', field: '22',
title: '总数' title: '总数'
...@@ -120,8 +80,7 @@ ...@@ -120,8 +80,7 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>管理</a> '); actions.push('<a class="btn btn-success btn-xs ' + performanceOrderListFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java
View file @ 45179f62
package com.liquidnet.client.admin.zhengzai.kylin.service.impl; package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.kylin.dao.*; import com.liquidnet.service.kylin.dao.*;
import com.liquidnet.service.kylin.dto.param.*; import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
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.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -55,31 +30,32 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance ...@@ -55,31 +30,32 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinPerformance
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
@Autowired
private PerformanceVoUtils performanceVoUtils;
@Autowired @Autowired
private KylinPerformancesMapper performancesMapper; private KylinPerformancesMapper performancesMapper;
@Autowired
private KylinOrderTicketsMapper kylinOrderTicketsMapper;
public KylinPerformanceMisVo performanceDetails(String performancesId) { public List<PerformanceExpressPerformanceListAdminDao> getPerformancesList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
log.info(" PERFORMANCE mis演出详情"); List<PerformanceExpressPerformanceListAdminDao> voList = new ArrayList();
KylinPerformanceMisVo createMisVo = performanceVoUtils.getPerformanceMisVo(performancesId); try {
return createMisVo; Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressSearchAdminParam);
voList = performancesMapper.performanceExpressPerformanceList(map);
} catch (Exception e) {
e.printStackTrace();
return null;
}
return voList;
} }
public List<PerformanceExpressAdminListDao> getList(PerformanceExpressAdminListParam performanceExpressAdminListParam) { public List<PerformanceExpressPerformanceOrderListAdminDao> getPerformancesOrderList(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<PerformanceExpressAdminListDao> voList = new ArrayList(); List<PerformanceExpressPerformanceOrderListAdminDao> voList = new ArrayList();
try { try {
Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressAdminListParam); Map<String, Object> map = BeanUtil.convertBeanToMap(performanceExpressSearchAdminParam);
voList = performancesMapper.misPerformanceExpressList(map); voList = kylinOrderTicketsMapper.performanceExpressPerformanceOrderList(map);
for (PerformanceExpressAdminListDao item : voList) {
item.setStatus(item.getStatus());
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} }
return voList; return voList;
} }
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressAdminListDao.java deleted 100644 → 0
View file @ 25381496
package com.liquidnet.service.kylin.dao;
import lombok.Data;
@Data
public class PerformanceExpressAdminListDao {
//演出数据
private String performancesId;
private String title;
private String timeStart;
private String timeEnd;
private String sponsor;
private Integer status;
private String statusName;
private String auditTime;
private Integer auditStatus;
private Integer totalGeneral;
private Integer saleGeneral;
private Integer totalSalePrice;
private Integer surplusGeneral;
private Integer syncDamai;
private String rejectTxt;
private Integer sort;
private String createdAt;
public void setStatus(Integer status){
this.status=status;
switch (status){
case 1:
this.statusName="审核中";
break;
case 3:
this.statusName="审核通过";
break;
case 4:
this.statusName="审核拒绝";
break;
case 6:
this.statusName="售卖中";
break;
case 7:
this.statusName="已下架";
break;
case 8:
this.statusName="售罄";
break;
case 9:
this.statusName="未开始";
break;
case 10:
this.statusName="已结束";
break;
default:
this.statusName="其他";
break;
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceListAdminDao.java 0 → 100644
View file @ 45179f62
package com.liquidnet.service.kylin.dao;
import lombok.Data;
@Data
public class PerformanceExpressPerformanceListAdminDao {
//演出数据
private String performancesId;
private String title;
private String timeStart;
private String timeEnd;
private String createdAt;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java 0 → 100644
View file @ 45179f62
package com.liquidnet.service.kylin.dao;
import lombok.Data;
@Data
public class PerformanceExpressPerformanceOrderListAdminDao {
String orderTicketsId;
String sponsor;
String orderCode;
String title;
String status;
String getTicketType;
String payType;
String paymentType;
String tied;
String price;
String number;
String priceMember;
String priceTotal;
String priceVoucher;
String priceActual;
String priceExpress;
String priceRefund;
String refundNumber;
String userId;
String userName;
String userMobile;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java
View file @ 45179f62
...@@ -203,7 +203,7 @@ public class KylinOrderTickets implements Serializable { ...@@ -203,7 +203,7 @@ public class KylinOrderTickets implements Serializable {
orderTicketsId, userId, userName, userMobile, performanceTitle, orderCode, qrCode, orderType, orderVersion, orderTicketsId, userId, userName, userMobile, performanceTitle, orderCode, qrCode, orderType, orderVersion,
number, price, priceMember, priceTotal, priceVoucher, priceActual, priceExpress, priceRefund, refundNumber, number, price, priceMember, priceTotal, priceVoucher, priceActual, priceExpress, priceRefund, refundNumber,
payType, paymentType, timePay, expressContacts, expressAddress, expressPhone, couponType, getTicketType, payType, paymentType, timePay, expressContacts, expressAddress, expressPhone, couponType, getTicketType,
getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt, payCode getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt,payCode
}; };
} }
...@@ -212,9 +212,9 @@ public class KylinOrderTickets implements Serializable { ...@@ -212,9 +212,9 @@ public class KylinOrderTickets implements Serializable {
* *
* @return * @return
*/ */
public Object[] getPayAgainObject(LocalDateTime updateTime, LocalDateTime createTime) { public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
return new Object[]{ return new Object[]{
orderCode, updatedAt, orderTicketsId, updateTime, createTime updatedAt, orderCode, orderTicketsId,updateTime,createTime
}; };
} }
...@@ -223,9 +223,9 @@ public class KylinOrderTickets implements Serializable { ...@@ -223,9 +223,9 @@ public class KylinOrderTickets implements Serializable {
* *
* @return * @return
*/ */
public Object[] getSynOrderObject(LocalDateTime updateTime, LocalDateTime createTime) { public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
return new Object[]{ return new Object[]{
paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId, updateTime, createTime paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
}; };
} }
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java
View file @ 45179f62
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.dao.OrderPushDamaiDto; import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
import com.liquidnet.service.kylin.dao.OrderScriptDto; import com.liquidnet.service.kylin.dao.OrderScriptDto;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao; import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
import com.liquidnet.service.kylin.entity.KylinOrderTickets; import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -32,4 +33,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> { ...@@ -32,4 +33,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
List<OrderPushDamaiDto> pushDamaiDetailsList(String ticketsId); List<OrderPushDamaiDto> pushDamaiDetailsList(String ticketsId);
List<OrderScriptDto> orderScriptDto(String userId); List<OrderScriptDto> orderScriptDto(String userId);
List<PerformanceExpressPerformanceOrderListAdminDao> performanceExpressPerformanceOrderList(Map<String, Object> map);
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @ 45179f62
...@@ -46,5 +46,5 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> { ...@@ -46,5 +46,5 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType); List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType);
List<PerformanceExpressAdminListDao> misPerformanceExpressList(Map<String, Object> map); List<PerformanceExpressPerformanceListAdminDao> performanceExpressPerformanceList(Map<String, Object> map);
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 45179f62
...@@ -198,10 +198,48 @@ ...@@ -198,10 +198,48 @@
FROM kylin_order_tickets AS ot 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_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 LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE) WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -pay_countdown_minute MINUTE)
<if test="userId!=''"> <if test="userId!=''">
AND user_id = #{userId} AND user_id = #{userId}
</if> </if>
</select> </select>
<select id="performanceExpressPerformanceOrderList"
resultType="com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao">
SELECT
kot.order_tickets_id,
kot.order_code,
kot.price_express,
kot.number,
kot.user_id,
kot.user_name,
kot.user_mobile,
kot.express_contacts,
kot.express_address,
kot.express_phone,
kots.status
kots.express_type
FROM kylin_order_tickets kot
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
<where>
kotr.performance_id = #{performancesId}
AND kot.get_ticket_type = 'express'
AND kots.status IN (1, 3, 4, 6)
AND kots.pay_status = 1
<if test="orderCode != null and orderCode != ''">AND kot.order_code = #{orderCode}</if>
<if test="orderTicketsId != null and orderTicketsId != ''">AND kot.order_tickets_id = #{orderTicketsId}</if>
<if test="userMobile != null and userMobile != ''">AND kot.user_mobile = #{userMobile}</if>
<if test="userName != null and userName != ''">AND kot.user_name like concat('%', #{userName}, '%')</if>
<if test="orderCode != null and orderCode != ''">AND kot.order_code = #{orderCode}</if>
<if test="expressContacts != null and expressContacts != ''">AND kot.express_contacts = #{expressContacts}</if>
<if test="expressPhone != null and expressPhone != ''">AND kot.express_phone = #{expressPhone}</if>
<if test="orderStatus!=null and orderStatus!=''">AND kots.status = #{orderStatus}</if>
</where>
</select>
</mapper> </mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 45179f62
...@@ -447,15 +447,13 @@ ...@@ -447,15 +447,13 @@
</where> </where>
order by sponsor_id order by sponsor_id
</select> </select>
<select id="misPerformanceExpressList" <select id="performanceExpressPerformanceList"
resultType="com.liquidnet.service.kylin.dao.PerformanceExpressAdminListDao"> resultType="com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao">
SELECT SELECT
p.performances_id , p.performances_id ,
p.title , p.title ,
p.type,
p.time_start , p.time_start ,
p.time_end , p.time_end ,
ps.`status` ,
p.created_at p.created_at
FROM FROM
kylin_performances AS p kylin_performances AS p
...@@ -465,24 +463,10 @@ ...@@ -465,24 +463,10 @@
<if test="title!=''"> <if test="title!=''">
AND title LIKE concat('%', #{title}, '%') AND title LIKE concat('%', #{title}, '%')
</if> </if>
<if test="cityName!=''"> <if test="performanceId!=''">
AND city_name LIKE concat('%', #{cityName}, '%') AND performance_id = #{performanceId}
</if>
<if test="status!='-2'">
AND ps.STATUS = #{status}
</if>
<if test="status=='-2'">
AND (ps.STATUS >= 3 or ps.STATUS = 1)
</if>
<if test="auditStatus!='-2'">
AND ps.audit_status = #{auditStatus}
</if>
<if test="stopSellDay!=-2">
AND p.time_end BETWEEN #{stopSellTime} AND NOW()
</if> </if>
</where> </where>
<if test="orderItem!=''"> ORDER BY created_at DESC
ORDER BY created_at DESC
</if>
</select> </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