From 5cd8503ef1890dd4492a5e0e1b3e69db35eb05af Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 30 Aug 2019 15:47:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rent/WxBillAllController.java | 11 +++++++++ .../com/iformall/mapper/WxBillAllMapper.java | 2 ++ .../iformall/service/WxBillAllService.java | 2 ++ .../service/impl/WxBillAllServiceImpl.java | 4 ++++ .../service/impl/WxBillSettleServiceImpl.java | 20 ++++++++-------- .../service/impl/WxFlowServiceImpl.java | 12 ++++++++++ .../main/resources/mapper/WxBillAllMapper.xml | 23 +++++++++++++++++-- 7 files changed, 62 insertions(+), 12 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 695b757ee..dba261b37 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -55,6 +55,17 @@ public class WxBillAllController extends BaseController { 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.setTenantId(getTenantId()); + return new ResultData(wxBillAllService.allDepositList(wxBillAll)); + } + @GetMapping("exportBill") @SystemControllerLog(description = "账单总览-导出") public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 0badeabec..efd9b7078 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -51,4 +51,6 @@ public interface WxBillAllMapper { Map getReceiveAndPayBillDetail(WxBillAll record); + List> allDepositList(WxBillAll wxBillAll); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 847f04673..b7bc24054 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -17,6 +17,8 @@ import java.util.Map; */ public interface WxBillAllService { + List> allDepositList(WxBillAll wxBillAll); + Map listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); List> listBillOweAndWaitPay(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 6a978ec88..e2e69f20f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1633,4 +1633,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { excelService.exportExcel(list, null, name, WaitMerchantVo.class, name + ".xlsx", response, false); } + @Override + public List> allDepositList(WxBillAll wxBillAll) { + return wxBillAllMapper.allDepositList(wxBillAll); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index c0f7fa99e..f193e2589 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -69,42 +69,42 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { return billSettle; } - public void updateFreeze(List billList){ + public void updateFreeze(List billList,int status){ for (WxBillSettleBill bill:billList) { if(EnumBillType.RENT.getCode().equals(bill.getBillType())) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { WxBillDeposit wxBillRent = new WxBillDeposit(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); propertyDeposit.setId(bill.getBillId()); - propertyDeposit.setStatus(EnumBillRentStatus.FREEZE.getCode()); + propertyDeposit.setStatus(status); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); }else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); }else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); }else{ WxBillDaily wxBillRent = new WxBillDaily(); wxBillRent.setId(bill.getBillId()); - wxBillRent.setStatus(EnumBillRentStatus.FREEZE.getCode()); + wxBillRent.setStatus(status); wxBillDailyMapper.updateByPrimaryKeySelective(wxBillRent); } } @@ -132,8 +132,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //改为冻结状态 if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { - updateFreeze(record.getReceiveBillIds()); - updateFreeze(record.getPayBillIds()); + updateFreeze(record.getReceiveBillIds(),EnumBillRentStatus.FREEZE.getCode()); + updateFreeze(record.getPayBillIds(),EnumBillRentStatus.FREEZE.getCode()); } //启动审批流 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index d1ac5a745..1dca2761d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -86,6 +86,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxCouponService wxCouponService; @Autowired private WxRentContractMapper wxRentContractMapper; + @Autowired + private WxBillSettleMapper wxBillSettleMapper; /** * 获取流程key @@ -270,6 +272,16 @@ public class WxFlowServiceImpl implements WxFlowService { } wxCoupon.setApprovalType(operateType); wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); + }else if(EnumFlowKey.SETTLE.getCode().equals(flowType)){ + WxBillSettle wxBillSettle = new WxBillSettle(); + wxBillSettle.setId(businessId); + wxBillSettle.setApplyStatus(applyStatus); + wxBillSettleMapper.update(wxBillSettle); + + // 审批完成,账单解冻 + if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { + + } } } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8baca7a54..f2782fb1d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -746,8 +746,27 @@ order by m.id desc - - +