From 471429523422e0c73a5fcfd16a08c204eb8f932c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 30 十月 2023 15:25:25 +0800
Subject: [PATCH] # log日志
---
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 1 +
server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java b/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
index 98e14d1..833b402 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/RefundPlatExportVO.java
@@ -22,14 +22,17 @@
public class RefundPlatExportVO {
+ @ApiModelProperty(value = "缂栫爜")
+// @ExcelColumn(name="绯荤粺鍗曞彿",width = 10,index = 2,align = HorizontalAlignment.CENTER)
+ private String id;
@ApiModelProperty(value = "鐢ㄦ埛")
@ExcelColumn(name="鐢ㄦ埛" ,width = 10,index = 1,align = HorizontalAlignment.CENTER)
private String openid;
- @ApiModelProperty(value = "缂栫爜")
+ @ApiModelProperty(value = "绯荤粺鍗曞彿")
@ExcelColumn(name="绯荤粺鍗曞彿",width = 10,index = 2,align = HorizontalAlignment.CENTER)
- private String id;
+ private String objId;
@ApiModelProperty(value = "閫�娆句氦鏄撳崟鍙�")
@ExcelColumn(name="閫�娆句氦鏄撳崟鍙�" ,width = 10,index = 3,align = HorizontalAlignment.CENTER)
@@ -48,7 +51,7 @@
private BigDecimal money;
@ApiModelProperty(value = "鎿嶄綔鏃堕棿")
- @ExcelColumn(name="鎿嶄綔鏃堕棿" ,width = 10,index = 7,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鎿嶄綔鏃堕棿" ,width = 10,index = 7,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date doneDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
index 643e1a3..c4dfad8 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -134,6 +134,7 @@
for(Refund order : list){
RefundPlatExportVO vo = new RefundPlatExportVO();
vo.setId(order.getId());
+ vo.setObjId(order.getObjId());
vo.setOpenid(order.getOpenid());
vo.setDoneDate(order.getDoneDate());
vo.setMoney(Constants.formatDecimalNum(order.getMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
--
Gitblit v1.9.3