Przeglądaj źródła

fix rent bill

release_toaliyun_real
zhengfangyuan 3 lat temu
rodzic
commit
2e44853aed
6 zmienionych plików z 26 dodań i 12 usunięć
  1. +4
    -0
      mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  5. +12
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  6. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 4
- 0
mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql Wyświetl plik

@@ -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 '商户证书密钥文件';

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java Wyświetl plik

@@ -48,6 +48,9 @@ public class WxBillSettleBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime")
private Date endtime; private Date endtime;


@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="付款截图",name="payImg")
private String payImg;


@TableField(exist = false) @TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe") @io.swagger.annotations.ApiModelProperty(value="获取应收还是欠缴 0欠缴 1应收",name="getReceivePayOrOwe")


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Wyświetl plik

@@ -323,6 +323,8 @@ public class WxBillAllServiceImpl implements WxBillAllService {
} }
if (null != maps && hasSet) { if (null != maps && hasSet) {
for (Map<String, Object> map : maps) { for (Map<String, Object> map : maps) {
//判断是否有提交审批的
Integer billType = ((Long) map.get("billTypeValue")).intValue(); Integer billType = ((Long) map.get("billTypeValue")).intValue();
if (EnumBillType.SETTLE.getCode().equals(billType)) { if (EnumBillType.SETTLE.getCode().equals(billType)) {
Long id = (Long) map.get("id"); Long id = (Long) map.get("id");


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Wyświetl plik

@@ -312,6 +312,7 @@ public class WxBillRentServiceImpl implements WxBillRentService {
merchantTradeDaily.setMerchantId(billRent.getMerchantId()); merchantTradeDaily.setMerchantId(billRent.getMerchantId());
merchantTradeDaily.setStartTime(sd.format(billRent.getStarttime())); merchantTradeDaily.setStartTime(sd.format(billRent.getStarttime()));
merchantTradeDaily.setEndTime(sd.format(billRent.getEndtime())); merchantTradeDaily.setEndTime(sd.format(billRent.getEndtime()));
merchantTradeDaily.updateTenantInfo(wxRentContract);
Integer money = wxMerchantTradeDailyService.findSumMoney(merchantTradeDaily); Integer money = wxMerchantTradeDailyService.findSumMoney(merchantTradeDaily);
String moneyStr = new BigDecimal(money.toString()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString(); String moneyStr = new BigDecimal(money.toString()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString();
result.put("solutionBillMoney", moneyStr); result.put("solutionBillMoney", moneyStr);


+ 12
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java Wyświetl plik

@@ -172,9 +172,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillRent dbBill = wxBillRentMapper.selectById(wxBillRent.getId()); WxBillRent dbBill = wxBillRentMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -191,9 +191,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillDeposit dbBill = wxBillDepositMapper.selectById(wxBillRent.getId()); WxBillDeposit dbBill = wxBillDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -215,9 +215,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillOtherDeposit.setFreeze(freezeStatus); if(freezeStatus != null) wxBillOtherDeposit.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillOtherDeposit.setStatus(status); wxBillOtherDeposit.setStatus(status);
wxBillOtherDeposit.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillOtherDeposit.setPayDate(new Date());
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -239,9 +239,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){ if(status != null){
propertyDeposit.setStatus(status); propertyDeposit.setStatus(status);
propertyDeposit.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
propertyDeposit.setPayDate(new Date());
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -264,9 +264,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillProperty dbBill = wxBillPropertyMapper.selectById(wxBillRent.getId()); WxBillProperty dbBill = wxBillPropertyMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -283,9 +283,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){ if(status != null){
propertyDeposit.setStatus(status); propertyDeposit.setStatus(status);
propertyDeposit.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
propertyDeposit.setPayDate(new Date());
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -307,9 +307,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId()); WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -326,9 +326,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -358,9 +358,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId()); WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -382,9 +382,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillDaily.setFreeze(freezeStatus); if(freezeStatus != null) wxBillDaily.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillDaily.setStatus(status); wxBillDaily.setStatus(status);
wxBillDaily.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillDaily.setPayDate(new Date());
WxBillDaily dbBill = wxBillDailyMapper.selectById(wxBillDaily.getId()); WxBillDaily dbBill = wxBillDailyMapper.selectById(wxBillDaily.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -401,9 +401,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus); if(freezeStatus != null) wxBillRent.setFreeze(freezeStatus);
if(status != null){ if(status != null){
wxBillRent.setStatus(status); wxBillRent.setStatus(status);
wxBillRent.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
wxBillRent.setPayDate(new Date());
WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId()); WxBillOther dbBill = wxBillOtherMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
if(dbBill.getPay() == null) dbBill.setPay(0l); if(dbBill.getPay() == null) dbBill.setPay(0l);
@@ -420,9 +420,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus);
if(status != null){ if(status != null){
propertyDeposit.setStatus(status); propertyDeposit.setStatus(status);
propertyDeposit.setPayDate(new Date());
} }
if(EnumBillRentStatus.PAID.getCode().equals(status)){ if(EnumBillRentStatus.PAID.getCode().equals(status)){
propertyDeposit.setPayDate(new Date());
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId()); WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(wxBillRent.getId());
if(dbBill!=null) { if(dbBill!=null) {
propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay());


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Wyświetl plik

@@ -354,6 +354,10 @@ public class WxFlowServiceImpl implements WxFlowService {
WxBillSettleBill settleBill = new WxBillSettleBill(); WxBillSettleBill settleBill = new WxBillSettleBill();
settleBill.setBillType(billType); settleBill.setBillType(billType);
settleBill.setBillId(Long.parseLong(businessId)); settleBill.setBillId(Long.parseLong(businessId));
if (EnumFlowKey.BILL_FINISH.getCode().equals(flowType)) {
String payImg = (String)getVariableByKey(variables, "payImg");
settleBill.setPayImg(payImg);
}
billList.add(settleBill); billList.add(settleBill);
wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.YES.getCode(),null); wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.YES.getCode(),null);
}else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) {


Ładowanie…
Anuluj
Zapisz