From 2e44853aed017a16e9c0c168a7936e04931e75e7 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Thu, 4 Aug 2022 17:48:39 +0800 Subject: [PATCH] fix rent bill --- .../db/migration/V20220804000001_bill.sql | 4 ++++ .../iformall/domain/po/WxBillSettleBill.java | 3 +++ .../service/impl/WxBillAllServiceImpl.java | 2 ++ .../service/impl/WxBillRentServiceImpl.java | 1 + .../service/impl/WxBillSettleServiceImpl.java | 24 +++++++++---------- .../service/impl/WxFlowServiceImpl.java | 4 ++++ 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql b/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql new file mode 100644 index 000000000..901cf5ad9 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql @@ -0,0 +1,4 @@ +alter table wx_pay_account change column private_cert_path private_cert_pem_path varchar(255); +alter table wx_pay_account add COLUMN `merchant_key_path` varchar(100) COMMENT '商户key证书路径'; +alter table wx_pay_account add COLUMN `merchant_apiv3_key` varchar(100) COMMENT '商户apiV3Key'; +alter table wx_pay_account add COLUMN `merchant_cert_pem_path` varchar(100) COMMENT '商户证书密钥文件'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java index a8dae7db4..022e07d92 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -48,6 +48,9 @@ public class WxBillSettleBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") private Date endtime; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="付款截图",name="payImg") + private String payImg; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe") 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 ce094998e..9c3ba462a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -323,6 +323,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { } if (null != maps && hasSet) { for (Map map : maps) { + //判断是否有提交审批的 + Integer billType = ((Long) map.get("billTypeValue")).intValue(); if (EnumBillType.SETTLE.getCode().equals(billType)) { Long id = (Long) map.get("id"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 5d9e36369..c693f82c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -312,6 +312,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { merchantTradeDaily.setMerchantId(billRent.getMerchantId()); merchantTradeDaily.setStartTime(sd.format(billRent.getStarttime())); merchantTradeDaily.setEndTime(sd.format(billRent.getEndtime())); + merchantTradeDaily.updateTenantInfo(wxRentContract); Integer money = wxMerchantTradeDailyService.findSumMoney(merchantTradeDaily); String moneyStr = new BigDecimal(money.toString()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString(); result.put("solutionBillMoney", moneyStr); 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 b66823e59..d967fdc08 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -172,9 +172,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillRent dbBill = wxBillRentMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -191,9 +191,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillDeposit dbBill = wxBillDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -215,9 +215,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillOtherDeposit.setFreeze(freezeStatus); if(status != null){ wxBillOtherDeposit.setStatus(status); - wxBillOtherDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillOtherDeposit.setPayDate(new Date()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -239,9 +239,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(status != null){ propertyDeposit.setStatus(status); - propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + propertyDeposit.setPayDate(new Date()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -264,9 +264,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillProperty dbBill = wxBillPropertyMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -283,9 +283,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(status != null){ propertyDeposit.setStatus(status); - propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + propertyDeposit.setPayDate(new Date()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -307,9 +307,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -326,9 +326,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -358,9 +358,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -382,9 +382,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillDaily.setFreeze(freezeStatus); if(status != null){ wxBillDaily.setStatus(status); - wxBillDaily.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillDaily.setPayDate(new Date()); WxBillDaily dbBill = wxBillDailyMapper.selectById(wxBillDaily.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -401,9 +401,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(status != null){ wxBillRent.setStatus(status); - wxBillRent.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + wxBillRent.setPayDate(new Date()); WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { if(dbBill.getPay() == null) dbBill.setPay(0l); @@ -420,9 +420,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(status != null){ propertyDeposit.setStatus(status); - propertyDeposit.setPayDate(new Date()); } if(EnumBillRentStatus.PAID.getCode().equals(status)){ + propertyDeposit.setPayDate(new Date()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); 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 049b190dc..0170eca99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -354,6 +354,10 @@ public class WxFlowServiceImpl implements WxFlowService { WxBillSettleBill settleBill = new WxBillSettleBill(); settleBill.setBillType(billType); settleBill.setBillId(Long.parseLong(businessId)); + if (EnumFlowKey.BILL_FINISH.getCode().equals(flowType)) { + String payImg = (String)getVariableByKey(variables, "payImg"); + settleBill.setPayImg(payImg); + } billList.add(settleBill); wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.YES.getCode(),null); }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) {