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

Skip to content

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

暂时提交

parent c093ab30
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 24 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/ImportController.java
View file @ b625f2e8
package com.liquidnet.client.admin.web.controller.zhengzai.kylin; package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.annotation.Log;
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.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.ShiroUtils; import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.client.admin.common.utils.poi.ExcelUtil; import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo; import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
import com.liquidnet.client.admin.zhengzai.kylin.service.IImportService; import com.liquidnet.client.admin.zhengzai.kylin.service.IImportService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
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 org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -16,6 +21,8 @@ import java.util.List; ...@@ -16,6 +21,8 @@ import java.util.List;
@RequestMapping("/import") @RequestMapping("/import")
public class ImportController { public class ImportController {
private String prefix = "zhengzai/kylin/performances/orderImport";
@Autowired @Autowired
IImportService iImportService; IImportService iImportService;
...@@ -43,5 +50,27 @@ public class ImportController { ...@@ -43,5 +50,27 @@ public class ImportController {
return AjaxResult.success(message); return AjaxResult.success(message);
} }
/**
* 跳转导入详情
*/
@GetMapping("OrderOutLine/detailsList/{id}")
@ResponseBody
public String detailsList(@PathVariable("id") String importId, ModelMap mmap) {
mmap.put("importId", importId);
return prefix + "/details";
}
/**
* 导入纪录
*/
@GetMapping("/OrderOutLine/details/{importId}")
@ResponseBody
public TableDataInfo importOrderOutLine(@PathVariable("importId") String importId) {
PageInfo<OrderOutLineVo> result = iImportService.getImportDetails(importId);
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
rspData.setRows(result.getList());
rspData.setTotal(result.getTotal());
return rspData;
}
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/orderImport.html
View file @ b625f2e8
...@@ -24,10 +24,12 @@ ...@@ -24,10 +24,12 @@
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "kylin/performances"; var prefix = ctx + "kylin/performances";
var importfix = ctx + "import/";
var options = { var options = {
url: prefix + "/orderImport/list/" + '[[${performancesId}]]'.replaceAll("\"", ""), url: prefix + "/orderImport/list/" + '[[${performancesId}]]'.replaceAll("\"", ""),
importUrl: ctx + "import/OrderOutLine/" + '[[${performancesId}]]'.replaceAll("\"", ""),//导入 importUrl: importfix + "OrderOutLine/"+ '[[${performancesId}]]'.replaceAll("\"", ""),//导入
importTemplateUrl: ctx + "import/template/OrderOutLine",//导出 importTemplateUrl: importfix + "template/OrderOutLine",//导出
detailUrl: importfix + "OrderOutLine/detailsList/{id}",
modalName: "订单", modalName: "订单",
orderSc: "desc", orderSc: "desc",
orderItem: "created_at", orderItem: "created_at",
...@@ -71,7 +73,7 @@ ...@@ -71,7 +73,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-warning btn-xs" href="javascript:void(0)" onclick="f(\'' + row.mid + '\')"><i class="fa fa-remove"></i>错误详情</a>'); actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.mid + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/orderImport/details.html 0 → 100644
View file @ b625f2e8
<!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 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 + "import/";
$(function () {
var options = {
url: prefix + "/OrderOutLine/details/" + '[[${importId}]]'.replaceAll("\"", ""),
modalName: "导入详情",
method: "get",
columns: [{
checkbox: true
},
{
field: 'enterMobile',
title: '手机号'
},
{
field: 'enterName',
title: '姓名'
},
{
field: 'enterIdCode',
title: '身份证'
},
{
field: 'ticketTitle',
title: '票种名称'
},
{
field: 'useStart',
title: '票种适用开始时间'
},
{
field: 'useEnd',
title: '票种适用结束时间'
},
{
field: 'ticketType',
title: '票种类型'
},
{
field: 'address',
title: '收货地址'
}, {
field: 'reason',
title: '错误原因'
}
]
};
$.table.init(options);
})
;
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/IImportService.java
View file @ b625f2e8
package com.liquidnet.client.admin.zhengzai.kylin.service; package com.liquidnet.client.admin.zhengzai.kylin.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo; import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
import java.util.List; import java.util.List;
...@@ -7,4 +8,6 @@ import java.util.List; ...@@ -7,4 +8,6 @@ import java.util.List;
public interface IImportService { public interface IImportService {
String importOrderOutLine(String performancesId,List<OrderOutLineVo> orderOutLineVoList, Boolean updateSupport, String fileName); String importOrderOutLine(String performancesId,List<OrderOutLineVo> orderOutLineVoList, Boolean updateSupport, String fileName);
PageInfo<OrderOutLineVo> getImportDetails(String importId);
} }
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 @ b625f2e8
...@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl; ...@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.exception.BusinessException; import com.liquidnet.client.admin.common.exception.BusinessException;
import com.liquidnet.client.admin.common.utils.StringUtils; import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo; import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
...@@ -128,15 +129,18 @@ public class ImportServiceImpl implements IImportService { ...@@ -128,15 +129,18 @@ public class ImportServiceImpl implements IImportService {
} }
} }
if (ticketData == null) { if (ticketData == null) {
KylinOrderImport orderImportFinal = new KylinOrderImport(); // KylinOrderImport orderImportFinal = new KylinOrderImport();
orderImportFinal.setPerformanceId(performancesId); // orderImportFinal.setPerformanceId(performancesId);
orderImportFinal.setStatus(2); // orderImportFinal.setStatus(2);
orderImportFinal.setAllCount(failureNum+successNum); // orderImportFinal.setAllCount(failureNum+successNum);
orderImportFinal.setErrorCount(failureNum+successNum); // orderImportFinal.setErrorCount(failureNum+successNum);
orderImportFinal.setSuccessCount(0); // orderImportFinal.setSuccessCount(0);
orderImportFinal.setUpdatedAt(LocalDateTime.now()); // orderImportFinal.setUpdatedAt(LocalDateTime.now());
orderImportMapper.update(orderImportFinal, Wrappers.lambdaUpdate(KylinOrderImport.class).eq(KylinOrderImport::getImportId,importId)); // orderImportMapper.update(orderImportFinal, Wrappers.lambdaUpdate(KylinOrderImport.class).eq(KylinOrderImport::getImportId,importId));
return "演出数据错误"; // return "演出数据错误";
orderOutLineVo.setReason("演出数据错误");
vos.add(orderOutLineVo);
continue;
} }
// 获取限购 实名 // 获取限购 实名
int ticketLimit = ticketData.getLimitCount();//普通票种限购 int ticketLimit = ticketData.getLimitCount();//普通票种限购
...@@ -156,14 +160,14 @@ public class ImportServiceImpl implements IImportService { ...@@ -156,14 +160,14 @@ public class ImportServiceImpl implements IImportService {
if (address.isEmpty()) { if (address.isEmpty()) {
orderOutLineVo.setReason("快递票未填写收货地址"); orderOutLineVo.setReason("快递票未填写收货地址");
vos.add(orderOutLineVo); vos.add(orderOutLineVo);
// return "快递票未填写收货地址"; continue;
} }
} }
//实名判断 //实名判断
if (isTrueName == 1 && (enterIdCode.isEmpty() || enterName.isEmpty())) { if (isTrueName == 1 && (enterIdCode.isEmpty() || enterName.isEmpty())) {
orderOutLineVo.setReason("实名票未填写入场人"); orderOutLineVo.setReason("实名票未填写入场人");
vos.add(orderOutLineVo); vos.add(orderOutLineVo);
// return "实名票未填写入场人"; continue;
} }
//学生票 判断 //学生票 判断
...@@ -173,7 +177,7 @@ public class ImportServiceImpl implements IImportService { ...@@ -173,7 +177,7 @@ public class ImportServiceImpl implements IImportService {
if (age > 25) { if (age > 25) {
orderOutLineVo.setReason("年龄不符合"); orderOutLineVo.setReason("年龄不符合");
vos.add(orderOutLineVo); vos.add(orderOutLineVo);
// return "年龄不符合";//年龄超了 continue;
} }
} }
} }
...@@ -182,14 +186,16 @@ public class ImportServiceImpl implements IImportService { ...@@ -182,14 +186,16 @@ public class ImportServiceImpl implements IImportService {
if (isTrueName == 1) { if (isTrueName == 1) {
String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, enterIdCode, performancesId, ticketData.getTicketsId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, 0, isTrueName); String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, enterIdCode, performancesId, ticketData.getTicketsId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, 0, isTrueName);
if (!res1.equals("")) { if (!res1.equals("")) {
orderOutLineVo.setReason(res1);
vos.add(orderOutLineVo); vos.add(orderOutLineVo);
// return res1;//乱七八糟异常 continue;
} }
} else { } else {
String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", performancesId, ticketData.getTicketsId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, number, number, 0, isTrueName); String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", performancesId, ticketData.getTicketsId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, number, number, 0, isTrueName);
if (!res1.equals("")) { if (!res1.equals("")) {
orderOutLineVo.setReason(res1);
vos.add(orderOutLineVo); vos.add(orderOutLineVo);
// return res1;//乱七八糟异常 continue;
} }
} }
try { try {
...@@ -220,10 +226,15 @@ public class ImportServiceImpl implements IImportService { ...@@ -220,10 +226,15 @@ public class ImportServiceImpl implements IImportService {
return successMsg.toString(); return successMsg.toString();
} }
@Override
public PageInfo<OrderOutLineVo> getImportDetails(String importId) {
return dataUtils.getOrderImportFail(importId);
}
private void order(Integer number, Integer IsExpress, AdamUserInfoVo adamUserInfoVo, boolean isMember, private void order(Integer number, Integer IsExpress, AdamUserInfoVo adamUserInfoVo, boolean isMember,
KylinPerformanceVo performanceData, KylinTicketTimesVo ticketTimesVo, KylinTicketVo ticketData, KylinPerformanceVo performanceData, KylinTicketTimesVo ticketTimesVo, KylinTicketVo ticketData,
String enterMobile, String enterName, String enterIdCode, String address) throws Exception { String enterMobile, String enterName, String enterIdCode, String address){
String source = "OUTLINE"; String source = "OUTLINE";
String version = "OUTLINE"; String version = "OUTLINE";
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
...@@ -398,4 +409,6 @@ public class ImportServiceImpl implements IImportService { ...@@ -398,4 +409,6 @@ public class ImportServiceImpl implements IImportService {
orderUtils.resetOrderListVo(adamUserInfoVo.getUid(), 1, orderTicketVo.getOrderTicketsId(), orderTicketVo); 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/utils/DataUtils.java
View file @ b625f2e8
package com.liquidnet.client.admin.zhengzai.kylin.utils; package com.liquidnet.client.admin.zhengzai.kylin.utils;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo; import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
...@@ -398,17 +399,19 @@ public class DataUtils { ...@@ -398,17 +399,19 @@ public class DataUtils {
//设置 订单导入错误数据 //设置 订单导入错误数据
public void setOrderImportFail(String importId, List<OrderOutLineVo> vos) { public void setOrderImportFail(String importId, List<OrderOutLineVo> vos) {
String redisKey = KylinRedisConst.ORDER_IMPORT_FAIL.concat(importId); String redisKey = KylinRedisConst.ORDER_IMPORT_FAIL.concat(importId);
PageInfo<OrderOutLineVo> vo = new PageInfo(vos);
vo.setTotal(vos.size());
redisUtil.set(redisKey, vos); redisUtil.set(redisKey, vos);
} }
//获取 订单导入错误数据 //获取 订单导入错误数据
public List<OrderOutLineVo> getOrderImportFail(String importId) { public PageInfo<OrderOutLineVo> getOrderImportFail(String importId) {
String redisKey = KylinRedisConst.ORDER_IMPORT_FAIL.concat(importId); String redisKey = KylinRedisConst.ORDER_IMPORT_FAIL.concat(importId);
Object obj = redisUtil.get(redisKey); Object obj = redisUtil.get(redisKey);
if (obj == null) { if (obj == null) {
return new ArrayList(); return new PageInfo();
} else { } else {
return (List<OrderOutLineVo>) obj; return (PageInfo<OrderOutLineVo>) obj;
} }
} }
} }
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @ b625f2e8
...@@ -755,9 +755,7 @@ public final class RedisUtil { ...@@ -755,9 +755,7 @@ public final class RedisUtil {
public static void main(String[] args) { public static void main(String[] args) {
String[] keys = { String[] keys = {
"kylin:order:id:302624032735805444241994", "kylin:order:id:302739831268147207565446"
"kylin:order:id:302739844787937288909968",
"kylin:order:id:302739847197122562214368"
}; };
for (String key : keys) { for (String key : keys) {
long value = key.hashCode(); long value = key.hashCode();
......
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