From c824006b3892ec0a1c460ef3b576b895b047b990 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 5 Jul 2025 11:17:41 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/mapper/WxAllBillMapper.java | 2 +- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 +++--- .../src/main/resources/mapper/WxAllBillMapper.xml | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java index 197702e7b..471b26a72 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java @@ -37,7 +37,7 @@ public interface WxAllBillMapper extends CommonMapper { Integer countValidBillCountByRentHuiSuan(WxAllBill wxBillRent); void deleteByRentReveneuSales(WxAllBill wxBillRent); - void setIsDel(@Param("tenantId")String tenantId, @Param("list")List ids, @Param("isDel")Integer isDel,@Param("oldIsDel")Integer oldIsDel); + void setIsDel(@Param("tenantId")String tenantId, @Param("list")List ids, @Param("isDel")Integer isDel,@Param("oldIsDel")Integer oldIsDel,@Param("remark")String remark); void setIsJoinRenevue(@Param("tenantId")String tenantId, @Param("isJoinRenevue")Integer isJoinRenevue, @Param("feesId")Long feesId,@Param("rentContractId")Long rentContractId); void updatePreviewStatus(WxAllBill record); 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 63139b593..63b362560 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1040,19 +1040,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { createNewBill = false; needpay = uneedPay.toPlainString(); //此处取高的比提成高,如果之前有将参与取高的账单设置为已删除,则需要恢复 - wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.NO.getCode(),EnumYesOrNo.YES.getCode()); + wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.NO.getCode(),EnumYesOrNo.YES.getCode(),""); }else { //取高比扣点低 if (null != dto.getBillIds() && dto.getBillIds().size() > 0 ) { //如果提成的比参与取高的款项高,将这些参与取高的账单设置为已删除 - wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null); + wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null,"录入销售额取高,该账单已删除"); } } }else { //无取高费用 if (null != dto.getBillIds() && dto.getBillIds().size() > 0 ) { //如果提成的比参与取高的款项高,将这些参与取高的账单设置为已删除 - wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null); + wxAllBillMapper.setIsDel(rentcontract.getTenantId(),dto.getBillIds(),EnumYesOrNo.YES.getCode(),null,"录入销售额取高,该账单已删除"); } } sb.append("取高后总金额为:["+needpay+"]."); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 587a733b8..067ed1e59 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -366,7 +366,11 @@ - update wx_all_bill set is_del = #{isDel} where id in + update wx_all_bill set is_del = #{isDel} + + , bill_remark = #{remark} + + where id in (#{item})