From 1c7833e12c05858126b2fab89063bd09dedd20aa Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 23 Jun 2024 21:51:07 +0800 Subject: [PATCH] fix --- .../controller/rent/WxBillAllController.java | 35 ++++++++++++++++++- .../com/iformall/domain/vo/WxBillBad.java | 32 +++++++++++++++++ .../com/iformall/enums/EnumBillAction.java | 5 ++- .../iformall/mapper/WxBillActionMapper.java | 3 ++ .../iformall/service/WxBillActionService.java | 3 ++ .../iformall/service/WxBillDailyService.java | 1 + .../service/WxBillDepositService.java | 1 + .../service/WxBillOtherDepositService.java | 1 + .../iformall/service/WxBillOtherService.java | 2 ++ .../service/WxBillPropertyDepositService.java | 1 + .../service/WxBillPropertyService.java | 1 + .../service/WxBillRentManageService.java | 1 + .../iformall/service/WxBillRentService.java | 2 +- .../service/helper/WxBillAllHelper.java | 22 ++++++++++++ .../service/impl/WxBillActionServiceImpl.java | 6 ++++ .../service/impl/WxBillDailyServiceImpl.java | 14 ++++++++ .../impl/WxBillDepositServiceImpl.java | 14 ++++++++ .../impl/WxBillOtherDepositServiceImpl.java | 14 ++++++++ .../service/impl/WxBillOtherServiceImpl.java | 14 ++++++++ .../WxBillPropertyDepositServiceImpl.java | 14 ++++++++ .../impl/WxBillPropertyServiceImpl.java | 14 ++++++++ .../impl/WxBillRentManageServiceImpl.java | 14 ++++++++ .../service/impl/WxBillRentServiceImpl.java | 14 ++++++++ .../resources/mapper/WxBillActionMapper.xml | 16 +++++++++ .../resources/mapper/WxBillDailyMapper.xml | 8 ++--- .../resources/mapper/WxBillDepositMapper.xml | 12 +++---- .../mapper/WxBillOtherDepositMapper.xml | 8 ++--- .../resources/mapper/WxBillOtherMapper.xml | 8 ++--- .../mapper/WxBillPropertyDepositMapper.xml | 8 ++--- .../resources/mapper/WxBillPropertyMapper.xml | 8 ++--- .../mapper/WxBillRentManageMapper.xml | 8 ++--- .../resources/mapper/WxBillRentMapper.xml | 8 ++--- 32 files changed, 275 insertions(+), 37 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxBillBad.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 97338201f..3381df541 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.WxBillBaseEntity; import com.iformall.domain.vo.WxBillAll; +import com.iformall.domain.vo.WxBillBad; import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.domain.vo.WxBillHotNotify; import com.iformall.domain.vo.WxBillJianMian; @@ -617,11 +618,43 @@ public class WxBillAllController extends BillBaseController { if (dto.getBillTypeValue().intValue() == Constant.bill_all_type_manage_fee) { dto.setBillTypeValue(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); } - billAllHelper.returnDeposit(dto, getUser()); + billAllHelper.bad(dto, getUser()); return new ResultData(); //return wxBillAllService.updateReceivePay(wxBillAll, getUser(),false); } + //坏账统计 + @GetMapping("badtj") + public ResultData badtj(@ModelAttribute WxBillAction wxBillAction) { + wxBillAction.updateTenantInfo(getTenantInfo()); + List jList = wxBillActionService.findBad(wxBillAction); + Map map = new HashMap(); + if (null != jList && jList.size() > 0 ) { + for (int i = 0 ; i < jList.size() ; i++) { + WxBillBad jm = jList.get(i); + map.put(jm.getBillType(), jm.getTotal()); + } + } + Map retMap = new HashMap(); + BigDecimal total = new BigDecimal("0.00"); + List retList = new ArrayList(); + for (EnumBillAllType at : EnumBillAllType.values()) { + String money = map.get(at.getCode()); + if (StringUtils.isBlank(money)) { + money = "0.00"; + } + WxBillBad bjm = new WxBillBad(); + bjm.setBillType(at.getCode()); + bjm.setTotal(money); + retList.add(bjm); + total = total.add(new BigDecimal(money)); + } + + retMap.put("total", total.toPlainString()); + retMap.put("list", retList); + return new ResultData(retMap); + } + //###################################### 老代码 ###################################### // diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillBad.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillBad.java new file mode 100644 index 000000000..68fdef866 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillBad.java @@ -0,0 +1,32 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; + +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.enums.EnumBillAllType; + +@Data +public class WxBillBad implements Serializable { + + private static final long serialVersionUID = 1L; + + //账单类型 + private Integer billType; + @TableField(exist = false) + private String billTypeName; + //减免总金额 + private String total = "0"; + + public String getBillTypeName() { + if (null != billType) { + return EnumBillAllType.getEnum(billType).getMessage(); + } + return ""; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java index 5194364a7..a3720e88a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java @@ -13,7 +13,8 @@ public enum EnumBillAction { //IMPORT_PAY(10, "导入缴费"), UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"), UPDATE_SERVICE_MONEY(9, "手续费变更"), - NOTIFY(10,"催缴"); + NOTIFY(10,"催缴"), + BAD(11,"坏账"); public static EnumBillAction getEnum(Integer code) { for (EnumBillAction value : values()) { @@ -66,6 +67,8 @@ public enum EnumBillAction { sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); }else if (code.intValue() == NOTIFY.code.intValue()) { sb.append("在线催缴通知"); + }else if (code.intValue() == BAD.code.intValue()){ + sb.append("欠缴金额").append(oldMoney).append("元"); }else { sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java index 6c6d87b49..f0e5d4b57 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillActionMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxShop; +import com.iformall.domain.vo.WxBillBad; import com.iformall.domain.vo.WxBillJianMian; import java.util.List; @@ -17,4 +18,6 @@ public interface WxBillActionMapper extends CommonMapper { List findBillActionList(WxBillAction wxBillAction); List findJianMian(WxBillAction record); + + List findBad(WxBillAction record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java b/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java index da4ca123b..9d0937dcf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillActionService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.vo.WxBillBad; import com.iformall.domain.vo.WxBillJianMian; import java.util.List; @@ -24,4 +25,6 @@ public interface WxBillActionService { List find(WxBillAction record); List findJianMian(WxBillAction record); + + List findBad(WxBillAction record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index 6ab076774..e2455384e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -80,5 +80,6 @@ public interface WxBillDailyService { public void notify(WxBillPayDTO dto, MallUserInfo user); public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); + public void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index d2654aaf3..d3ccf1030 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -83,5 +83,6 @@ public interface WxBillDepositService { public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); public void returnDeposit(WxBillPayDTO dto, MallUserInfo user); + public void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index 5d9adee3b..21b89b3f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -80,4 +80,5 @@ public interface WxBillOtherDepositService { public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); public void returnDeposit(WxBillPayDTO dto, MallUserInfo user); + public void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java index eec6b2440..d9ffb78f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java @@ -75,4 +75,6 @@ public interface WxBillOtherService { public void notify(WxBillPayDTO dto, MallUserInfo user); public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user ,boolean isOnline); + public void bad(WxBillPayDTO dto,MallUserInfo user); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index aa781f30a..d8cb40da5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -85,4 +85,5 @@ public interface WxBillPropertyDepositService { public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); public void returnDeposit(WxBillPayDTO dto, MallUserInfo user); + public void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 916cf4bac..467f8aca7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -90,4 +90,5 @@ public interface WxBillPropertyService { public void notify(WxBillPayDTO dto, MallUserInfo user); public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); + public void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java index ab13a6485..6f6477fd3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java @@ -90,4 +90,5 @@ public interface WxBillRentManageService { public void notify(WxBillPayDTO dto, MallUserInfo user); public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); + public void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 39e0f38f4..7201b8f26 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -91,6 +91,6 @@ public interface WxBillRentService { void notify(WxBillPayDTO dto,MallUserInfo user); void updatePay(WxBillPayDTO dto,MallUserInfo user); void updatePayByMerchant(WxBillPayDTO dto,WxMerchantBUser user,boolean isOnline); - + void bad(WxBillPayDTO dto,MallUserInfo user); } diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index dd6843bd3..0fcd7d286 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -927,4 +927,26 @@ public class WxBillAllHelper { wxBillOtherDepositService.returnDeposit(dto, user); } } + + public void bad(WxBillPayDTO dto,MallUserInfo user) { + if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT.getCode().intValue()) { + wxBillRentService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode().intValue()) { + wxBillRentManageService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_OPERATION_MANAGE.getCode().intValue()) { + wxBillRentManageService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_DEPOSIT.getCode().intValue()) { + wxBillRentDepositService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.PROPERTY.getCode().intValue()) { + wxBillPropertyService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.PROPERTY_DEPOSIT.getCode().intValue()) { + wxBillPropertyDepositService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.DAILY.getCode().intValue()) { + wxBillDailyService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { + wxBillOtherService.bad(dto, user); + }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { + wxBillOtherDepositService.bad(dto, user); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java index f8932f93d..cfd748da8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillBad; import com.iformall.domain.vo.WxBillJianMian; import com.iformall.mapper.WxBillActionMapper; import com.iformall.service.WxBillActionService; @@ -89,4 +90,9 @@ public class WxBillActionServiceImpl implements WxBillActionService { return wxBillActionMapper.findJianMian(record); } + @Override + public List findBad(WxBillAction record) { + return wxBillActionMapper.findBad(record); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 7a749af71..b17505e86 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -598,5 +598,19 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillDaily dbBill = wxBillDailyMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillDaily wxBillRent = new WxBillDaily(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillDailyMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 7ee028056..04e97cec6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -553,5 +553,19 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil this.addBillAction(EnumBillAction.DEPOSIT_RETURN, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillDeposit dbBill = wxBillDepositMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillDeposit wxBillRent = new WxBillDeposit(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillDepositMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 7051b45b5..3fbd51a2b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -556,5 +556,19 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements this.addBillAction(EnumBillAction.DEPOSIT_RETURN, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillOtherDepositMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index d1aba8033..5227a61c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -482,4 +482,18 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillOther dbBill = wxBillOtherMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillOther wxBillRent = new WxBillOther(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillOtherMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index b7bd2fc1f..3c3e14eb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -532,6 +532,20 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen this.addBillAction(EnumBillAction.DEPOSIT_RETURN, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillPropertyDeposit wxBillRent = new WxBillPropertyDeposit(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillPropertyDepositMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 7f173cf6d..97f4eeb94 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -623,4 +623,18 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillProperty dbBill = wxBillPropertyMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillProperty wxBillRent = new WxBillProperty(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillPropertyMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 15081b08e..f11ea8bfd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -553,5 +553,19 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillRentManage dbBill = wxBillRentManageMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillRentManage wxBillRent = new WxBillRentManage(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillRentManageMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } 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 298db5766..b72e86b9d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -717,4 +717,18 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe this.addBillAction(action, dto.getBillTypeValue(),dto.getId(), dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); } + + @Override + public void bad(WxBillPayDTO dto, MallUserInfo user) { + WxBillRent dbBill = wxBillRentMapper.selectById(dto.getId(),dto.getTenantId()); + WxBillRent wxBillRent = new WxBillRent(); + wxBillRent.setId(dto.getId()); + wxBillRent.updateTenantInfo(dto); + wxBillRent.setUpdatetime(new Date()); + wxBillRent.setStatus(EnumBillStatus.BAD.getCode()); + wxBillRentMapper.updateById(wxBillRent); + String badMoney = dbBill.getOwe(); + this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), + badMoney, badMoney,null,null,dto.getRemark(), user); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index b31ea6ed6..a26e88264 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -100,5 +100,21 @@ group by bill_type + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 8a4c159d9..b17653540 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -67,7 +67,7 @@ and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} and `build_way` = #{buildWay} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and id in @@ -116,13 +116,13 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) and br.`build_way` = #{buildWay} - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 1af3c1ffe..0d93f30ce 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -77,12 +77,12 @@ and date_format(starttime,'%Y-%m') <= #{month} and date_format(endtime,'%Y-%m') >= #{month} - and (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` > 0 and status not in (3,6)) + and (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` > 0 and status not in (3,6,7)) - and (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and status not in (3,6)) + and (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and status not in (3,6,7)) - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and `merchant_id` in @@ -154,12 +154,12 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index c79ec0104..eb8f52d3c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -69,7 +69,7 @@ and `name` = #{name} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and id in @@ -121,12 +121,12 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 94bc02ba5..9decd1f7e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -67,7 +67,7 @@ and `name` = #{name} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and id in @@ -114,12 +114,12 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 7e346eb40..f41e1737e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -68,7 +68,7 @@ and `updatetime` = #{updatetime} and `rent_shop_type` = #{rentShopType} and `pay_way` = #{payWay} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and property_contract_id in @@ -121,12 +121,12 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 574342300..ef2eeb5ab 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -84,7 +84,7 @@ and is_preview = #{isPreview} and `pay_way` = #{payWay} and `late_pay_status` = #{latePayStatus} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and property_contract_id in @@ -140,17 +140,17 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) and br.`rent_shop_type` = #{rentShopType} and br.`property_contract_id` = #{propertyContractId} and br.`pay_way` = #{payWay} and br.`late_pay_status` = #{latePayStatus} and br.`late_pay_status` = #{latePayStatus} - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.property_contract_id in diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index b70b9f8e3..c0725e094 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -75,7 +75,7 @@ and `pay_way` = #{payWay} and `late_pay_status` = #{latePayStatus} and `manage_fee_type` = #{manageFeeType} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and merchant_id in @@ -128,14 +128,14 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) and br.`manage_fee_type` = #{manageFeeType} and br.`merchant_id` is not null - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.merchant_id in diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 627d8aad9..2368a8a0f 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -102,7 +102,7 @@ and endtime < #{endtimeEnd} - and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6) ) + and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) and id in @@ -147,12 +147,12 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) + and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) - and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) + and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) - and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) ) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`rent_contract_id` in