Browse Source

fix:“优化线下订单导出接口,中文修改为英文”

soobin 1 year ago
parent
commit
db806e2c40

+ 3 - 3
src/main/java/com/szwl/controller/TOrderController.java

@@ -1531,7 +1531,7 @@ public class TOrderController {
                     os = response.getOutputStream();
                     SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
                     response.setContentType("application/vnd.ms-excel;charset=utf-8");
-                    response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("订单记录数据导出" + format.format(new Date()) + ".xls", "UTF-8"));
+                    response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("订单记录-" + format.format(new Date()) + ".xls", "UTF-8"));
                     workbook.write(os);
 //                    return JsonMessage.success("导出成功");
                 } catch (Exception e) {
@@ -1704,7 +1704,7 @@ public class TOrderController {
             IPage<TCoinOrder> iPage = coinOrderService.page(page, query);
             List<TCoinOrder> list = iPage.getRecords();
             List<CoinOrderTarget> coinOrderTargets = coinOrderService.findByCoinOrder(admin, list);
-            ExportParams exportParams = new ExportParams("线下订单记录", "sheet1");
+            ExportParams exportParams = new ExportParams("Order Record", "sheet1");
             Workbook workbook = ExcelExportUtil.exportExcel(exportParams, CoinOrderTarget.class, coinOrderTargets);
 
             if (workbook != null) {
@@ -1713,7 +1713,7 @@ public class TOrderController {
                     os = response.getOutputStream();
                     SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
                     response.setContentType("application/vnd.ms-excel;charset=utf-8");
-                    response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("线下订单记录数据导出" + format.format(new Date()) + ".xls", "UTF-8"));
+                    response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("OrderRecord-" + format.format(new Date()) + ".xls", "UTF-8"));
                     workbook.write(os);
                     return JsonMessage.success("导出成功");
                 } catch (Exception e) {

+ 8 - 8
src/main/java/com/szwl/model/excel/CoinOrderTarget.java

@@ -10,48 +10,48 @@ public class CoinOrderTarget {
     /**
      * 订单编号
      */
-    @Excel(name = "订单编号", width = 20.0D)
+    @Excel(name = "Order number", width = 20.0D)
     private String sn;
     /**
      * 花型名称
      */
-    @Excel(name = "商品名称", width = 20.0D)
+    @Excel(name = "Trade name", width = 20.0D)
     private String productName;
 
     /**
      * 所属商家
      */
-    @Excel(name = "所属商家", width = 20.0D)
+    @Excel(name = "Affiliated merchant", width = 20.0D)
     private String name;
 
     /**
      * 设备唯一码
      */
-    @Excel(name = "设备唯一码", width = 20.0D)
+    @Excel(name = "Machine code", width = 20.0D)
     private String clientId;
 
     /**
      * 支付时间
      */
-    @Excel(name = "支付时间", width = 20.0D)
+    @Excel(name = "Payment time", width = 20.0D)
     private Date payDate;
 
     /**
      * 状态
      */
-    @Excel(name = "状态", width = 20.0D)
+    @Excel(name = "Payment status", width = 20.0D)
     private String status;
 
     /**
      * 支付方式
      */
-    @Excel(name = "支付方式", width = 20.0D)
+    @Excel(name = "Payment method", width = 20.0D)
     private String frp_code;
 
     /**
      * 价格
      */
-    @Excel(name = "价格", width = 20.0D)
+    @Excel(name = "Order amount", width = 20.0D)
     private BigDecimal price;
 
     public String getSn() {

+ 1 - 1
src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -40,7 +40,7 @@ public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOr
             coinOrderTarget.setName(admin.getUsername());
             coinOrderTarget.setPrice(coinOrder.getPrice());
             coinOrderTarget.setPayDate(coinOrder.getCreateDate());
-            coinOrderTarget.setStatus("已支付");
+            coinOrderTarget.setStatus("Payment success");
             if (coinOrder.getPayType() == 0) {
                 coinOrderTarget.setFrp_code("No-Pay");
             } else if (coinOrder.getPayType() == 1) {