From 61521f6ca99cf58ee40a910e92a98fa507574671 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 17 Oct 2019 17:38:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=93=E7=AE=97=E5=AF=B9=E8=B4=A6][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E5=8F=8A=E6=80=BB?= =?UTF-8?q?=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxMerchantSubsidyController.java | 13 +++++++++++ .../iformall/domain/po/WxMerchantSubsidy.java | 6 ++--- .../service/WxMerchantSubsidyService.java | 6 +++-- .../impl/WxMerchantSubsidyServiceImpl.java | 22 ++++++++++++++++++- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 571187b88..1a271876d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -88,6 +88,19 @@ public class WxMerchantSubsidyController extends BaseController { return new ResultData(page); } + @ApiOperation("交易列表") + @GetMapping("summary") + @SystemControllerLog(description = "结算-总计") + public ResultData summary(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy) { + logger.debug("[" + getIpAddr() + "] subsidy::summary"); + if (null == wxMerchantSubsidy) { + wxMerchantSubsidy = new WxMerchantSubsidyVo(); + } + wxMerchantSubsidy.setTenantId(getTenantId()); + Map data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); + return new ResultData(data); + } + @ApiOperation("更新补贴记录") @PostMapping("updateSubsidied") @SystemControllerLog(description = "商户-更新补贴记录") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index f9c923b33..879630a5b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -100,7 +100,7 @@ public class WxMerchantSubsidy extends BaseEntity { @TableField(exist = false) protected String statusStr; - @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0"}) + @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0", " _-1"}) @io.swagger.annotations.ApiModelProperty(value = "是否冻结", name = "freeze") private Integer freeze; @@ -126,11 +126,11 @@ public class WxMerchantSubsidy extends BaseEntity { return subsidyStr; } - @Excel(name = "结算类型", width = 20, orderNum = "4", replace = {"自主结算_1", "微信结算_2"}) + @Excel(name = "结算类型", width = 20, orderNum = "4", replace = {"自主结算_1", "微信结算_2", " _-1"}) @io.swagger.annotations.ApiModelProperty(value = "结算类型1自主结算2微信结算", name = "type") private Integer type; - @Excel(name = "结算来源", width = 20, orderNum = "3", replace = {"补贴_0", "卡消费_1", "券核销_2", "砍价核销_3", "拼团核销_4", , "收银分账_5"}) + @Excel(name = "结算来源", width = 20, orderNum = "3", replace = {"补贴_0", "卡消费_1", "券核销_2", "砍价核销_3", "拼团核销_4", "收银分账_5", " _-1"}) @io.swagger.annotations.ApiModelProperty(value = "结算来源0补贴1卡消费2券核销3砍价核销4拼团核销5收银分账", name = "source") private Integer source; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index a5f035ad3..9533cc305 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -61,6 +61,8 @@ public interface WxMerchantSubsidyService { /** * 补贴流水导出 */ - void exportData(WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response); - + void exportData(WxMerchantSubsidyVo wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response); + + Map summary(WxMerchantSubsidyVo wxMerchantSubsidy); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 0a25a56b5..647168dc5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -17,8 +17,11 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service @@ -75,10 +78,27 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { } @Override - public void exportData(WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { + public void exportData(WxMerchantSubsidyVo wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { List list = wxMerchantSubsidyMapper.findVoList(wxMerchantSubsidy); + Map summary = summary(wxMerchantSubsidy); + Long subsidy = summary.get("subsidy"); + String subsidyStr = new BigDecimal(subsidy).divide(new BigDecimal(100)).toPlainString(); + WxMerchantSubsidyVo merchantSubsidy = new WxMerchantSubsidyVo(); + merchantSubsidy.setSubsidyStr(subsidyStr); + merchantSubsidy.setSource(-1); + merchantSubsidy.setType(-1); + merchantSubsidy.setFreeze(-1); + list.add(merchantSubsidy); excelService.exportExcel(list, null, "结算记录", WxMerchantSubsidyVo.class, "结算记录.xlsx", response, false); } + @Override + public Map summary(WxMerchantSubsidyVo wxMerchantSubsidy) { + Long subsidy = wxMerchantSubsidyMapper.findVoList(wxMerchantSubsidy).stream().collect(Collectors.summingLong(WxMerchantSubsidy::getSubsidy)); + Map data = new HashMap<>(); + data.put("subsidy", subsidy); + return data; + } + }