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

Skip to content

L
liquidnet-bus-v1
Commit b402923d authored by 姜秀龙's avatar 姜秀龙
Browse files
Options

Merge remote-tracking branch 'origin/master' into jxl-yirenhebing

parents 8a88d7f4 f83b5de2
Show whitespace changes
Inline Side-by-side
Showing with 447 additions and 137 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/tools/ExportDataController.java
View file @ b402923d
...@@ -3,8 +3,10 @@ package com.liquidnet.client.admin.web.controller.zhengzai.tools; ...@@ -3,8 +3,10 @@ package com.liquidnet.client.admin.web.controller.zhengzai.tools;
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.utils.poi.ExcelUtil; import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinCommonService;
import com.liquidnet.client.admin.zhengzai.kylin.dto.*; import com.liquidnet.client.admin.zhengzai.kylin.dto.*;
import com.liquidnet.client.admin.zhengzai.kylin.service.IExportService; import com.liquidnet.client.admin.zhengzai.kylin.service.IExportService;
import com.liquidnet.service.goblin.dto.GoblinStoreSearchDto;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -13,7 +15,8 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -13,7 +15,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.util.*; import java.util.Arrays;
import java.util.List;
@Controller @Controller
@RequestMapping("tools/export") @RequestMapping("tools/export")
...@@ -22,6 +25,9 @@ public class ExportDataController extends BaseController { ...@@ -22,6 +25,9 @@ public class ExportDataController extends BaseController {
@Autowired @Autowired
private IExportService exportService; private IExportService exportService;
@Autowired
private IGoblinCommonService goblinCommonService;
private String prefix = "zhengzai/financial"; private String prefix = "zhengzai/financial";
...@@ -30,6 +36,17 @@ public class ExportDataController extends BaseController { ...@@ -30,6 +36,17 @@ public class ExportDataController extends BaseController {
return prefix + "/export"; return prefix + "/export";
} }
/**
* 店铺列表（财务导出用）
*/
@GetMapping("/store/list")
@ResponseBody
public AjaxResult storeList(String storeName) {
List<String> status = Arrays.asList("3", "4", "5");
List<GoblinStoreSearchDto> list = goblinCommonService.storeSearch(storeName, status);
return AjaxResult.success(list);
}
/** /**
* 导出订单明细 * 导出订单明细
* *
...@@ -77,7 +94,12 @@ public class ExportDataController extends BaseController { ...@@ -77,7 +94,12 @@ public class ExportDataController extends BaseController {
} }
private boolean timeIsNotNull(String beginTime, String endTime) { private boolean timeIsNotNull(String beginTime, String endTime) {
return StringUtils.isNotBlank(beginTime) && StringUtils.isNotBlank(endTime) ? true : false; return StringUtils.isNotBlank(beginTime) && StringUtils.isNotBlank(endTime);
}
private boolean hasHalfTime(String beginTime, String endTime) {
return (StringUtils.isNotBlank(beginTime) && StringUtils.isBlank(endTime))
|| (StringUtils.isBlank(beginTime) && StringUtils.isNotBlank(endTime));
} }
...@@ -104,18 +126,20 @@ public class ExportDataController extends BaseController { ...@@ -104,18 +126,20 @@ public class ExportDataController extends BaseController {
/** /**
* 导出商品订单 * 导出商品订单
* * 店铺 / 下单时间 填了的条件全部 AND
* @param beginTime
* @param endTime
* @return
*/ */
@PostMapping("/export/commodityOrder") @PostMapping("/export/commodityOrder")
@ResponseBody @ResponseBody
public AjaxResult exportCommodityOrder(String beginTime, String endTime) { public AjaxResult exportCommodityOrder(String beginTime, String endTime, String storeId) {
if (!timeIsNotNull(beginTime, endTime)) { boolean hasStoreId = StringUtils.isNotBlank(storeId);
return error("开始时间和结束时间不能为空！"); boolean hasOrderTime = timeIsNotNull(beginTime, endTime);
if (!hasStoreId && !hasOrderTime) {
return error("请至少填写店铺或下单时间其中一个条件！");
}
if (hasHalfTime(beginTime, endTime)) {
return error("下单时间请填写完整的开始和结束时间！");
} }
List<OrderCommodityExportVo> list = exportService.exportCommodityOrder(beginTime, endTime); List<OrderCommodityExportVo> list = exportService.exportCommodityOrder(beginTime, endTime, storeId);
if (list.size() == 0) { if (list.size() == 0) {
return error("查无信息"); return error("查无信息");
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/financial/export.html
View file @ b402923d
...@@ -6,52 +6,228 @@ ...@@ -6,52 +6,228 @@
<th:block th:include="include :: datetimepicker-css"/> <th:block th:include="include :: datetimepicker-css"/>
</head> </head>
<style> <style>
td { .export-card-grid {
horiz-align: center; display: flex;
text-align: left; flex-wrap: wrap;
padding: 10px; margin: 0 -10px;
} }
.export-card-col {
width: 33.33%;
padding: 0 10px;
margin-bottom: 20px;
box-sizing: border-box;
}
@media (max-width: 1200px) {
.export-card-col {
width: 50%;
}
}
@media (max-width: 768px) {
.export-card-col {
width: 100%;
}
}
.export-card {
background: #fff;
border: 1px solid #e7eaec;
border-radius: 6px;
height: 100%;
display: flex;
flex-direction: column;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
transition: box-shadow .2s;
}
.export-card:hover {
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
}
.export-card-header {
padding: 18px 20px 14px;
border-bottom: 1px solid #f0f0f0;
text-align: center;
}
.export-card-icon {
width: 48px;
height: 48px;
line-height: 48px;
border-radius: 10px;
margin: 0 auto 10px;
font-size: 22px;
color: #fff;
}
.export-card-icon.show {
background: linear-gradient(135deg, #1ab394, #18a689);
}
.export-card-icon.commodity {
background: linear-gradient(135deg, #f8ac59, #f59e42);
}
.export-card-icon.member {
background: linear-gradient(135deg, #1c84c6, #1a7bb9);
}
.export-card-header h4 {
margin: 0;
font-size: 16px;
font-weight: 600;
color: #333;
}
.export-card-body {
padding: 20px;
flex: 1;
}
.export-card-body .form-group {
margin-bottom: 14px;
}
.export-card-body .form-group label {
display: block;
margin-bottom: 6px;
color: #666;
font-weight: normal;
}
.export-card-body .form-control {
width: 100%;
}
.time-range-row {
display: flex;
align-items: center;
gap: 8px;
}
.time-range-row .form-control {
flex: 1;
min-width: 0;
}
.time-range-row .time-separator {
color: #999;
flex-shrink: 0;
}
.export-card-footer {
padding: 0 20px 20px;
text-align: center;
}
.export-card-footer .btn {
min-width: 120px;
}
.show-filter-options label {
font-weight: normal;
margin-right: 14px;
cursor: pointer;
}
.show-filter-options input {
margin-right: 4px;
}
</style> </style>
<body class="white-bg"> <body class="gray-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight">
<div class="col-sm-12 search-collapse"> <div class="export-card-grid">
<form id="formId"> <div class="export-card-col">
<div class="select-list"> <div class="export-card">
<ul> <div class="export-card-header">
<li> <div class="export-card-icon show"><i class="fa fa-ticket"></i></div>
<label>搜索类型：</label> <h4>演出订单</h4>
<select id="type" name="type"> </div>
<option value="0">请选择</option> <div class="export-card-body">
<option value="1">商品[订单时间]</option> <div class="form-group">
<option value="2">演出[订单时间]</option> <label>导出方式</label>
<option value="3">演出[演出id]</option> <div class="show-filter-options">
<option value="4">演出[演出时间]</option> <label><input type="radio" name="showExportMode" value="order" checked> 按下单时间</label>
<option value="5">会员[订单时间]</option> <label><input type="radio" name="showExportMode" value="show"> 按演出开始时间</label>
<label><input type="radio" name="showExportMode" value="id"> 按演出id</label>
</div>
</div>
<div class="form-group" id="showIdGroup" style="display: none;">
<label>演出id</label>
<input id="showPerformanceId" type="text" class="form-control" placeholder="按演出id导出时填写"/>
</div>
<div class="form-group" id="showTimeGroup">
<label id="showTimeLabel">下单时间</label>
<div class="time-range-row">
<input type="text" class="form-control show-time-start" placeholder="选日期，默认 00:00:00"/>
<span class="time-separator">-</span>
<input type="text" class="form-control show-time-end" placeholder="选日期，默认 23:59:59"/>
</div>
</div>
</div>
<div class="export-card-footer">
<a class="btn btn-primary btn-rounded" onclick="exportShowOrder()">
<i class="fa fa-download"></i> 导出
</a>
</div>
</div>
</div>
<div class="export-card-col">
<div class="export-card">
<div class="export-card-header">
<div class="export-card-icon commodity"><i class="fa fa-shopping-bag"></i></div>
<h4>商品订单</h4>
</div>
<div class="export-card-body">
<div class="form-group">
<label>店铺</label>
<select id="commodityStoreSelect" class="form-control">
<option value="">全部</option>
</select> </select>
</li> </div>
<li>
<label>演出id：</label>
<input id="performanceId" type="text" name="performanceId"/>
</li>
<li>
<div class="form-group"> <div class="form-group">
<label>时间范围：</label> <label>下单时间</label>
<input type="text" style="width: 200px;float: left" <div class="time-range-row">
class="form-control" id="startTime" placeholder="开始时间选择" name="timeStart"/> <input type="text" class="form-control commodity-order-start" placeholder="选日期，默认 00:00:00"/>
<span class="control-label" <span class="time-separator">-</span>
style="float: left;margin-left: 10px;margin-right: 10px"> - </span> <input type="text" class="form-control commodity-order-end" placeholder="选日期，默认 23:59:59"/>
<input type="text" style="width: 200px;float: left" </div>
class="form-control" id="endTime" placeholder="结束时间选择" name="timeEnd"/> </div>
</div> </div>
</li> <div class="export-card-footer">
<li> <a class="btn btn-warning btn-rounded" onclick="exportCommodityOrder()">
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchExport()"><i <i class="fa fa-download"></i> 导出
class="fa fa-search"></i>导出</a> </a>
</li> </div>
</ul> </div>
</div> </div>
</form>
<div class="export-card-col">
<div class="export-card">
<div class="export-card-header">
<div class="export-card-icon member"><i class="fa fa-user"></i></div>
<h4>会员订单</h4>
</div>
<div class="export-card-body">
<div class="form-group">
<label>下单时间</label>
<div class="time-range-row">
<input type="text" class="form-control member-order-start" placeholder="选日期，默认 00:00:00"/>
<span class="time-separator">-</span>
<input type="text" class="form-control member-order-end" placeholder="选日期，默认 23:59:59"/>
</div>
</div>
</div>
<div class="export-card-footer">
<a class="btn btn-info btn-rounded" onclick="exportMemberOrder()">
<i class="fa fa-download"></i> 导出
</a>
</div>
</div>
</div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
...@@ -59,85 +235,163 @@ ...@@ -59,85 +235,163 @@
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "tools/export"; var prefix = ctx + "tools/export";
var url = prefix;
var formData = new FormData();
$("input[name='timeStart']").datetimepicker({ function formatDatePart(date) {
format: "yyyy-mm-dd hh:ii:ss", var pad = function (n) {
autoclose: true return n < 10 ? '0' + n : '' + n;
};
return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate());
}
function initStartDatetimePicker(selector) {
$(selector).each(function () {
var $el = $(this);
$el.datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true,
todayBtn: true,
forceParse: false
}).on('changeDate', function (e) {
if (!e.date) {
return;
}
$el.val(formatDatePart(e.date) + ' 00:00:00');
}); });
});
}
$("input[name='timeEnd']").datetimepicker({ function initEndDatetimePicker(selector) {
format: "yyyy-mm-dd hh:ii:ss", $(selector).each(function () {
autoclose: true var $el = $(this);
$el.datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true,
todayBtn: true,
forceParse: false
}).on('changeDate', function (e) {
if (!e.date) {
return;
}
$el.val(formatDatePart(e.date) + ' 23:59:59');
});
}); });
}
function searchExport() { function doExport(url, param, modalName) {
var type = document.getElementById("type").value; var options = {
var performanceId = document.getElementById("performanceId").value; modalName: modalName,
var st = document.getElementById("startTime").value; exportUrl: url
var et = document.getElementById("endTime").value; };
var exportType = 0; $.table.init(options);
if (type == 2) { $.table.exportExcel("", param);
exportType = 1;
} else if (type == 3) {
exportType = 3;
} else if (type == 4) {
exportType = 2;
} }
if (type == 0) {
alert("请选择导出类型"); function toggleShowExportFields() {
return var mode = $('input[name="showExportMode"]:checked').val();
} else if (type == 1) {//商品导出逻辑 if (mode === 'id') {
if (st == "" || et == "") { $('#showIdGroup').show();
alert("请选择时间范围"); $('#showTimeGroup').hide();
return $('.show-time-start, .show-time-end').val('');
} else { } else {
url = url + "/export/commodityOrder"; $('#showIdGroup').hide();
$('#showPerformanceId').val('');
$('#showTimeGroup').show();
$('#showTimeLabel').text(mode === 'show' ? '演出开始时间' : '下单时间');
} }
} else if (type == 2) {//演出[订单时间]
if (st == "" || et == "") {
alert("请选择时间范围");
return
} else {
url = url + "/export/orderInfo";
} }
} else if (type == 3) {//演出[演出id]
if (performanceId == "") { function exportShowOrder() {
alert("演出id不能为空"); var mode = $('input[name="showExportMode"]:checked').val();
return var showId = $("#showPerformanceId").val();
var beginTime = $(".show-time-start").val();
var endTime = $(".show-time-end").val();
var exportType;
if (mode === 'order') {
exportType = 1;
} else if (mode === 'show') {
exportType = 2;
} else { } else {
url = url + "/export/orderInfo"; exportType = 3;
} }
} else if (type == 4) {//演出[演出时间]
if (st == "" || et == "") { if (exportType === 3) {
alert("请选择时间范围"); if (!showId) {
return $.modal.alertWarning("演出id不能为空");
} else { return;
url = url + "/export/orderInfo";
} }
} else if (type == 5) {//会员[订单时间]
if (st == "" || et == "") {
alert("请选择时间范围");
return
} else { } else {
url = url + "/export/memberOrder"; if (!beginTime || !endTime) {
$.modal.alertWarning("请填写完整的开始和结束时间");
return;
} }
} }
var options = {
modalName: "财务导出", doExport(prefix + "/export/orderInfo", {
exportUrl: url, "exportType": exportType,
"showId": showId,
"beginTime": beginTime,
"endTime": endTime
}, "演出订单");
} }
$.table.init(options);
var param = { function initStoreSelect() {
"beginTime": st, $.get(prefix + '/store/list', function (json) {
"endTime": et, var list = (json && json.code == 0 && json.data) ? json.data : [];
"showId": performanceId, var $select = $('#commodityStoreSelect');
"exportType": exportType $.each(list, function (i, item) {
}; if (item.storeId && item.storeName) {
$.table.exportExcel("", param) $select.append($('<option></option>').attr('value', item.storeId).text(item.storeName));
url = prefix; }
});
});
}
function exportCommodityOrder() {
var storeId = $("#commodityStoreSelect").val() || "";
var beginTime = $(".commodity-order-start").val();
var endTime = $(".commodity-order-end").val();
if (!storeId && (!beginTime || !endTime)) {
$.modal.alertWarning("请至少填写店铺或下单时间其中一个条件");
return;
}
if ((beginTime && !endTime) || (!beginTime && endTime)) {
$.modal.alertWarning("下单时间请填写完整的开始和结束时间");
return;
}
doExport(prefix + "/export/commodityOrder", {
"beginTime": beginTime,
"endTime": endTime,
"storeId": storeId
}, "商品订单");
} }
function exportMemberOrder() {
var beginTime = $(".member-order-start").val();
var endTime = $(".member-order-end").val();
if (!beginTime || !endTime) {
$.modal.alertWarning("请填写完整的下单时间范围");
return;
}
doExport(prefix + "/export/memberOrder", {
"beginTime": beginTime,
"endTime": endTime
}, "会员订单");
}
$(function () {
initStartDatetimePicker('.show-time-start, .commodity-order-start, .member-order-start');
initEndDatetimePicker('.show-time-end, .commodity-order-end, .member-order-end');
$('input[name="showExportMode"]').on('change', toggleShowExportFields);
toggleShowExportFields();
initStoreSelect();
});
</script> </script>
</body> </body>
</html> </html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinCommonServiceImpl.java
View file @ b402923d
...@@ -46,10 +46,15 @@ public class GoblinCommonServiceImpl implements IGoblinCommonService { ...@@ -46,10 +46,15 @@ public class GoblinCommonServiceImpl implements IGoblinCommonService {
@Override @Override
public List<GoblinStoreSearchDto> storeSearch(String name, List<String> status) { public List<GoblinStoreSearchDto> storeSearch(String name, List<String> status) {
List<GoblinStoreInfo> list = goblinStoreInfoMapper.selectList(Wrappers.lambdaQuery(GoblinStoreInfo.class) LambdaQueryWrapper<GoblinStoreInfo> queryWrapper = Wrappers.lambdaQuery(GoblinStoreInfo.class);
.like(GoblinStoreInfo::getStoreName, name) if (StringUtil.isNotBlank(name)) {
queryWrapper.like(GoblinStoreInfo::getStoreName, name);
}
queryWrapper.eq(GoblinStoreInfo::getDelFlg, "0")
.in(GoblinStoreInfo::getStatus, status) .in(GoblinStoreInfo::getStatus, status)
.select(GoblinStoreInfo::getStoreId, GoblinStoreInfo::getStoreName, GoblinStoreInfo::getStatus)); .orderByAsc(GoblinStoreInfo::getStoreName)
.select(GoblinStoreInfo::getStoreId, GoblinStoreInfo::getStoreName, GoblinStoreInfo::getStatus);
List<GoblinStoreInfo> list = goblinStoreInfoMapper.selectList(queryWrapper);
List<GoblinStoreSearchDto> dtoList = new ArrayList<>(); List<GoblinStoreSearchDto> dtoList = new ArrayList<>();
for (GoblinStoreInfo item : list) { for (GoblinStoreInfo item : list) {
GoblinStoreSearchDto dto = GoblinStoreSearchDto.getNew(); GoblinStoreSearchDto dto = GoblinStoreSearchDto.getNew();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderCommodityExportVo.java
View file @ b402923d
...@@ -11,6 +11,8 @@ public class OrderCommodityExportVo implements Serializable, Cloneable { ...@@ -11,6 +11,8 @@ public class OrderCommodityExportVo implements Serializable, Cloneable {
@Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING) @Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING)
private String code; private String code;
@Excel(name = "店铺名称", cellType = Excel.ColumnType.STRING)
private String storeName;
@Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING) @Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING)
private String paymentId; private String paymentId;
@Excel(name = "商品名称", cellType = Excel.ColumnType.STRING) @Excel(name = "商品名称", cellType = Excel.ColumnType.STRING)
...@@ -53,6 +55,7 @@ public class OrderCommodityExportVo implements Serializable, Cloneable { ...@@ -53,6 +55,7 @@ public class OrderCommodityExportVo implements Serializable, Cloneable {
this.setPriceRefund(source.getPriceRefund()); this.setPriceRefund(source.getPriceRefund());
this.setStatus(source.getStatus()); this.setStatus(source.getStatus());
this.setRefundAt(source.getRefundAt()); this.setRefundAt(source.getRefundAt());
this.setStoreName(source.getStoreName());
return this; return this;
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/IExportService.java
View file @ b402923d
...@@ -23,5 +23,5 @@ public interface IExportService { ...@@ -23,5 +23,5 @@ public interface IExportService {
List<OrderMemberExportVo> exportMemberOrder(String beginTime, String endTime); List<OrderMemberExportVo> exportMemberOrder(String beginTime, String endTime);
//导出商品订单信息 //导出商品订单信息
List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime); List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime, String storeId);
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/ExportServiceImpl.java
View file @ b402923d
...@@ -8,13 +8,13 @@ import com.liquidnet.service.kylin.dao.MemberOrderExportDao; ...@@ -8,13 +8,13 @@ import com.liquidnet.service.kylin.dao.MemberOrderExportDao;
import com.liquidnet.service.kylin.dao.OrderExportDao; import com.liquidnet.service.kylin.dao.OrderExportDao;
import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper; import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -110,12 +110,12 @@ public class ExportServiceImpl implements IExportService { ...@@ -110,12 +110,12 @@ public class ExportServiceImpl implements IExportService {
} }
@Override @Override
public List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime) { public List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime, String storeId) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try { try {
Date beginDate = sdf.parse(beginTime); Date beginDate = parseDate(sdf, beginTime);
Date endDate = sdf.parse(endTime); Date endDate = parseDate(sdf, endTime);
List<CommodityOrderExportDao> list = performancesMapper.exportCommodityOrder(beginDate, endDate); List<CommodityOrderExportDao> list = performancesMapper.exportCommodityOrder(beginDate, endDate, storeId);
List<OrderCommodityExportVo> voList = new ArrayList(); List<OrderCommodityExportVo> voList = new ArrayList();
for (CommodityOrderExportDao item : list) { for (CommodityOrderExportDao item : list) {
voList.add(OrderCommodityExportVo.getNew().copyCommodityOrderExportVo(item)); voList.add(OrderCommodityExportVo.getNew().copyCommodityOrderExportVo(item));
...@@ -126,4 +126,11 @@ public class ExportServiceImpl implements IExportService { ...@@ -126,4 +126,11 @@ public class ExportServiceImpl implements IExportService {
throw new BusinessException("导出Excel失败，请联系网站管理员！"); throw new BusinessException("导出Excel失败，请联系网站管理员！");
} }
} }
private Date parseDate(SimpleDateFormat sdf, String time) throws ParseException {
if (StringUtils.isBlank(time)) {
return null;
}
return sdf.parse(time);
}
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/CommodityOrderExportDao.java
View file @ b402923d
...@@ -24,5 +24,7 @@ public class CommodityOrderExportDao { ...@@ -24,5 +24,7 @@ public class CommodityOrderExportDao {
private String status; private String status;
//退款时间 //退款时间
private String refundAt; private String refundAt;
//店铺名称
private String storeName;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java
View file @ b402923d
...@@ -86,7 +86,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> { ...@@ -86,7 +86,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
//会员订单信息 //会员订单信息
List<MemberOrderExportDao> exportMemberOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime); List<MemberOrderExportDao> exportMemberOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
//商品订单信息 //商品订单信息
List<CommodityOrderExportDao> exportCommodityOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime); List<CommodityOrderExportDao> exportCommodityOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("storeId") String storeId);
List<KylinPerformancesDto> getListAll(String title); List<KylinPerformancesDto> getListAll(String title);
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ b402923d
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<result column="price_refund" property="priceRefund"/> <result column="price_refund" property="priceRefund"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="refund_at" property="refundAt"/> <result column="refund_at" property="refundAt"/>
<result column="store_name" property="storeName"/>
</resultMap> </resultMap>
<!-- <resultMap id="OrderExportDaoResult" type="com.liquidnet.service.kylin.dao.OrderExportDao">--> <!-- <resultMap id="OrderExportDaoResult" type="com.liquidnet.service.kylin.dao.OrderExportDao">-->
...@@ -1175,7 +1176,8 @@ GROUP BY user_mobile,tickets_id; ...@@ -1175,7 +1176,8 @@ GROUP BY user_mobile,tickets_id;
WHEN temtable.STATUS = '7' THEN WHEN temtable.STATUS = '7' THEN
'退货通过' '退货通过'
END AS status, END AS status,
temtable.refund_at as refund_at temtable.refund_at as refund_at,
temtable.store_name as store_name
from from
(select do.code, (select do.code,
gso.payment_id, gso.payment_id,
...@@ -1186,15 +1188,22 @@ GROUP BY user_mobile,tickets_id; ...@@ -1186,15 +1188,22 @@ GROUP BY user_mobile,tickets_id;
gso.price_express, gso.price_express,
gso.price_refund, gso.price_refund,
gso.status, gso.status,
gbo.refund_at gbo.refund_at,
max(gsi.store_name) as store_name
from goblin_store_order gso from goblin_store_order gso
inner join goblin_order_sku gos on gos.order_id = gso.order_id inner join goblin_order_sku gos on gos.order_id = gso.order_id
inner join dragon_orders do on do.order_code = gso.master_order_code and do.status = 1 inner join dragon_orders do on do.order_code = gso.master_order_code and do.status = 1
left join goblin_back_order gbo on gbo.order_id = gso.order_id and gbo.status in (2, 8) left join goblin_back_order gbo on gbo.order_id = gso.order_id and gbo.status in (2, 8)
where left join goblin_store_info gsi on gsi.store_id = gso.store_id
do.created_at between #{beginTime} and #{endTime} where gso.status not in (0, 5)
and gso.status not in (0, 5) <if test="beginTime != null and endTime != null">
and do.created_at between #{beginTime} and #{endTime}
</if>
<if test="storeId != null and storeId != ''">
and gso.store_id = #{storeId}
</if>
group by do.code group by do.code
<if test="beginTime != null and endTime != null">
union union
select do.code, select do.code,
gso.payment_id, gso.payment_id,
...@@ -1205,16 +1214,22 @@ GROUP BY user_mobile,tickets_id; ...@@ -1205,16 +1214,22 @@ GROUP BY user_mobile,tickets_id;
gso.price_express, gso.price_express,
gso.price_refund, gso.price_refund,
gso.status, gso.status,
gbo.refund_at gbo.refund_at,
max(gsi.store_name) as store_name
from goblin_store_order gso from goblin_store_order gso
inner join goblin_order_sku gos on gos.order_id = gso.order_id inner join goblin_order_sku gos on gos.order_id = gso.order_id
inner join dragon_orders do on do.order_code = gso.master_order_code and do.status = 1 inner join dragon_orders do on do.order_code = gso.master_order_code and do.status = 1
inner join dragon_order_refunds dor on dor.order_refund_id = do.code inner join dragon_order_refunds dor on dor.order_refund_id = do.code
left join goblin_back_order gbo on gbo.order_id = gso.order_id and gbo.status in (2, 8) left join goblin_back_order gbo on gbo.order_id = gso.order_id and gbo.status in (2, 8)
where left join goblin_store_info gsi on gsi.store_id = gso.store_id
dor.refund_at between #{beginTime} and #{endTime} where dor.refund_at between #{beginTime} and #{endTime}
and gso.status not in (0, 5) and gso.status not in (0, 5)
group by do.code) temtable group by temtable.code <if test="storeId != null and storeId != ''">
and gso.store_id = #{storeId}
</if>
group by do.code
</if>
) temtable group by temtable.code
</select> </select>
<select id="getSubscribeStatisticalByPerformancesId" resultType="com.liquidnet.service.kylin.dao.report.KylinPerformanceSubscribeStatisticalDao"> <select id="getSubscribeStatisticalByPerformancesId" resultType="com.liquidnet.service.kylin.dao.report.KylinPerformanceSubscribeStatisticalDao">
SELECT A.*, SELECT A.*,
......
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