From 8fb39b8f983c0f940a69e4ee1878b23ff508d57e Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Fri, 5 Aug 2022 19:02:57 +0800 Subject: [PATCH] fix bill --- .../controller/rent/WxBillAllController.java | 9 +++ .../com/iformall/mapper/WxBillAllMapper.java | 9 ++- .../iformall/service/WxBillAllService.java | 2 + .../service/impl/WxBillAllServiceImpl.java | 24 +++++++- .../main/resources/mapper/WxBillAllMapper.xml | 58 +++++++++++++++++++ 5 files changed, 99 insertions(+), 3 deletions(-) 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 524449900..c95782f09 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -78,6 +78,15 @@ public class WxBillAllController extends BaseController { Map 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); + return new ResultData(result); + } @GetMapping("allDepositList") @SystemControllerLog(description = "账单总览-所有押金列表") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 5c754e716..8375d98f0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -27,7 +27,6 @@ public interface WxBillAllMapper { List listOtherBill(WxBillAll record); List listOtherDepositBill(WxBillAll record); - Map queryOweInfo(WxBillAll record); Map queryPaidInfo(WxBillAll record); @@ -41,6 +40,14 @@ public interface WxBillAllMapper { List> listOtherDepositBillData(WxBillAll wxBillAll); List> listSettleBillData(WxBillAll wxBillAll); + Map detailRentBillData(@Param("id")Long id); + Map detailRentDepositBillData(@Param("id")Long id); + Map detailPropertyBillData(@Param("id")Long id); + Map detailPropertyDepositBillData(@Param("id")Long id); + Map detailDailyBillData(@Param("id")Long id); + Map detailOtherBillData(@Param("id")Long id); + Map detailOtherDepositBillData(@Param("id")Long id); + List> getWaitPayBill(); List> getOweBill(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 3692ccbc1..5cc024ffa 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -29,6 +29,8 @@ public interface WxBillAllService { ResultData pageListBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay); List> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay); + Map detail(Long id,Integer type); + void updateBill(Map bill); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll); 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 baefff110..0f3dbc54b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -244,7 +244,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } return retList; } - + public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) { if (e.getReceivePay() != null) { if (e.getLatePayPrice() == null) { @@ -365,7 +365,27 @@ public class WxBillAllServiceImpl implements WxBillAllService { return maps; } - + @Override + public Map detail(Long id,Integer type) { + if (type.equals(EnumBillQueryType.RENT.getCode())) { + return wxBillAllMapper.detailRentBillData(id); + } else if (type.equals(EnumBillQueryType.RENT_DEPOSIT.getCode())) { + return wxBillAllMapper.detailRentDepositBillData(id); + } else if (type.equals(EnumBillQueryType.PROPERTY.getCode())) { + return wxBillAllMapper.detailPropertyBillData(id); + } else if (type.equals(EnumBillQueryType.PROPERTY_DEPOSIT.getCode())) { + return wxBillAllMapper.detailPropertyDepositBillData(id); + } else if (type.equals(EnumBillQueryType.WATER_POWER_AIR.getCode())) { + return wxBillAllMapper.detailDailyBillData(id); + } else if (type.equals(EnumBillQueryType.OTHER.getCode())) { + return wxBillAllMapper.detailOtherBillData(id); + } else if (type.equals(EnumBillQueryType.OTHER_DEPOSIT.getCode())) { + return wxBillAllMapper.detailOtherDepositBillData(id); + } + return null; + } + + @Override public void updateBill(Map bill) { int billTypeValue = ((Long) bill.get("billTypeValue")).intValue(); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index dc421d2a0..e86e96d6b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -384,7 +384,65 @@ from wx_bill_settle_schedule bill where bill.status >0 + + + + + + + + + + + + + +