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

Commit 45662445 authored by limingyang's avatar limingyang

商城订单信息追加行导出

parent ee6f661c
......@@ -87,19 +87,19 @@ public class ExportDataController extends BaseController {
}
/**
* test
* 导出商城订单信息
*
* @param beginTime
* @param endTime
* @return
*/
@PostMapping("/export/test")
@PostMapping("/export/exportMallOrder")
@ResponseBody
public AjaxResult test(String beginTime, String endTime, Integer state, Integer mailType) {
public AjaxResult exportMallOrder(String beginTime, String endTime, String state, Integer mailType) {
if (!timeIsNotNull(beginTime, endTime)) {
return error("开始时间和结束时间不能为空!");
}
List<TestDao> voList = exportService.test(beginTime, endTime, state ,mailType);
List<TestDao> voList = exportService.exportMallOrder(beginTime, endTime, state ,mailType);
Map<String, List<String>> map = new HashMap<>();
int max = 0;
//将数据保存到list中
......@@ -109,6 +109,7 @@ public class ExportDataController extends BaseController {
if (map.get(orderCode) == null) {
List<String> list = new ArrayList<>();
list.add(te.getOrderCode());
list.add(te.getUserMobile());
list.add(te.getPriceExpress());
list.add(te.getPriceCoupon());
list.add(te.getStorePriceCoupon());
......@@ -128,7 +129,7 @@ public class ExportDataController extends BaseController {
list.add(te.getNum());
list.add(te.getSkuPrice());
list.add(te.getSkuPriceActual());
max = max > list.size() ? max : list.size();
max = Math.max(max, list.size());
map.put(orderCode, list);
}
if (map.get(orderCode) != null) {
......@@ -141,16 +142,16 @@ public class ExportDataController extends BaseController {
list.add(te.getNum());
list.add(te.getSkuPrice());
list.add(te.getSkuPriceActual());
max = max > list.size() ? max : list.size();
max = Math.max(max, list.size());
map.put(orderCode, list);
}
}
exportexcel(map, "表名test01", max);
exportexcel(map, "order", max);
}
if (voList.size() == 0) {
return error("查无信息");
}
return AjaxResult.success("ok!");
return AjaxResult.success("导出成功!");
}
private void exportexcel(Map<String, List<String>> map, String name, int max) {
......@@ -207,51 +208,25 @@ public class ExportDataController extends BaseController {
cell.setCellValue("物流单号");
int n = 12;
while (n <= max) {
int z = n / 20 + 1;
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("商品id" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("商品名" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("一级分类" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("二级分类" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("款式" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("数量" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("单价" + z);
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue("价格" + z);
int index = 0;
List<String> cells = appendCells();
while (n < max - 1) {
index++;
for (String cname : cells) {
n++;
cell = header.createCell(n);
cell.setCellStyle(cellStyle);
cell.setCellValue(cname + index);
}
}
int z = 1;
for (Map.Entry<String, List<String>> entry : map.entrySet()) {
String orderCode = entry.getKey();
List<String> list = entry.getValue();
XSSFRow content = sheet.createRow(z);
content.createCell(0).setCellValue(orderCode);
//获取员工
for (int i = 0; i < list.size(); i++) {
//创建单元格并设置值
content.createCell(i + 1).setCellValue(list.get(i));
content.createCell(i).setCellValue(list.get(i));
}
z++;
}
......@@ -284,6 +259,19 @@ public class ExportDataController extends BaseController {
}
}
private List<String> appendCells() {
List<String> cells = new ArrayList<>();
cells.add("商品id");
cells.add("商品名");
cells.add("一级分类");
cells.add("二级分类");
cells.add("款式");
cells.add("数量");
cells.add("单价");
cells.add("价格");
return cells;
}
/**
* 导出会员订单
*
......
......@@ -23,7 +23,7 @@ public interface IExportService {
//导出会员订单信息
List<OrderMemberExportVo> exportMemberOrder(String beginTime, String endTime);
List<TestDao> test(String beginTime, String endTime, Integer state, Integer mailType);
List<TestDao> exportMallOrder(String beginTime, String endTime, String state, Integer mailType);
//导出商品订单信息
List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime);
......
......@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......@@ -29,7 +30,7 @@ public class ExportServiceImpl implements IExportService {
public List<OrderExportVo> exportOrderByPerformanceIdAll(String performancesId) {
List<OrderExportDao> list = performancesMapper.exportOrderByPerformanceIdAll(performancesId);
List<OrderExportVo> voList = new ArrayList();
for (OrderExportDao item :list){
for (OrderExportDao item : list) {
voList.add(OrderExportVo.getNew().copyOrderExportVo(item));
}
return voList;
......@@ -39,7 +40,7 @@ public class ExportServiceImpl implements IExportService {
public List<OrderExportVo> exportOrderByPerformanceIdPay(String performancesId) {
List<OrderExportDao> list = performancesMapper.exportOrderByPerformanceIdPay(performancesId);
List<OrderExportVo> voList = new ArrayList();
for (OrderExportDao item :list){
for (OrderExportDao item : list) {
voList.add(OrderExportVo.getNew().copyOrderExportVo(item));
}
return voList;
......@@ -51,9 +52,9 @@ public class ExportServiceImpl implements IExportService {
try {
Date beginDate = sdf.parse(beginTime);
Date endDate = sdf.parse(endTime);
List<OrderExportDao> list = performancesMapper.exportOrderByOrderTime(beginDate,endDate);
List<OrderExportDao> list = performancesMapper.exportOrderByOrderTime(beginDate, endDate);
List<OrderDetailedExportVo> voList = new ArrayList();
for (OrderExportDao item :list){
for (OrderExportDao item : list) {
voList.add(OrderDetailedExportVo.getNew().copyOrderExportVo(item));
}
return voList;
......@@ -69,9 +70,9 @@ public class ExportServiceImpl implements IExportService {
try {
Date beginDate = sdf.parse(beginTime);
Date endDate = sdf.parse(endTime);
List<OrderExportDao> list = performancesMapper.exportOrderByShowTime(beginDate,endDate);
List<OrderExportDao> list = performancesMapper.exportOrderByShowTime(beginDate, endDate);
List<OrderDetailedByShowDateExportVo> voList = new ArrayList();
for (OrderExportDao item :list){
for (OrderExportDao item : list) {
voList.add(OrderDetailedByShowDateExportVo.getNew().copyOrderExportVo(item));
}
return voList;
......@@ -85,7 +86,7 @@ public class ExportServiceImpl implements IExportService {
public List<OrderDetailedByShowIdExportVo> exportOrderByShowId(String showId) {
List<OrderExportDao> list = performancesMapper.exportOrderByShowId(showId);
List<OrderDetailedByShowIdExportVo> voList = new ArrayList();
for (OrderExportDao item :list){
for (OrderExportDao item : list) {
voList.add(OrderDetailedByShowIdExportVo.getNew().copyOrderExportVo(item));
}
return voList;
......@@ -97,9 +98,9 @@ public class ExportServiceImpl implements IExportService {
try {
Date beginDate = sdf.parse(beginTime);
Date endDate = sdf.parse(endTime);
List<MemberOrderExportDao> list = performancesMapper.exportMemberOrder(beginDate,endDate);
List<MemberOrderExportDao> list = performancesMapper.exportMemberOrder(beginDate, endDate);
List<OrderMemberExportVo> voList = new ArrayList();
for (MemberOrderExportDao item :list){
for (MemberOrderExportDao item : list) {
voList.add(OrderMemberExportVo.getNew().copyMemberOrderExportVo(item));
}
return voList;
......@@ -110,12 +111,13 @@ public class ExportServiceImpl implements IExportService {
}
@Override
public List<TestDao> test(String beginTime, String endTime, Integer state, Integer mailType) {
public List<TestDao> exportMallOrder(String beginTime, String endTime, String state, Integer mailType) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
Date beginDate = sdf.parse(beginTime);
Date endDate = sdf.parse(endTime);
List<TestDao> list = performancesMapper.test(beginDate,endDate, state, mailType);
List<String> states = Arrays.asList(state.split(","));
List<TestDao> list = performancesMapper.exportMallOrder(beginDate, endDate, states, mailType);
return list;
} catch (ParseException e) {
e.printStackTrace();
......@@ -129,9 +131,9 @@ public class ExportServiceImpl implements IExportService {
try {
Date beginDate = sdf.parse(beginTime);
Date endDate = sdf.parse(endTime);
List<CommodityOrderExportDao> list = performancesMapper.exportCommodityOrder(beginDate,endDate);
List<CommodityOrderExportDao> list = performancesMapper.exportCommodityOrder(beginDate, endDate);
List<OrderCommodityExportVo> voList = new ArrayList();
for (CommodityOrderExportDao item :list){
for (CommodityOrderExportDao item : list) {
voList.add(OrderCommodityExportVo.getNew().copyCommodityOrderExportVo(item));
}
return voList;
......
......@@ -82,6 +82,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
//商品订单信息
List<CommodityOrderExportDao> exportCommodityOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
List<TestDao> test(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("state") Integer
state, @Param("mailType") Integer mailType);
List<TestDao> exportMallOrder(@Param("beginTime") Date beginTime, @Param("endTime") Date endTime, @Param("states") List<String>
states, @Param("mailType") Integer mailType);
}
......@@ -1079,7 +1079,7 @@ GROUP BY user_mobile;
and gso.status not in (0, 5)
group by do.code) temtable group by temtable.code
</select>
<select id="test" resultMap="testDaoResult">
<select id="exportMallOrder" resultMap="testDaoResult">
select gso.order_code as order_code,
gso.user_mobile as user_mobile,
gso.price_express as price_express,
......@@ -1114,11 +1114,14 @@ GROUP BY user_mobile;
<if test="beginTime != null and endTime != null">
and gso.created_at between #{beginTime} and #{endTime}
</if>
<if test="state != null">
and gso.status in (2, 3, 4)
<if test="states != null">
and gso.status in
<foreach collection="states" item="item" index="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
<if test="mailType != null and mailType == '1'">
and ggm.mail_no is null;
and gm.mail_no is null;
</if>
<if test="mailType != null and mailType == '2'">
and gm.mail_no is not null;
......
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