| @@ -498,6 +498,18 @@ public class WxBillAllController extends BillBaseController { | |||
| billAllHelper.exportOneBillOweWord(false,bill, request, response); | |||
| } | |||
| //提醒 | |||
| @PostMapping("notify") | |||
| public ResultData notify(@RequestBody WxBillPayDTO dto) { | |||
| dto.updateTenantInfo(getTenantInfo()); | |||
| //如果是管理费,默认一个商业管理费 | |||
| if (dto.getBillTypeValue().intValue() == Constant.bill_all_type_manage_fee) { | |||
| dto.setBillTypeValue(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | |||
| } | |||
| billAllHelper.notify(dto, getUser()); | |||
| return new ResultData(); | |||
| } | |||
| @PostMapping("updateReceivePay") | |||
| public ResultData updateReceivePay(@RequestBody WxBillReceiveUpdateDTO dto) { | |||
| dto.updateTenantInfo(getTenantInfo()); | |||
| @@ -1735,3 +1735,104 @@ alter table wx_bill_other_deposit_97 add column last_owe_call_time date | |||
| alter table wx_bill_other_deposit_98 add column last_owe_call_time datetime comment '最后催缴时间'; | |||
| alter table wx_bill_other_deposit_99 add column last_owe_call_time datetime comment '最后催缴时间'; | |||
| alter table wx_bill_rent_0 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_1 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_2 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_3 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_4 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_5 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_6 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_7 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_8 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_9 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_10 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_11 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_12 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_13 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_14 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_15 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_16 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_17 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_18 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_19 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_20 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_21 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_22 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_23 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_24 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_25 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_26 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_27 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_28 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_29 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_30 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_31 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_32 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_33 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_34 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_35 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_36 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_37 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_38 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_39 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_40 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_41 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_42 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_43 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_44 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_45 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_46 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_47 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_48 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_49 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_50 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_51 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_52 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_53 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_54 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_55 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_56 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_57 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_58 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_59 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_60 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_61 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_62 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_63 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_64 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_65 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_66 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_67 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_68 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_69 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_70 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_71 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_72 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_73 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_74 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_75 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_76 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_77 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_78 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_79 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_80 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_81 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_82 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_83 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_84 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_85 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_86 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_87 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_88 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_89 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_90 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_91 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_92 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_93 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_94 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_95 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_96 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_97 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_98 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_rent_99 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.common.SortColumn; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| @@ -104,4 +105,10 @@ public class WxBillDaily extends WxBillBaseEntity { | |||
| private String serviceChargePayUpdate; | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.DAILY.getCode(); | |||
| } | |||
| } | |||
| @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; | |||
| import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||
| import lombok.Data; | |||
| @@ -79,4 +80,10 @@ public class WxBillDeposit extends WxBillBaseEntity { | |||
| private List<Long> rentContractIdList; | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.RENT_DEPOSIT.getCode(); | |||
| } | |||
| } | |||
| @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.common.SortColumn; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| @@ -104,4 +105,10 @@ public class WxBillOther extends WxBillBaseEntity { | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.OTHER.getCode(); | |||
| } | |||
| } | |||
| @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.common.SortColumn; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| @@ -114,4 +115,10 @@ public class WxBillOtherDeposit extends WxBillBaseEntity { | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.OTHER_DEPOSIT.getCode(); | |||
| } | |||
| } | |||
| @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.common.SortColumn; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| @@ -143,4 +144,10 @@ public class WxBillProperty extends WxBillBaseEntity { | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.PROPERTY.getCode(); | |||
| } | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField; | |||
| import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||
| import lombok.Data; | |||
| @@ -93,4 +94,10 @@ public class WxBillPropertyDeposit extends WxBillBaseEntity { | |||
| return sb.toString(); | |||
| } | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.PROPERTY_DEPOSIT.getCode(); | |||
| } | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.common.SortColumn; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| @@ -85,6 +86,12 @@ public class WxBillRent extends WxBillBaseEntity { | |||
| } | |||
| return infoStr; | |||
| } | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| return EnumBillAllType.RENT.getCode(); | |||
| } | |||
| @io.swagger.annotations.ApiModelProperty(value="商业管理费应收金额",name="bussinessManageFeeNeedPay") | |||
| private String bussinessManageFeeNeedPay; | |||
| @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.iformall.common.SortColumn; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import com.iformall.enums.EnumRentContractManageFeeType; | |||
| import com.iformall.utils.Constant; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| @@ -145,6 +148,17 @@ public class WxBillRentManage extends WxBillBaseEntity { | |||
| this.latePayRatio = billRent.getLatePayRatio(); | |||
| } | |||
| //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 | |||
| @Override | |||
| public Integer getBillType() { | |||
| if (this.manageFeeType == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()) { | |||
| return EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode(); | |||
| }else if (this.manageFeeType == EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()) { | |||
| return EnumBillAllType.RENT_OPERATION_MANAGE.getCode(); | |||
| } | |||
| return Constant.bill_all_type_manage_fee; | |||
| } | |||
| @TableField(exist = false) | |||
| private List<Long> merchantIds; | |||
| @TableField(exist = false) | |||
| @@ -79,7 +79,9 @@ public class WxBillBaseEntity extends TenantEntity { | |||
| @Excel(name = "账单类型名称", width = 20, orderNum = "8") | |||
| @io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName") | |||
| protected String billTypeName; | |||
| @TableField(exist = false) | |||
| protected Integer billType; | |||
| @Excel(name = "备注", width = 20, orderNum = "9") | |||
| @io.swagger.annotations.ApiModelProperty(value="备注",name="billRemark") | |||
| protected String billRemark; | |||
| @@ -87,11 +89,15 @@ public class WxBillBaseEntity extends TenantEntity { | |||
| @Excel(name = "最近催缴时间",format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "10") | |||
| @io.swagger.annotations.ApiModelProperty(value="最近催缴时间",name="lastOweCallTime") | |||
| protected Date lastOweCallTime; | |||
| @Excel(name = "最近催缴人员", width = 20, orderNum = "11") | |||
| @io.swagger.annotations.ApiModelProperty(value="最近催缴时间",name="lastOweCallUser") | |||
| protected String lastOweCallUser; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | |||
| @TableField(exist = false) | |||
| protected Long building; | |||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | |||
| @TableField(exist = false) | |||
| protected Long floor; | |||
| @@ -15,7 +15,8 @@ public enum EnumBillAction { | |||
| IMPORT_PAY(10, "导入缴费"), | |||
| UPDATE_LATE_PAY_MONEY(7, "滞纳金变更"), | |||
| UPDATE_SETTLE_MONEY(8, "结算单清算"), | |||
| UPDATE_SERVICE_MONEY(9, "手续费变更"); | |||
| UPDATE_SERVICE_MONEY(9, "手续费变更"), | |||
| NOTIFY(10,"催缴"); | |||
| public static EnumBillAction getEnum(Integer code) { | |||
| for (EnumBillAction value : values()) { | |||
| @@ -62,6 +63,8 @@ public enum EnumBillAction { | |||
| sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); | |||
| }else if (code.intValue() == UPDATE_SERVICE_MONEY.code.intValue()) { | |||
| sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); | |||
| }else if (code.intValue() == NOTIFY.code.intValue()) { | |||
| sb.append("在线催缴通知"); | |||
| }else { | |||
| sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); | |||
| } | |||
| @@ -75,8 +75,8 @@ public interface WxBillDailyService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -77,6 +77,7 @@ public interface WxBillDepositService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| @@ -74,6 +74,7 @@ public interface WxBillOtherDepositService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -70,6 +70,7 @@ public interface WxBillOtherService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid) ; | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -79,6 +79,7 @@ public interface WxBillPropertyDepositService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -85,6 +85,7 @@ public interface WxBillPropertyService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -85,6 +85,7 @@ public interface WxBillRentManageService { | |||
| void updateReceivePay(WxBillReceiveUpdateDTO dto,MallUserInfo user,boolean forcePaid); | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -86,6 +86,7 @@ public interface WxBillRentService { | |||
| void updateReceivePay(WxBillReceiveUpdateDTO dto,MallUserInfo user,boolean forcePaid); | |||
| void notify(WxBillPayDTO dto,MallUserInfo user); | |||
| void updatePay(WxBillPayDTO dto,MallUserInfo user); | |||
| void updatePayByMerchant(WxBillPayDTO dto,WxMerchantBUser user); | |||
| @@ -688,6 +688,29 @@ public class WxBillAllHelper { | |||
| } | |||
| } | |||
| public void notify(WxBillPayDTO dto,MallUserInfo user) { | |||
| //TODO 发短信通知 | |||
| if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT.getCode().intValue()) { | |||
| wxBillRentService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode().intValue()) { | |||
| wxBillRentManageService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_OPERATION_MANAGE.getCode().intValue()) { | |||
| wxBillRentManageService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_DEPOSIT.getCode().intValue()) { | |||
| wxBillRentDepositService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.PROPERTY.getCode().intValue()) { | |||
| wxBillPropertyService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.PROPERTY_DEPOSIT.getCode().intValue()) { | |||
| wxBillPropertyDepositService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.DAILY.getCode().intValue()) { | |||
| wxBillDailyService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { | |||
| wxBillOtherService.notify(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { | |||
| wxBillOtherDepositService.notify(dto, user); | |||
| } | |||
| } | |||
| public void updatePay(WxBillPayDTO dto,MallUserInfo user) { | |||
| if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT.getCode().intValue()) { | |||
| wxBillRentService.updatePay(dto, user); | |||
| @@ -468,6 +468,19 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| } | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDaily wxBillRent = new WxBillDaily(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillDailyMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDaily wxBillRent = updateBillPay(dto); | |||
| @@ -444,6 +444,19 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDeposit wxBillRent = new WxBillDeposit(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDeposit wxBillRent = updateBillPay(dto); | |||
| @@ -430,6 +430,19 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| } | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOtherDeposit wxBillRent = updateBillPay(dto); | |||
| @@ -374,6 +374,19 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOther wxBillRent = new WxBillOther(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillOtherMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOther wxBillRent = updateBillPay(dto); | |||
| @@ -424,6 +424,19 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillPropertyDeposit wxBillRent = new WxBillPropertyDeposit(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillPropertyDeposit wxBillRent = updateBillPay(dto); | |||
| @@ -513,6 +513,19 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| } | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillProperty wxBillRent = new WxBillProperty(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillPropertyMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillProperty wxBillRent = updateBillPay(dto); | |||
| @@ -442,6 +442,19 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| } | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRentManage wxBillRent = new WxBillRentManage(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRentManage wxBillRent = updateBillPay(dto); | |||
| @@ -606,6 +606,19 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| } | |||
| } | |||
| } | |||
| @Override | |||
| public void notify(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRent wxBillRent = new WxBillRent(); | |||
| wxBillRent.setId(dto.getId()); | |||
| wxBillRent.updateTenantInfo(dto); | |||
| wxBillRent.setUpdatetime(new Date()); | |||
| wxBillRent.setLastOweCallTime(new Date()); | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| @@ -29,6 +29,7 @@ | |||
| <result column="starttime" property="starttime"/> | |||
| <result column="endtime" property="endtime"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="freeze" property="freeze"/> | |||
| <result column="build_way" property="buildWay"/> | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| @@ -39,7 +40,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `tenant_id`,`parent_tenant_id`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`last_owe_call_time`, | |||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`bill_remark`, | |||
| `rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`bill_remark`,`last_owe_call_user`, | |||
| case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name | |||
| </sql> | |||
| @@ -127,7 +128,7 @@ | |||
| <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , | |||
| br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`, | |||
| br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`bill_remark`, | |||
| case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name | |||
| @@ -34,12 +34,13 @@ | |||
| <result column="bill_remark" property="billRemark"/> | |||
| <result column="contract_depoist_detail" property="contractDepoistDetail"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`last_owe_call_time`, | |||
| `expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark,contract_depoist_detail | |||
| `last_owe_call_user`,`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark,contract_depoist_detail | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| @@ -121,7 +122,7 @@ | |||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_time`, | |||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`, | |||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`,br.`last_owe_call_user`, | |||
| br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,'租赁押金' bill_type_name,'' bill_remark | |||
| from wx_bill_rent_deposit br | |||
| <include refid="queryBillRentListCondition"/> | |||
| @@ -27,6 +27,7 @@ | |||
| <result column="return_price" jdbcType="BIGINT" property="returnPrice"/> | |||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="merchant_name" property="merchantName"/> | |||
| <result column="starttime" property="starttime"/> | |||
| @@ -38,7 +39,7 @@ | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_time`, | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_time`,`last_owe_call_user`, | |||
| `status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay,'其他押金' bill_type_name,CONCAT(`name`,',',`comments`) bill_remark | |||
| </sql> | |||
| @@ -131,7 +132,7 @@ | |||
| </sql> | |||
| <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`, | |||
| br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`last_owe_call_time`, | |||
| br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他押金' bill_type_name,CONCAT(`name`,',',`comments`) bill_remark | |||
| from wx_bill_other_deposit br | |||
| @@ -23,6 +23,7 @@ | |||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> | |||
| <result column="name" jdbcType="VARCHAR" property="name" /> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="comments" jdbcType="VARCHAR" property="comments" /> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | |||
| @@ -38,7 +39,7 @@ | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, | |||
| `id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`last_owe_call_user`, | |||
| `status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`last_owe_call_time`, | |||
| `rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| '其他费用' bill_type_name, CONCAT(`name`,',',`comments`) bill_remark | |||
| @@ -126,7 +127,7 @@ | |||
| <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,br.`last_owe_call_time`, | |||
| br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`, | |||
| br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他费用' bill_type_name, CONCAT(br.`name`,',',br.`comments`) bill_remark | |||
| from wx_bill_other br | |||
| @@ -31,6 +31,7 @@ | |||
| <result column="starttime" property="starttime"/> | |||
| <result column="endtime" property="endtime"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="merchant_name" property="merchantName"/> | |||
| <result column="shop_number" property="shopNumber"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| @@ -39,7 +40,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`starttime`,`endtime`, | |||
| `pay_date`,`createtime`,`expired_day`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `pay_date`,`createtime`,`expired_day`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_user`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay, | |||
| '物业押金' bill_type_name,'' bill_remark | |||
| </sql> | |||
| @@ -139,7 +140,7 @@ | |||
| <select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`status`, | |||
| br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`, | |||
| br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`, | |||
| br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,'物业押金' bill_type_name,'' bill_remark | |||
| from wx_bill_property_deposit br | |||
| <include refid="queryBillDepositListConditions"/> | |||
| @@ -36,7 +36,7 @@ | |||
| <result column="starttime" property="starttime"/> | |||
| <result column="endtime" property="endtime"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="merchant_name" property="merchantName"/> | |||
| <result column="deposit" property="deposit"/> | |||
| <result column="deposit_status" property="depositStatus"/> | |||
| @@ -52,7 +52,7 @@ | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | |||
| `createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`, | |||
| `createtime`,`expired_day`,`tenant_id`,`status`,`is_del`,`need_pay`,`last_owe_call_time`,`last_owe_call_user`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,'物业费' bill_type_name,'' bill_remark | |||
| @@ -171,7 +171,7 @@ | |||
| <select id="queryBillPropertyList" parameterType="com.iformall.domain.po.WxBillProperty" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`, | |||
| br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status, | |||
| br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay, | |||
| br.`late_pay_ratio`,'物业费' bill_type_name,'' bill_remark | |||
| @@ -36,7 +36,7 @@ | |||
| <result column="service_charge_pay" property="serviceChargePay"/> | |||
| <result column="manage_fee_type" jdbcType="INTEGER" property="manageFeeType"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/> | |||
| <result column="bill_type_name" property="billTypeName"/> | |||
| @@ -44,7 +44,7 @@ | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`last_owe_call_user`, | |||
| `createtime`,`expired_day`,`status`,`apply_status`,`apply_pay_img`,`apply_update_time`,`is_del`,`need_pay`,`last_owe_call_time`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`, | |||
| `period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type, | |||
| @@ -150,7 +150,7 @@ | |||
| <select id="queryBillManageList" parameterType="com.iformall.domain.po.WxBillRentManage" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,br.`last_owe_call_time`, | |||
| br.`status`,br.`need_pay`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,br.`last_owe_call_time`,br.`last_owe_call_user`, | |||
| br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime, | |||
| br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`, | |||
| @@ -40,6 +40,7 @@ | |||
| <result column="starttime" property="starttime"/> | |||
| <result column="endtime" property="endtime"/> | |||
| <result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/> | |||
| <result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/> | |||
| <result column="merchant_name" property="merchantName"/> | |||
| <result column="deposit" property="deposit"/> | |||
| @@ -63,7 +64,7 @@ | |||
| `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, | |||
| `createtime`,`expired_day`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`, | |||
| `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,`last_owe_call_time`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, | |||
| `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,`last_owe_call_user`, | |||
| `pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,'租金' bill_type_name,'' bill_remark | |||
| </sql> | |||
| @@ -168,7 +169,7 @@ | |||
| </sql> | |||
| <select id="queryBillRentList" parameterType="com.iformall.domain.po.WxBillRent" resultMap="BaseResultMap"> | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, | |||
| select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`last_owe_call_user`, | |||
| br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`,br.`last_owe_call_time`, | |||
| br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, | |||
| br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay, | |||