From db0ca450424628ae7fbbd4280c35631ae73096c2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 22 May 2019 19:04:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9bug][=E4=BF=AE=E6=94=B9][100?= =?UTF-8?q?1573]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatower/WxMerchantTradeDailyController.java | 3 --- .../controller/WxMerchantTradeDailyController.java | 2 +- .../com/iformall/domain/po/WxMerchantTradeDaily.java | 10 +++++++++- .../iformall/service/impl/DataTowerServiceImpl.java | 4 ++-- .../com/iformall/service/impl/WxChartServiceImpl.java | 4 ++-- .../service/impl/WxMerchantTradeDailyServiceImpl.java | 10 +++++----- 6 files changed, 19 insertions(+), 14 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 7e5ffea4f..bf95ef510 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -92,9 +92,6 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily.getTradeAmt() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); wxMerchantTradeDaily.setTenantId(getTenantId()); - if(wxMerchantTradeDaily.getTradeCount() == null){ - wxMerchantTradeDaily.setTradeCount(0); - } if (wxMerchantTradeDaily.getReportDate() == null) { SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 16732491d..9898b1262 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -85,7 +85,7 @@ public class WxMerchantTradeDailyController extends BaseController { logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); wxMerchantTradeDaily.setTenantId(super.getTenantId()); if(wxMerchantTradeDaily.getTradeAmt()!= null){ - wxMerchantTradeDaily.setTradeAmt(wxMerchantTradeDaily.getTradeAmt()*100); + wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +""); } WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index d32598f57..851ba5966 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import javax.persistence.Id; import javax.persistence.Table; @@ -30,7 +31,7 @@ public class WxMerchantTradeDaily implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") private Long bUserId; @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") - private Integer tradeAmt; + private String tradeAmt; @io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate") @@ -45,6 +46,13 @@ public class WxMerchantTradeDaily implements Serializable { @Transient private String month; + public Integer getTradeAmtInteger(){ + if (StringUtils.isBlank(tradeAmt)){ + return 0; + } + return Integer.parseInt(tradeAmt); + } + @io.swagger.annotations.ApiModelProperty(value = "是否是当天 1是", name = "isToday") @Transient private Integer isToday; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 48e2f8b49..eaae633e7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -167,7 +167,7 @@ public class DataTowerServiceImpl implements DataTowerService { } reportMap.put("reportCount", tradeCount); reportMap.put("silenceCount", merchantCount - tradeCount); - int reportTotal = tradeList.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum(); + int reportTotal = tradeList.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum(); reportMap.put("reportTotal", reportTotal); return reportMap; @@ -473,7 +473,7 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("shsbl", 0); } - int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum(); + int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum(); datamap.put("shsbjg", shsbjg); return datamap; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 6495c5ae6..7372e8f65 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -393,7 +393,7 @@ public class WxChartServiceImpl implements WxChartDataService { tradeList.add(trade); } else { trade = new WxMerchantTradeDaily(); - trade.setTradeAmt(0); + trade.setTradeAmt("0"); trade.setReportDate(fmtv.format(cal.getTime())); tradeList.add(trade); } @@ -2160,7 +2160,7 @@ public class WxChartServiceImpl implements WxChartDataService { } else { datamap.put("shsbl", 0); } - int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum(); + int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmtInteger).sum(); datamap.put("shsbjg", shsbjg); return new ResultData(datamap); } 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 04b282a7f..e2f816f81 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -103,7 +103,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ if (tradeList.size() > 0 ) { wxMerchantTradeDaily = tradeList.get(0); - wxMerchantTradeDaily.setTradeAmt(volume); + wxMerchantTradeDaily.setTradeAmt(volume+""); wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); return new ResultData(wxMerchantTradeDaily); @@ -114,7 +114,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); wxMerchantTradeDaily.setMerchantId(merchant.getId()); wxMerchantTradeDaily.setBUserId(userId); - wxMerchantTradeDaily.setTradeAmt(volume); + wxMerchantTradeDaily.setTradeAmt(volume+""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); @@ -141,7 +141,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ if (tradeList.size() > 0) { wxMerchantTradeDaily = tradeList.get(0); wxMerchantTradeDaily.setUpdateDate(new Date()); - wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()); + wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+""); wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); wxMerchantTradeDaily.setProof(tradeDailyVo.getProof()); wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); @@ -152,7 +152,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setId(idWorker.nextId()); wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId()); wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); - wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()); + wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+""); wxMerchantTradeDaily.setCreateDate(new Date()); wxMerchantTradeDaily.setUpdateDate(new Date()); wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); @@ -232,7 +232,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ tradeList.add(trade); }else { trade = new WxMerchantTradeDaily(); - trade.setTradeAmt(0); + trade.setTradeAmt("0"); trade.setReportDate(fmtv.format(cal.getTime())); tradeList.add(trade); }