|
|
|
@@ -405,25 +405,6 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill |
|
|
|
wxBillRent.updateTenantInfo(dto); |
|
|
|
wxBillRent.setUpdatetime(new Date()); |
|
|
|
wxBillRent.setReturnPay(oldpay.add(new BigDecimal(dto.getPayToMerchant())).toPlainString()); |
|
|
|
//如果屎押金 |
|
|
|
boolean isDeposit = false; |
|
|
|
for (EnumBillAllType dep : EnumBillAllType.getDepositTypes()) { |
|
|
|
if (dbBill.getBillType().intValue() == dep.getCode().intValue()) { |
|
|
|
isDeposit = true; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (isDeposit) { |
|
|
|
String setoff = dbBill.getSetOff(); |
|
|
|
if (StringUtils.isBlank(setoff)) { |
|
|
|
setoff = "0"; |
|
|
|
} |
|
|
|
String pay = dbBill.getPay(); |
|
|
|
if (StringUtils.isBlank(pay)) { |
|
|
|
pay = "0"; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
wxAllBillMapper.updateById(wxBillRent); |
|
|
|
this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(), |
|
|
|
dto.getAddpay(), dto.getAddpay(),null,wxBillRent.getPayDate(),dto.getPayWay(),dto.getPayWayName(), |
|
|
|
|