|
|
@@ -690,7 +690,7 @@ public class OrderController {
|
|
|
|
|
|
ExcelExport ee = new ExcelExport("订单信息");
|
|
|
|
|
|
- String[] header = new String[]{"订单编号","商户订单编号", "订单状态", "实际支付金额", "SKU", "商品名称", "数量", "销售价", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间"};
|
|
|
+ String[] header = new String[]{"订单编号","商户订单编号", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间"};
|
|
|
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
if (orderList != null && orderList.size() != 0) {
|
|
|
@@ -702,11 +702,11 @@ public class OrderController {
|
|
|
map.put("OrderSn", orderEntity.getOrderSn());
|
|
|
map.put("MerchOrderSn", orderEntity.getMerchOrderSn());
|
|
|
map.put("OrderStatus", StringUtils.isEmpty(orderStatus.toString())? "":Dict.orderStatus.valueOf("item_"+ orderStatus).getItemName());
|
|
|
- map.put("ActualPrice", orderEntity.getActualPrice());
|
|
|
map.put("SKU", orderEntity.getSku());
|
|
|
map.put("GoodsName", orderEntity.getGoodsName());
|
|
|
map.put("Number", orderEntity.getNumber());
|
|
|
map.put("RetailPrice", orderEntity.getRetailPrice());
|
|
|
+ map.put("ActualPrice", orderEntity.getActualPrice());
|
|
|
|
|
|
map.put("OrderBizType", StringUtils.isEmpty(orderBizType)? "":Dict.orderBizType.valueOf("item_"+orderBizType).getItemName());
|
|
|
map.put("ShippingName", orderEntity.getShippingName());
|
|
|
@@ -719,7 +719,7 @@ public class OrderController {
|
|
|
map.put("District", orderEntity.getDistrict());
|
|
|
map.put("Address", orderEntity.getAddress());
|
|
|
|
|
|
- map.put("OrderStartTime", DateUtils.format(orderEntity.getOrderProcessRecord().getAddOrderStartTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
+ map.put("OrderStartTime", orderEntity.getOrderProcessRecord()==null?"":DateUtils.format(orderEntity.getOrderProcessRecord().getAddOrderStartTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
list.add(map);
|
|
|
}
|
hyq