From bebee0818509e383f626ae65a1d2bbf066ed3ab6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 24 Jun 2019 17:42:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=A7=A3=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 4 +++ .../domain/vo/WxMerchantTradeDailyVo.java | 26 +++++++++++++++++-- .../impl/WxMerchantTradeDailyServiceImpl.java | 11 ++------ 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 38a9e3f50..b230803ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -111,6 +111,10 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); } wxMerchantTradeDaily.setTenantId(getTenantId()); + if (wxMerchantTradeDaily.getReportDate() == null) { + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); + } wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC); wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 3007a0094..b78a8f3e7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -8,6 +8,8 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Date; import java.util.List; @@ -35,9 +37,20 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") private Long bUserId; - @Excel(name = "解单金额(元)", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") private Integer tradeAmt; + + @Excel(name = "解单金额(元)", width = 20, orderNum = "3") + @Transient + private String tradeAmtStr; + + public String getTradeAmtStr() { + if (tradeAmt != null) { + return new BigDecimal(tradeAmt).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString(); + } + return null; + } + @io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate") private Date createDate; @@ -45,7 +58,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate") private Date updateDate; - @Excel(name = "解单日期", width = 20, orderNum = "1", format = "yyyy-MM-dd") + @Excel(name = "解单日期", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate") private String reportDate; @@ -65,6 +78,14 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") private String bUserName; + public String getbUserPhone() { + return bUserPhone; + } + + public void setbUserPhone(String bUserPhone) { + this.bUserPhone = bUserPhone; + } + @Excel(name = "联系电话", width = 20, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "bUserPhone") private String bUserPhone; @@ -75,6 +96,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") private String proof; + @Transient private Integer isToday; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 4ae5df1ba..56ff78f5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -177,8 +177,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ //没有商户ID导出全部数据 String name = "解单数据"; if (wxMerchantTradeDailyVo.getMerchantId() == null) { - String title = wxMerchantTradeDailyVo.getReportDate() + "商户解单数据"; + String title = "商户解单数据"; List list = wxMerchantTradeDailyMapper.findListVo(wxMerchantTradeDailyVo); + list.parallelStream().forEach(t -> t.setReportDate(wxMerchantTradeDailyVo.getReportDate())); excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); } else { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); @@ -186,10 +187,6 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); List list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); String title = "近30天解单数据"; - if (!list.isEmpty()) { - String merchantName = list.get(0).getMerchantName(); - title = merchantName + title; - } excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); } } @@ -329,8 +326,4 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } - - - - } From f90155fecc5927e057f72f84a8ded420f27bf65a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 24 Jun 2019 19:04:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:60?= =?UTF-8?q?=E5=88=86=E9=92=9F=E5=86=85=E6=9C=AA=E6=94=AF=E4=BB=98=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/schedule/OrderExpiringSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 3258dad45..1a0d7a1b9 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -31,7 +31,7 @@ public class OrderExpiringSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final int NORMAL_TIME_OUT = 15 * 60 * 1000; //普通券 必须15分钟内支付 - private final int PRESS_TIME_OUT = 15 * 60 * 1000; //砍价券 必须60分钟内支付 + private final int PRESS_TIME_OUT = 60 * 60 * 1000; //砍价券 必须60分钟内支付 @Autowired WxOrderMapper wxOrderMapper;