From c4402393b9d80bd04ef7c54b2becae00bdd29e90 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 23 Jun 2024 15:43:29 +0800 Subject: [PATCH] fix --- .../controller/rent/WxBillAllController.java | 420 ++++++++++-------- .../com/iformall/domain/po/WxBillAction.java | 2 +- .../iformall/domain/vo/WxBillJianMian.java | 32 ++ .../com/iformall/enums/EnumBillAction.java | 13 +- .../iformall/mapper/WxBillActionMapper.java | 3 + .../iformall/service/WxBillActionService.java | 3 + .../service/impl/WxBillActionServiceImpl.java | 6 + .../service/impl/WxBillAllServiceImpl.java | 18 +- .../impl/WxBillDepositServiceImpl.java | 4 +- .../resources/mapper/WxBillActionMapper.xml | 27 +- 10 files changed, 312 insertions(+), 216 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxBillJianMian.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index b86295bf0..d0f775278 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -11,12 +11,14 @@ import com.iformall.controller.base.BillBaseController; import com.iformall.domain.dto.WxBillPayDTO; import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.SysConfig; +import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.domain.vo.WxBillAll; import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.domain.vo.WxBillHotNotify; +import com.iformall.domain.vo.WxBillJianMian; import com.iformall.domain.vo.WxBillSum; import com.iformall.domain.vo.WxMerchantBillVo; import com.iformall.enums.EnumBillAllType; @@ -26,6 +28,7 @@ import com.iformall.enums.EnumRentContractManageFeeType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.SysConfigService; +import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillAllService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; @@ -42,6 +45,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -71,6 +76,9 @@ public class WxBillAllController extends BillBaseController { @Autowired ExcelService excelService; + @Autowired + private WxBillActionService wxBillActionService; + /** * 商户账单汇总计费列表 * @param wxMerchant @@ -555,118 +563,152 @@ public class WxBillAllController extends BillBaseController { //return wxBillAllService.updateReceivePay(wxBillAll, getUser(),false); } - //###################################### 老代码 ###################################### - - @GetMapping("exportOweBill") - @SystemControllerLog(description = "费用收缴数据-生成催缴单") - public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill"); - if (null == wxBillAll) { - wxBillAll = new WxBillAll(); - } - //默认查当月第一天到今天 - if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { - wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - - wxBillAllService.exportOweBill(wxBillAll, request, response); - } - /** - * 欠缴商户列表 - * @param wxBillAll - * @param pageNum - * @param pageSize - * @return - */ - @GetMapping("oweMerchantlist") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") - public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist"); - if (null == wxBillAll) { - wxBillAll = new WxBillAll(); - } - //默认查当月第一天到今天 - if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ - wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - Map result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); - return new ResultData(result); + //减免统计 + @GetMapping("jianmiantj") + public ResultData jianmiantj(@ModelAttribute WxBillAction wxBillAction) { + wxBillAction.updateTenantInfo(getTenantInfo()); + List jList = wxBillActionService.findJianMian(wxBillAction); + Map map = new HashMap(); + if (null != jList && jList.size() > 0 ) { + for (int i = 0 ; i < jList.size() ; i++) { + WxBillJianMian jm = jList.get(i); + map.put(jm.getBillType(), jm.getTotal()); + } + } + Map retMap = new HashMap(); + BigDecimal total = new BigDecimal("0.00"); + List retList = new ArrayList(); + for (EnumBillAllType at : EnumBillAllType.values()) { + String money = map.get(at.getCode()); + if (StringUtils.isBlank(money)) { + money = "0.00"; + } + WxBillJianMian bjm = new WxBillJianMian(); + bjm.setBillType(at.getCode()); + bjm.setTotal(money); + retList.add(bjm); + total = total.add(new BigDecimal(money)); + } + + retMap.put("total", total.toPlainString()); + retMap.put("list", retList); + return new ResultData(retMap); } - - @GetMapping("oweBillCount") - @ApiImplicitParams({ - @ApiImplicitParam(name = "contractId", value = "合同id", dataType = "long", paramType = "query", required = true), - @ApiImplicitParam(name = "type", value = "类型1租赁合同2物业合同", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "账单总览-总额") - public ResultData oweBillCount(Long contractId, Integer type) { - Long count = wxBillAllService.hasOweBill(contractId, type); - return new ResultData(count); - } - - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "账单总览-列表") - public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); - wxBillAll.updateTenantInfo(getTenantInfo()); - if (null == wxBillAll) { - wxBillAll = new WxBillAll(); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ - wxBillAll.setStatusList(new ArrayList<>()); - JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); - for (int i = 0; i ()); - JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr()); - for (int i = 0; i result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize); - return new ResultData(result); - } - - @GetMapping("detail") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true), - @ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)}) - public ResultData detail( Long id, Integer type) { - Map result = wxBillAllService.detail(id, type); - Long merchantId = (Long) result.get("merchantId"); - WxMerchant merchant = wxMerchantService.getById(merchantId); - if (null != merchant) { - result.put("merchantName", merchant.getName()); - } - return new ResultData(result); - } - - @GetMapping("allDepositList") - @SystemControllerLog(description = "账单总览-所有押金列表") - public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList"); - if (null == wxBillAll) { - wxBillAll = new WxBillAll(); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - return new ResultData(wxBillAllService.allDepositList(wxBillAll)); - } + //###################################### 老代码 ###################################### +// +// @GetMapping("exportOweBill") +// @SystemControllerLog(description = "费用收缴数据-生成催缴单") +// public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill"); +// if (null == wxBillAll) { +// wxBillAll = new WxBillAll(); +// } +// //默认查当月第一天到今天 +// if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { +// wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// +// wxBillAllService.exportOweBill(wxBillAll, request, response); +// } +// +// /** +// * 欠缴商户列表 +// * @param wxBillAll +// * @param pageNum +// * @param pageSize +// * @return +// */ +// @GetMapping("oweMerchantlist") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), +// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) +// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") +// public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist"); +// if (null == wxBillAll) { +// wxBillAll = new WxBillAll(); +// } +// //默认查当月第一天到今天 +// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ +// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// Map result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); +// return new ResultData(result); +// } +// +// +// +// @GetMapping("oweBillCount") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "contractId", value = "合同id", dataType = "long", paramType = "query", required = true), +// @ApiImplicitParam(name = "type", value = "类型1租赁合同2物业合同", dataType = "int", paramType = "query", required = true)}) +// @SystemControllerLog(description = "账单总览-总额") +// public ResultData oweBillCount(Long contractId, Integer type) { +// Long count = wxBillAllService.hasOweBill(contractId, type); +// return new ResultData(count); +// } +// +// @GetMapping("list") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), +// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) +// @SystemControllerLog(description = "账单总览-列表") +// public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); +// wxBillAll.updateTenantInfo(getTenantInfo()); +// if (null == wxBillAll) { +// wxBillAll = new WxBillAll(); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ +// wxBillAll.setStatusList(new ArrayList<>()); +// JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); +// for (int i = 0; i ()); +// JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr()); +// for (int i = 0; i result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize); +// return new ResultData(result); +// } +// +// @GetMapping("detail") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true), +// @ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)}) +// public ResultData detail( Long id, Integer type) { +// Map result = wxBillAllService.detail(id, type); +// Long merchantId = (Long) result.get("merchantId"); +// WxMerchant merchant = wxMerchantService.getById(merchantId); +// if (null != merchant) { +// result.put("merchantName", merchant.getName()); +// } +// return new ResultData(result); +// } +// +// @GetMapping("allDepositList") +// @SystemControllerLog(description = "账单总览-所有押金列表") +// public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList"); +// if (null == wxBillAll) { +// wxBillAll = new WxBillAll(); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// return new ResultData(wxBillAllService.allDepositList(wxBillAll)); +// } // @GetMapping("getBillInfo") @@ -678,86 +720,86 @@ public class WxBillAllController extends BillBaseController { // } - /** - * 应收、承付商户列表 - * @param wxBillAll - * @param pageNum - * @param pageSize - * @return - */ - @GetMapping("receiveAndPayMerchantlist") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "账单管理-应收、承付商户列表") - @ApiOperation("应收、承付商户列表") - public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); - if (null == wxBillAll) { - wxBillAll = new WxBillAll(); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - PageInfo page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); - Map result = new HashMap<>(); - result.put("pageInfo", page); - return new ResultData(result); - } - - /** - * 导出应收、承付商户列表 - * @param wxBillAll - * @return - */ - @GetMapping("exportReceiveAndPayMerchantlist") - @SystemControllerLog(description = "账单管理-导出应收、承付商户列表") - @ApiOperation("导出应收、承付商户列表") - public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist"); - if (null == wxBillAll) { - wxBillAll = new WxBillAll(); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); - } - - - @ApiOperation("导出欠缴商户列表") - @GetMapping("/exportOweMerchantlist") - @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") - public void exportOweMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweMerchantlist"); - if (null == wxBillAll){ - wxBillAll = new WxBillAll(); - } - //默认查当月第一天到今天 - if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ - wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - wxBillAllService.exportOweMerchant(wxBillAll, request, response); - } - - @ApiOperation("导出待缴商户列表") - @GetMapping("/exportWaitMerchantlist") - @SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出") - public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist"); - if (null == wxBillAll){ - wxBillAll = new WxBillAll(); - } - //默认查当月第一天到今天 - if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ - wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); - } - wxBillAll.updateTenantInfo(getTenantInfo()); - wxBillAllService.exportWaitMerchant(wxBillAll, request, response); - } - - @GetMapping("exportTemplate") - @SystemControllerLog(description = "账单-导出模板") - public void exportTemplate(@ModelAttribute WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxBillAllController::exportTemplate"); - wxBillAllService.exportTemplate(wxBillExcelTemplate, request, response); - } +// /** +// * 应收、承付商户列表 +// * @param wxBillAll +// * @param pageNum +// * @param pageSize +// * @return +// */ +// @GetMapping("receiveAndPayMerchantlist") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), +// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) +// @SystemControllerLog(description = "账单管理-应收、承付商户列表") +// @ApiOperation("应收、承付商户列表") +// public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); +// if (null == wxBillAll) { +// wxBillAll = new WxBillAll(); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// PageInfo page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); +// Map result = new HashMap<>(); +// result.put("pageInfo", page); +// return new ResultData(result); +// } +// +// /** +// * 导出应收、承付商户列表 +// * @param wxBillAll +// * @return +// */ +// @GetMapping("exportReceiveAndPayMerchantlist") +// @SystemControllerLog(description = "账单管理-导出应收、承付商户列表") +// @ApiOperation("导出应收、承付商户列表") +// public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist"); +// if (null == wxBillAll) { +// wxBillAll = new WxBillAll(); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); +// } +// +// +// @ApiOperation("导出欠缴商户列表") +// @GetMapping("/exportOweMerchantlist") +// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") +// public void exportOweMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweMerchantlist"); +// if (null == wxBillAll){ +// wxBillAll = new WxBillAll(); +// } +// //默认查当月第一天到今天 +// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ +// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// wxBillAllService.exportOweMerchant(wxBillAll, request, response); +// } +// +// @ApiOperation("导出待缴商户列表") +// @GetMapping("/exportWaitMerchantlist") +// @SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出") +// public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist"); +// if (null == wxBillAll){ +// wxBillAll = new WxBillAll(); +// } +// //默认查当月第一天到今天 +// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ +// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); +// } +// wxBillAll.updateTenantInfo(getTenantInfo()); +// wxBillAllService.exportWaitMerchant(wxBillAll, request, response); +// } +// +// @GetMapping("exportTemplate") +// @SystemControllerLog(description = "账单-导出模板") +// public void exportTemplate(@ModelAttribute WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response) { +// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportTemplate"); +// wxBillAllService.exportTemplate(wxBillExcelTemplate, request, response); +// } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java index 89b6fdd16..f1fd4733b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java @@ -42,7 +42,7 @@ public class WxBillAction extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "手机号", name = "phone") private String phone; - @io.swagger.annotations.ApiModelProperty(value = "动作", name = "action") + @io.swagger.annotations.ApiModelProperty(value = "动作 EnumBillAction", name = "action") private Integer action; @io.swagger.annotations.ApiModelProperty(value = "描述", name = "details") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillJianMian.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillJianMian.java new file mode 100644 index 000000000..130255e4c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillJianMian.java @@ -0,0 +1,32 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; + +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.enums.EnumBillAllType; + +@Data +public class WxBillJianMian implements Serializable { + + private static final long serialVersionUID = 1L; + + //账单类型 + private Integer billType; + @TableField(exist = false) + private String billTypeName; + //减免总金额 + private String total = "0"; + + public String getBillTypeName() { + if (null != billType) { + return EnumBillAllType.getEnum(billType).getMessage(); + } + return ""; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java index ba72c0645..63a12fb0d 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java @@ -7,14 +7,11 @@ package com.iformall.enums; public enum EnumBillAction { SELF_SERVICE_PAY(1, "自助缴费"), - UPDATE_BILL(2, "变更账单"), + UPDATE_BILL(2, "账单金额变更"), OFFLINE_PAY(3, "线下缴费"), - DEPOSIT_PAY(4, "押金缴费"), DEPOSIT_RETURN(5, "押金退款"), - DEPOSIT_MODIFY(6, "押金变更"), - IMPORT_PAY(10, "导入缴费"), + //IMPORT_PAY(10, "导入缴费"), UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"), - UPDATE_SETTLE_MONEY(8, "结算单清算"), UPDATE_SERVICE_MONEY(9, "手续费变更"), NOTIFY(10,"催缴"); @@ -61,16 +58,10 @@ public enum EnumBillAction { sb.append(pw.getMessage()).append("支付"); } sb.append(newMoney).append("元"); - }else if (code.intValue() == DEPOSIT_PAY.code.intValue()) { - sb.append(newMoney).append("元"); }else if (code.intValue() == DEPOSIT_RETURN.code.intValue()) { sb.append(newMoney).append("元"); - }else if (code.intValue() == DEPOSIT_MODIFY.code.intValue()) { - sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); }else if (code.intValue() == UPDATE_LATE_PAY_MONEY.code.intValue()) { sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); - }else if (code.intValue() == UPDATE_SETTLE_MONEY.code.intValue()) { - sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); }else if (code.intValue() == UPDATE_SERVICE_MONEY.code.intValue()) { sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); }else if (code.intValue() == NOTIFY.code.intValue()) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java index 639ed8c82..6c6d87b49 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxShop; +import com.iformall.domain.vo.WxBillJianMian; import java.util.List; @@ -14,4 +15,6 @@ public interface WxBillActionMapper extends CommonMapper { List findList(WxBillAction wxBillAction); List findBillActionList(WxBillAction wxBillAction); + + List findJianMian(WxBillAction record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java b/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java index 67fb4b9c1..da4ca123b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.vo.WxBillJianMian; import java.util.List; @@ -21,4 +22,6 @@ public interface WxBillActionService { int modifyBill(WxBillAction wxBillAction, WxMerchantBUser bUser); List find(WxBillAction record); + + List findJianMian(WxBillAction record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java index 1499054f2..f8932f93d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillJianMian; import com.iformall.mapper.WxBillActionMapper; import com.iformall.service.WxBillActionService; import org.slf4j.Logger; @@ -83,4 +84,9 @@ public class WxBillActionServiceImpl implements WxBillActionService { return modifyBillByUser(bUser,action,bUser.getId(),bUser.getName(),bUser.getPhone()); } + @Override + public List findJianMian(WxBillAction record) { + return wxBillActionMapper.findJianMian(record); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 31d1e1d7b..f0def32c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1847,15 +1847,15 @@ public class WxBillAllServiceImpl implements WxBillAllService { // stringRedisTemplate.expire(importKey, 10, TimeUnit.SECONDS); } - public void addActionImport(Long billId, String payWay, Date payDate, MallUserInfo user, String pay) { - WxBillAction wxBillAction = new WxBillAction(); - wxBillAction.setBillId(billId); - String details = StringUtils.isEmpty(payWay) ? "其他缴费" : payWay + "缴费"; - wxBillAction.setDetails(details + pay + "元"); - wxBillAction.setAction(EnumBillAction.IMPORT_PAY.getCode()); - wxBillAction.setPayDate(payDate); - wxBillActionService.modifyBill(wxBillAction, user); - } +// public void addActionImport(Long billId, String payWay, Date payDate, MallUserInfo user, String pay) { +// WxBillAction wxBillAction = new WxBillAction(); +// wxBillAction.setBillId(billId); +// String details = StringUtils.isEmpty(payWay) ? "其他缴费" : payWay + "缴费"; +// wxBillAction.setDetails(details + pay + "元"); +// wxBillAction.setAction(EnumBillAction.IMPORT_PAY.getCode()); +// wxBillAction.setPayDate(payDate); +// wxBillActionService.modifyBill(wxBillAction, user); +// } public void updateDailyBill(Long businessId, String newPrice, Date updateDate,boolean forcePaid) { // WxBillDaily dbBill = wxBillDailyMapper.selectById(businessId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 9e406b8d5..74615feae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -431,7 +431,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil billDepositNewPrce = dbBill.getPay(); wxBillDepositMapper.updateById(wxBillDeposit); String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; - this.addBillAction(EnumBillAction.DEPOSIT_MODIFY, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, + this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, billDepositNewPrce,payDate, null, remark, user); }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { wxBillDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); @@ -449,7 +449,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; } wxBillDepositMapper.updateById(wxBillDeposit); - this.addBillAction(EnumBillAction.DEPOSIT_MODIFY, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, + this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, billDepositNewPrce,payDate,payWay,remark, user); } diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index 0c053ebbb..b31ea6ed6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -52,9 +52,13 @@ and `bill_id` = #{billId} - - - and `createtime` BETWEEN startDate and endDate + + + and `createtime` >= #{startDate} + + + + and `createtime` <= #{endDate} @@ -80,6 +84,21 @@ from wx_bill_action - + + + + + +