This commit is contained in:
2023-03-27 12:01:06 +08:00
parent 1809915ffd
commit 5bb75b2df8
8 changed files with 576 additions and 93 deletions

View File

@@ -15,23 +15,25 @@ import com.zscat.mallplus.oms.query.OmsOrderLocationQuery;
import com.zscat.mallplus.oms.query.OmsOrderQuery;
import com.zscat.mallplus.oms.service.IOmsOrderItemService;
import com.zscat.mallplus.oms.service.IOmsOrderService;
import com.zscat.mallplus.oms.vo.OmsMoneyInfoParam;
import com.zscat.mallplus.oms.vo.OmsOrderDeliveryParam;
import com.zscat.mallplus.oms.vo.OmsReceiverInfoParam;
import com.zscat.mallplus.oms.vo.OrderCountDto;
import com.zscat.mallplus.oms.vo.*;
import com.zscat.mallplus.util.StringUtils;
import com.zscat.mallplus.utils.CommonResult;
import com.zscat.mallplus.utils.ExportExcelUtils;
import com.zscat.mallplus.utils.ValidatorUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
/**
@@ -55,6 +57,9 @@ public class OmsOrderController {
@Resource
private OmsOrderOperateHistoryMapper omsOrderOperateHistoryMapper;
@Autowired
private HttpServletResponse response;
@SysLog(MODULE = "oms", REMARK = "根据条件查询所有订单表列表")
@ApiOperation("根据条件查询所有订单表列表")
@GetMapping(value = "/list")
@@ -85,6 +90,23 @@ public class OmsOrderController {
return new CommonResult().failed();
}
@GetMapping("/exportExcel")
@ApiOperation(value = "订单列表导出")
public void exportExcel(OmsOrderQuery omsOrderQuery) {
//得到所有要导出的数据
List<OrderExcelVo> excelVos = IOmsOrderService.listExcel(omsOrderQuery);
//定义导出的excel名字
String excelName = "订单列表";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//导出订单列表
ExportExcelUtils.export(fileNameURL, excelVos, OrderExcelVo.class, response);
}
@SysLog(MODULE = "oms", REMARK = "删除订单表")
@ApiOperation("删除订单表")

View File

@@ -83,4 +83,6 @@ public interface IOmsOrderService extends IService<OmsOrder> {
List<OmsOrderLocation> getLocation();
List<OmsOrderLocation> getPickupPoint(String id);
List<OrderExcelVo> listExcel(OmsOrderQuery omsOrderQuery);
}

View File

@@ -27,10 +27,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -205,7 +202,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
//查询全部订单
orders = orderMapper.selectList(qw);
} else {
orders = orderMapper.selectList(qw.eq("status",omsOrderQuery.getStatus()));
orders = orderMapper.selectList(qw.eq("status", omsOrderQuery.getStatus()));
}
for (OmsOrder order : orders) {
memberMap.put(order.getMemberId(), order.getId());
@@ -241,7 +238,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
//查询全部订单
orders = orderMapper.selectList(qw);
} else {
orders = orderMapper.selectList(qw.eq("status",omsOrderLocationQuery.getStatus()));
orders = orderMapper.selectList(qw.eq("status", omsOrderLocationQuery.getStatus()));
}
for (OmsOrder order : orders) {
memberMap.put(order.getMemberId(), order.getId());
@@ -356,4 +353,26 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
public List<OmsOrderLocation> getPickupPoint(String id) {
return orderMapper.getPickupPoint(id);
}
@Override
public List<OrderExcelVo> listExcel(OmsOrderQuery omsOrderQuery) {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) {
qw.like("order_sn", omsOrderQuery.getOrderSn());
}
if (StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())) {
qw.like("receiver_phone", omsOrderQuery.getReceiverPhone());
}
qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')"
);
List<OrderExcelVo> orders = new ArrayList<>();
if (StringUtils.isBlank(omsOrderQuery.getStatus())) {
//查询全部订单
orders = orderMapper.listExcel(qw);
} else {
orders = orderMapper.listExcel(qw.eq("status", omsOrderQuery.getStatus()));
}
return orders;
}
}