|
@@ -35,7 +35,7 @@ import org.springframework.beans.BeanUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
-import po.OrderDeliveryPO;
|
|
|
|
|
|
+import po.StoreOrderExportPO;
|
|
import tk.mybatis.mapper.entity.Condition;
|
|
import tk.mybatis.mapper.entity.Condition;
|
|
import tk.mybatis.mapper.entity.Example;
|
|
import tk.mybatis.mapper.entity.Example;
|
|
import vo.*;
|
|
import vo.*;
|
|
@@ -243,23 +243,40 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
@Override
|
|
@Override
|
|
public void exportFile(StoreOrderDTO dto, HttpServletResponse response) {
|
|
public void exportFile(StoreOrderDTO dto, HttpServletResponse response) {
|
|
List<StoreOrderVO> list = orderList(dto);
|
|
List<StoreOrderVO> list = orderList(dto);
|
|
- List<String> rowHead = CollUtil.newArrayList("订单号", "商品信息", "数量", "用户名", "付款金额", "订单状态", "物流信息", "下单时间", "付款时间");
|
|
|
|
|
|
+ List<String> rowHead = CollUtil.newArrayList("ID", "订单号", "用户ID", "用户注册手机号", "订单状态", "订单金额", "下单时间", "支付时间", "商品ID", "商品名称", "商品规格", "购买数量", "收件人姓名", "收件人手机", "收件人详细地址", "邮编", "快递公司", "快递单号");
|
|
ExcelWriter writer = ExcelUtil.getWriter();
|
|
ExcelWriter writer = ExcelUtil.getWriter();
|
|
try {
|
|
try {
|
|
writer.writeHeadRow(rowHead);
|
|
writer.writeHeadRow(rowHead);
|
|
List<List<Object>> rows = new LinkedList<>();
|
|
List<List<Object>> rows = new LinkedList<>();
|
|
|
|
+ StoreOrderInfo storeOrderInfo = null;
|
|
if (CollUtil.isNotEmpty(list)) {
|
|
if (CollUtil.isNotEmpty(list)) {
|
|
for (StoreOrderVO vo : list) {
|
|
for (StoreOrderVO vo : list) {
|
|
|
|
+ List<StoreOrderInfo> orderInfoVO = vo.getOrderInfoVO();
|
|
|
|
+ if (CollectionUtils.isNotEmpty(orderInfoVO)) {
|
|
|
|
+ storeOrderInfo = orderInfoVO.get(0);
|
|
|
|
+ }
|
|
|
|
+ UserAddress orderAddressVO = vo.getOrderAddressVO();
|
|
List<Object> rowA = CollUtil.newArrayList(
|
|
List<Object> rowA = CollUtil.newArrayList(
|
|
|
|
+ vo.getId(),
|
|
vo.getOrderId(),
|
|
vo.getOrderId(),
|
|
- JSONObject.toJSONString(vo.getOrderInfoVO()),
|
|
|
|
- vo.getTotalNum(),
|
|
|
|
- vo.getRealName(),
|
|
|
|
- vo.getPayPrice(),
|
|
|
|
|
|
+ vo.getUid(),
|
|
|
|
+ vo.getUserPhone(),
|
|
vo.getStatus(),
|
|
vo.getStatus(),
|
|
- vo.getDeliveryId(),
|
|
|
|
|
|
+ vo.getPayPrice(),
|
|
vo.getCreateTime() == null ? "" : DateUtil.format(vo.getCreateTime(), "yyyy-MM-dd HH:mm:ss"),
|
|
vo.getCreateTime() == null ? "" : DateUtil.format(vo.getCreateTime(), "yyyy-MM-dd HH:mm:ss"),
|
|
- vo.getPayTime() == null ? "" : DateUtil.format(vo.getPayTime(), "yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
+ vo.getPayTime() == null ? "" : DateUtil.format(vo.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
|
|
|
|
+
|
|
|
|
+ storeOrderInfo.getProductId(),
|
|
|
|
+ storeOrderInfo.getProductName(),
|
|
|
|
+ storeOrderInfo.getSku(),
|
|
|
|
+ storeOrderInfo.getPayNum(),
|
|
|
|
+
|
|
|
|
+ vo.getRealName(),
|
|
|
|
+ vo.getUserPhone(),
|
|
|
|
+ vo.getUserAddress(),
|
|
|
|
+ orderAddressVO.getPostCode(),
|
|
|
|
+ vo.getDeliveryName(),
|
|
|
|
+ vo.getDeliveryId()
|
|
);
|
|
);
|
|
rows.add(rowA);
|
|
rows.add(rowA);
|
|
}
|
|
}
|
|
@@ -1337,8 +1354,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
@Override
|
|
@Override
|
|
public void close(Long id) {
|
|
public void close(Long id) {
|
|
StoreOrder storeOrder = findById(id);
|
|
StoreOrder storeOrder = findById(id);
|
|
- storeOrder.setStatus(Constants.ORDER_STATUS_H5_CLOSE);
|
|
|
|
-// update(storeOrder);
|
|
|
|
|
|
+ if (storeOrder.getStatus().equals(Constants.ORDER_STATUS_H5_COMPLETE)) {
|
|
|
|
+ storeOrder.setStatus(Constants.ORDER_STATUS_H5_CLOSE);
|
|
|
|
+ update(storeOrder);
|
|
|
|
+ } else {
|
|
|
|
+ throw new ServiceException("当前状态不支持关闭");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -1354,7 +1375,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void exportDelivery(HttpServletResponse response) {
|
|
public void exportDelivery(HttpServletResponse response) {
|
|
- List<String> rowHead = CollUtil.newArrayList("订单号", "配送方式", "配送单号");
|
|
|
|
|
|
+ List<String> rowHead = CollUtil.newArrayList("ID", "订单号", "用户ID", "用户注册手机号", "订单状态", "订单金额", "下单时间", "支付时间", "商品ID", "商品名称", "商品规格", "购买数量", "收件人姓名", "收件人手机", "收件人详细地址", "邮编", "快递公司", "快递单号");
|
|
ExcelWriter writer = ExcelUtil.getWriter();
|
|
ExcelWriter writer = ExcelUtil.getWriter();
|
|
try {
|
|
try {
|
|
writer.writeHeadRow(rowHead);
|
|
writer.writeHeadRow(rowHead);
|
|
@@ -1391,14 +1412,22 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
throw new ServiceException("请传入xlsx或xls文档格式文件");
|
|
throw new ServiceException("请传入xlsx或xls文档格式文件");
|
|
}
|
|
}
|
|
try {
|
|
try {
|
|
- List<OrderDeliveryPO> list = EasyExcelUtil.syncReadModel(file.getInputStream(),
|
|
|
|
- OrderDeliveryPO.class,
|
|
|
|
|
|
+ List<StoreOrderExportPO> list = EasyExcelUtil.syncReadModel(file.getInputStream(),
|
|
|
|
+ StoreOrderExportPO.class,
|
|
0,
|
|
0,
|
|
1);
|
|
1);
|
|
|
|
|
|
if (CollUtil.isEmpty(list)) {
|
|
if (CollUtil.isEmpty(list)) {
|
|
throw new ServiceException("请填写内容后再提交!");
|
|
throw new ServiceException("请填写内容后再提交!");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ for (StoreOrderExportPO po : list) {
|
|
|
|
+ StoreOrder storeOrder = new StoreOrder();
|
|
|
|
+ storeOrder.setId(po.getId());
|
|
|
|
+ storeOrder.setDeliveryId(po.getDeliveryId());
|
|
|
|
+ storeOrder.setDeliveryName(po.getDeliveryName());
|
|
|
|
+ update(storeOrder);
|
|
|
|
+ }
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|
|
}
|
|
}
|