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

Skip to content

L
liquidnet-bus-v1
Commit 51b22c43 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

暂时提交

parent 489a309b
Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 46 deletions
docu/dev_import.sql 0 → 100644
View file @ 51b22c43
drop table if exists kylin_order_import;
create table kylin_order_import
(
mid bigint unsigned auto_increment primary key,
performance_id varchar(64) default '' comment '演出id',
title varchar(64) default '' comment '文件名称',
status int(3) default 0 comment '状态[0-处理中|1处理完成|2处理失败]',
created_at datetime ,
updated_at datetime ,
comment text
) engine = InnoDB comment '订单导入表';
\ No newline at end of file
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderImportService.java 0 → 100644
View file @ 51b22c43
package com.liquidnet.service.kylin.service;
/**
* <p>
* 票 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-06
*/
public interface IKylinOrderImportService {
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @ 51b22c43
......@@ -11,6 +11,7 @@ import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.entity.KylinOrderImport;
import com.liquidnet.service.kylin.entity.KylinPerformances;
import java.util.List;
......@@ -195,6 +196,13 @@ public interface IKylinPerformancesAdminService {
*/
PerformanceTransferConfigVo getTransferConfig(String performanceId);
/**
* 获取 演出转赠配置
* @param performanceId
* @return
*/
List<KylinOrderImport> getOrderImport(String performanceId);
/**
* 修改 演出转赠配置
* @return
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
View file @ 51b22c43
......@@ -20,6 +20,7 @@ import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
import com.liquidnet.service.kylin.entity.KylinOrderImport;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import com.liquidnet.service.kylin.service.other.DamaiService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -210,6 +211,13 @@ public class KylinPerformancesController extends BaseController {
return prefix + "/transferConfig";
}
@GetMapping(value = "/orderImport/{performancesId}")
public String getOrderImport(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
List<KylinOrderImport> result = kylinPerformancesService.getOrderImport(performancesId);
mmap.put("KylinOrderImport", result);
return prefix + "/orderImport";
}
//@RequiresPermissions("kylin:performances:view")
@PostMapping(value = "/transferConfig/change")
@ResponseBody
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 51b22c43
......@@ -16,14 +16,7 @@
</li>
<li id="li-tab-1"><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a>
</li>
<!-- <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">校园分销</a>-->
<!-- </li>-->
<!-- <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">社会分销</a>-->
<!-- </li>-->
<!-- <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">状态管理</a>-->
<!-- </li>-->
<li id="li-tab-6"><a data-toggle="tab" href="#tab-6" aria-expanded="false"
onclick="refundConfigInfo()">退款管理</a>
<li id="li-tab-6"><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
</li>
<li id="li-tab-7"><a data-toggle="tab" href="#tab-7" aria-expanded="false" onclick="transferInfo()">转赠配置</a>
</li>
......@@ -33,6 +26,8 @@
</li>
<li id="li-tab-5"><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
</li>
<li id="li-tab-8"><a data-toggle="tab" href="#tab-8" aria-expanded="false" onclick="importInfo()">订单导入</a>
</li>
</ul>
<div class="tab-content">
<div id="tab-1" class="tab-pane">
......@@ -254,6 +249,12 @@
height=800px frameborder=0></iframe>
</div>
</div>
<div id="tab-8" class="tab-pane">
<div class="panel-body">
<iframe id="order_import_iframe" name="order_import_iframe" marginwidth=0 marginheight=0 width=100%
height=800px frameborder=0></iframe>
</div>
</div>
</div>
......@@ -303,6 +304,11 @@
document.getElementById("li-tab-7").style.display = "none";
}
var orderImportFlag = [[${@permission.hasPermi('kylin:performances:orderImport')}]];
if (orderImportFlag == "hidden") {
document.getElementById("li-tab-8").style.display = "none";
}
if (auditStatus != 0) {
document.getElementsByName("auditBtn")[0].style.display = "none";
}
......@@ -376,6 +382,11 @@
document.getElementById("transfer_iframe").src = "../transferConfig/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
}
//订单导入
function importInfo() {
document.getElementById("order_import_iframe").src = "../orderImport/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
}
$("#tab-nav-1").bind("click", function () {
$("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
});
......@@ -383,30 +394,7 @@
var options = {
importUrl: ctx + "import/OrderOutLine/"+'[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""),//导入
importTemplateUrl: ctx + "import/template/OrderOutLine",//导出
column: [{
field: 'enterMobile',
title: '手机号',
}, {
field: 'enterName',
title: '姓名',
}, {
field: 'enterIdCode',
title: '身份证',
}, {
field: 'number',
title: '购票数量',
}, {
field: 'ticketTitle',
title: '票种名称',
}, {
field: 'useTime',
title: '票种适用时间',
}, {
field: 'ticketType',
title: '票种类型(电子、快递)',
}
]
importTemplateUrl: ctx + "import/template/OrderOutLine"//导出
}
$.table.init(options)
</script>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/orderImport.html 0 → 100644
View file @ 51b22c43
<!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">
<div class="select-list">
<ul>
<li>
<label>演出名称：</label>
<input type="text" name="title"/>
</li>
<li>
<label>城市名称：</label>
<input type="text" name="cityName"/>
</li>
<li>
<label>排序字段：</label>
<select name="orderItem">
<option value="created_at">创建时间</option>
<option value="">所有</option>
<option value="updated_at">修改时间</option>
</select>
</li>
<li>
<label>排序方式：</label>
<select name="orderSc">
<option value="desc">倒序</option>
<option value="">所有</option>
<option value="asc">正序</option>
</select>
</li>
<li style="visibility: hidden">
<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>
<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-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
// var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
// var expertFlag = [[${@permission.hasPermi('kylin:performances:expert')}]];
// var prefix = ctx + "kylin/performances";
//
// $(function () {
// var options = {
// url: prefix + "/list",
// modalName: "演出",
// orderSc:"desc",
// orderItem:"created_at",
// columns: [{
// checkbox: true
// },
// {
// field: 'title',
// title: '演出名称'
// },
// {
// field: 'performancesId',
// title: '演出id'
// },
// {
// field: 'timeStart',
// title: '开演时间'
// },
// {
// field: 'totalGeneral',
// title: '供票总量'
// },
// {
// field: 'saleGeneral',
// title: '实销'
// },
// {
// field: 'surplusGeneral',
// title: '余票'
// },
// {
// field: 'totalSalePrice',
// title: '总销售款'
// },
// {
// field: 'statusName',
// title: '演出状态'
// },
// {
// field: 'rejectTxt',
// title: '拒绝理由'
// },
// {
// field: 'sort',
// title: '排序',
// sortable: true
// },
// {
// title: '操作',
// align: 'center',
// formatter: function (value, row, index) {
// var actions = [];
// if (row.auditStatus == 0) {
// 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> ');
// }else{
// 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> ');
// }
// if (row.syncDamai == 1) {
// actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
// }
// return actions.join('');
// }
// }]
// };
// $.table.init(options);
// });
//
// function f(id) {
// $.post(prefix + "/sync/damai",{performancesId:id},function (res) {
// alert(res.msg)
// });
// }
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderOutLineVo.java
View file @ 51b22c43
......@@ -11,8 +11,8 @@ public class OrderOutLineVo {
private String enterName;
@Excel(name = "身份证",cellType = Excel.ColumnType.STRING)
private String enterIdCode;
@Excel(name = "购票数量",cellType = Excel.ColumnType.NUMERIC)
private Integer number;
// @Excel(name = "购票数量",cellType = Excel.ColumnType.NUMERIC)
// private Integer number;
@Excel(name = "票种名称",cellType = Excel.ColumnType.STRING)
private String ticketTitle;
@Excel(name = "票种适用开始时间",cellType = Excel.ColumnType.STRING,dateFormat = "yyyy-MM-dd HH:mm:ss")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/ImportServiceImpl.java
View file @ 51b22c43
......@@ -11,7 +11,6 @@ import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
......@@ -21,6 +20,10 @@ import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -34,7 +37,6 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@Service
public class ImportServiceImpl implements IImportService {
......@@ -50,6 +52,15 @@ public class ImportServiceImpl implements IImportService {
@Autowired
private MongoTemplate mongoTemplate;
@Autowired
private KylinOrderTicketsMapper orderTicketsMapper;
@Autowired
private KylinOrderTicketStatusMapper orderTicketStatusMapper;
@Autowired
private KylinOrderTicketRelationsMapper orderTicketRelationsMapper;
@Autowired
private KylinOrderTicketEntitiesMapper orderTicketEntitiesMapper;
/**
* 导入订单数据
*/
......@@ -68,7 +79,7 @@ public class ImportServiceImpl implements IImportService {
String enterMobile = orderOutLineVo.getEnterMobile();
String enterIdCode = orderOutLineVo.getEnterIdCode();
String enterName = orderOutLineVo.getEnterName();
Integer number = orderOutLineVo.getNumber();
Integer number = 1;
String address = orderOutLineVo.getAddress();
MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("mobile", enterMobile);
......@@ -325,6 +336,7 @@ public class ImportServiceImpl implements IImportService {
mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
}
orderTicketEntitiesMapper.insert(orderTicketEntities);
// 生成vo
KylinOrderTicketVo orderTicketVo = KylinOrderTicketVo.getNew();
......@@ -340,6 +352,10 @@ public class ImportServiceImpl implements IImportService {
orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
orderTicketsMapper.insert(orderTickets);
orderTicketStatusMapper.insert(orderTicketStatus);
orderTicketRelationsMapper.insert(orderTicketRelations);
orderUtils.resetOrderListVo(adamUserInfoVo.getUid(), 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);
}
......
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 @ 51b22c43
......@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -87,6 +88,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Autowired
private KylinOrderTicketsMapper kylinOrderTicketsMapper;
@Autowired
private KylinOrderImportMapper orderImportMapper;
@Override
public KylinPerformanceMisVo performanceDetails(String performancesId) {
log.info(" PERFORMANCE mis演出详情");
......@@ -590,17 +594,22 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return vo;
}
@Override
public List<KylinOrderImport> getOrderImport(String performanceId) {
return orderImportMapper.selectList(Wrappers.lambdaQuery(KylinOrderImport.class).eq(KylinOrderImport::getPerformanceId, performanceId));
}
@Override
public String changeTransferConfig(String performancesId,
Integer isCanTransfer,
String transferStartTime,
String transferEndTime) {
Integer isCanTransfer,
String transferStartTime,
String transferEndTime) {
KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
if(kylinPerformanceStatusData.getIsCanRefund().equals(1) && isCanTransfer.equals(1)){
if (kylinPerformanceStatusData.getIsCanRefund().equals(1) && isCanTransfer.equals(1)) {
return "修改失败，演出已开启退款";
}
KylinPerformances kylinPerformances = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
if(!(kylinPerformances.getType().equals(1) || kylinPerformances.getType().equals(101))){
if (!(kylinPerformances.getType().equals(1) || kylinPerformances.getType().equals(101))) {
return "修改失败，只支持音乐节类型演出";
}
......@@ -621,11 +630,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Override
public String changeRefundConfig(String performancesId,
Integer isCanRefund,
String refundOpenTime,
String refundCloseTime) {
Integer isCanRefund,
String refundOpenTime,
String refundCloseTime) {
KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
if(kylinPerformanceStatusData.getIsTransfer().equals(1) && isCanRefund.equals(1)){
if (kylinPerformanceStatusData.getIsTransfer().equals(1) && isCanRefund.equals(1)) {
return "修改失败，演出已开启转赠";
}
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderImport.java 0 → 100644
View file @ 51b22c43
package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
public class KylinOrderImport implements Serializable {
@TableId(value = "mid", type = IdType.AUTO)
private Integer mid;
/**
* performance_id
*/
private String performanceId;
/**
* title 文件名称
*/
private String title;
/**
* status '状态 [10-转赠订单可失效]'
*/
private Integer status;
/**
* created_at
*/
private LocalDateTime createdAt;
/**
* updated_at
*/
private LocalDateTime updatedAt;
/**
* comment
*/
private String comment;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderImportMapper.java 0 → 100644
View file @ 51b22c43
package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.dao.UpushDetailsListDao;
import com.liquidnet.service.kylin.entity.AdminUpush;
import com.liquidnet.service.kylin.entity.KylinOrderImport;
import java.util.List;
import java.util.Map;
/**
* <p>
* 友盟消息推送 Mapper 接口
* </p>
*
* @author jiangxiulong
* @since 2021-07-13
*/
public interface KylinOrderImportMapper extends BaseMapper<KylinOrderImport> {
}
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