From 545cd38cdac4dd4256a4392f1be68e01abbad4a6 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 13 Apr 2023 22:15:51 +0800 Subject: [PATCH] fix bug --- .../iformall/service/impl/WxMerchantTradeDailyServiceImpl.java | 1 + .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index e90f5cd50..ef83b365b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -351,6 +351,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ private void checkTradeDaily(WxMerchantTradeDaily tradeDaily) throws MallinkException { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); + wxMerchantTradeDaily.setIgnoreId(tradeDaily.getIgnoreId()); String errormsg = "解单数据已存在"; if (tradeDaily.getDateType().intValue() == EnumTradeDailyDateType.DAY.getCode().intValue()) { //按日还要查询按月的有没有 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 212612a81..a4a98554f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3296,7 +3296,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { BigDecimal servicePay = new BigDecimal(br.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); br.setServiceChargePay(servicePay.intValue()); br.setOwe(br.getReceivePay() + br.getServiceChargePay()); - br.setComments("原金额["+oldNeedPay+"(分)]小于解单金额,系统自动更新"); + br.setComments("原金额["+oldNeedPay+"(分)]小于解单["+oldNeedPay+"(分)],系统自动更新"); wxBillRentMapper.updateById(br); } }catch(Exception e) {