From e222422503007b9facf29270a57c7965e92b1625 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Wed, 21 May 2025 21:39:04 +0800 Subject: [PATCH] fix --- .../domain/po/WxRentContractAgileRenevue.java | 71 +++++++++++++++++++ .../po/WxRentContractAgileRenevueFees.java | 45 ++++++++++++ .../po/WxRentContractAgileRenevueItem.java | 57 +++++++++++++++ .../po/WxRentContractAgileUnDeposit.java | 14 ---- .../WxRentContractAgileRenevueFeesMapper.java | 20 ++++++ .../WxRentContractAgileRenevueItemMapper.java | 21 ++++++ .../WxRentContractAgileRenevueMapper.java | 19 +++++ .../WxRentContractAgileRenevueFeesMapper.xml | 60 ++++++++++++++++ .../WxRentContractAgileRenevueItemMapper.xml | 69 ++++++++++++++++++ .../WxRentContractAgileRenevueMapper.xml | 61 ++++++++++++++++ .../WxRentContractAgileUnDepositMapper.xml | 2 +- 11 files changed, 424 insertions(+), 15 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevue.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueFees.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueItem.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueFeesMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueItemMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueFeesMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevue.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevue.java new file mode 100644 index 000000000..e65af2276 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevue.java @@ -0,0 +1,71 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumFeesShopTimeType; +import com.iformall.enums.EnumRentContractAgilPriceUnit; +import com.iformall.enums.EnumRentContractAgilSettingMethod; +import com.iformall.enums.EnumRentContractAgilTimeUnit; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.List; + +/** + */ +@TableName(value = "wx_rent_contract_agile_renevue") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxRentContractAgileRenevue extends TenantEntity { + + private static final long serialVersionUID = 7009117540201976664L; + + @io.swagger.annotations.ApiModelProperty(value="id",name="id") + private Long id; + + @io.swagger.annotations.ApiModelProperty(value="合同编号",name="rentContractId") + private Long rentContractId; + + @io.swagger.annotations.ApiModelProperty(value="计费周期",name="timePeriod") + private Integer timePeriod; + + @io.swagger.annotations.ApiModelProperty(value="计费周期单位EnumRentContractAgilTimeUnit",name="timeUnit") + private Integer timeUnit; + @TableField(exist = false) + private String timeUnitName; + public String getTimeUnitName() { + if (null != timeUnit) { + return EnumRentContractAgilTimeUnit.getEnum(timeUnit).getMessage(); + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value="收费周期",name="calcuteTime") + private Integer calcuteTime; + + @io.swagger.annotations.ApiModelProperty(value="费用生成规则EnumFeesShopTimeType",name="feesCreateRule") + private Integer feesCreateRule; + @TableField(exist = false) + private String feesCreateRuleName; + public String getFeesCreateRuleName() { + if (null != feesCreateRule) { + return EnumFeesShopTimeType.getEnum(feesCreateRule).getMessage(); + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") + private Date createtime; + + @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") + private Date updatetime; + + @TableField(exist = false) + private List items; + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueFees.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueFees.java new file mode 100644 index 000000000..f972ec75e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueFees.java @@ -0,0 +1,45 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumFeesShopTimeType; +import com.iformall.enums.EnumRentContractAgilPriceUnit; +import com.iformall.enums.EnumRentContractAgilSettingMethod; +import com.iformall.enums.EnumRentContractAgilTimeUnit; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.List; + +/** + */ +@TableName(value = "wx_rent_contract_agile_renevue_fees") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxRentContractAgileRenevueFees extends TenantEntity { + + private static final long serialVersionUID = 7009117540201976664L; + + @io.swagger.annotations.ApiModelProperty(value="id",name="id") + private Long id; + + @io.swagger.annotations.ApiModelProperty(value="合同编号",name="rentContractId") + private Long rentContractId; + + @io.swagger.annotations.ApiModelProperty(value="WxRentContractAgileRenevue编号",name="agileRenevueId") + private Long agileRenevueId; + + @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") + private Date createtime; + + @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") + private Date updatetime; + + @io.swagger.annotations.ApiModelProperty(value="占比比率%,默认100",name="rate") + private String rate; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueItem.java new file mode 100644 index 000000000..eb78f5ebc --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileRenevueItem.java @@ -0,0 +1,57 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumFeesShopTimeType; +import com.iformall.enums.EnumRentContractAgilPriceUnit; +import com.iformall.enums.EnumRentContractAgilSettingMethod; +import com.iformall.enums.EnumRentContractAgilTimeUnit; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.List; + +/** + */ +@TableName(value = "wx_rent_contract_agile_renevue_item") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxRentContractAgileRenevueItem extends TenantEntity { + + private static final long serialVersionUID = 7009117540201976664L; + + @io.swagger.annotations.ApiModelProperty(value="id",name="id") + private Long id; + + @io.swagger.annotations.ApiModelProperty(value="合同编号",name="rentContractId") + private Long rentContractId; + + @io.swagger.annotations.ApiModelProperty(value="费用编号",name="renevueId") + private Long renevueId; + + @io.swagger.annotations.ApiModelProperty(value="beginTime",name="beginTime") + private Date beginTime; + + @io.swagger.annotations.ApiModelProperty(value="endTime",name="endTime") + private Date endTime; + + @io.swagger.annotations.ApiModelProperty(value="抽成比率%",name="rate") + private String rate; + + @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") + private Date createtime; + + @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") + private Date updatetime; + + @io.swagger.annotations.ApiModelProperty(value="是否免租期",name="isFree") + private Integer isFree; + + @io.swagger.annotations.ApiModelProperty(value="页面用的字段",name="isFree") + private Integer isFather; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java index 08688bbb0..4d58a8596 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java @@ -46,20 +46,6 @@ public class WxRentContractAgileUnDeposit extends TenantEntity { @TableField(exist = false) private String feesName; - @io.swagger.annotations.ApiModelProperty(value="单价",name="price") - private String price; - - @io.swagger.annotations.ApiModelProperty(value="单价单位EnumRentContractAgilPriceUnit",name="priceUnit") - private Integer priceUnit; - @TableField(exist = false) - private String priceUnitName; - public String getPriceUnitName() { - if (null != priceUnit) { - return EnumRentContractAgilPriceUnit.getEnum(priceUnit).getMessage(); - } - return null; - } - @io.swagger.annotations.ApiModelProperty(value="计费周期",name="timePeriod") private Integer timePeriod; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueFeesMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueFeesMapper.java new file mode 100644 index 000000000..a019504da --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueFeesMapper.java @@ -0,0 +1,20 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxRentContractAgileRenevue; +import com.iformall.domain.po.WxRentContractAgileRenevueFees; + +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + */ +public interface WxRentContractAgileRenevueFeesMapper extends CommonMapper { + + List findList(WxRentContractAgileRenevueFees wxBillRent); + + WxRentContractAgileRenevueFees selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + List findIdList(WxRentContractAgileRenevueFees wxBillRent); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueItemMapper.java new file mode 100644 index 000000000..95fabe6ed --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueItemMapper.java @@ -0,0 +1,21 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxRentContractAgileRenevueItem; + +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + */ +public interface WxRentContractAgileRenevueItemMapper extends CommonMapper { + + List findList(WxRentContractAgileRenevueItem wxBillRent); + + WxRentContractAgileRenevueItem selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + List findIdList(WxRentContractAgileRenevueItem wxBillRent); + + void deleteByUnDeposit(WxRentContractAgileRenevueItem wxBillRent); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java new file mode 100644 index 000000000..2d7becdc8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractAgileRenevueMapper.java @@ -0,0 +1,19 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxRentContractAgileRenevue; + +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + */ +public interface WxRentContractAgileRenevueMapper extends CommonMapper { + + List findList(WxRentContractAgileRenevue wxBillRent); + + WxRentContractAgileRenevue selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + List findIdList(WxRentContractAgileRenevue wxBillRent); + +} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueFeesMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueFeesMapper.xml new file mode 100644 index 000000000..b355f92ba --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueFeesMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`agile_renevue_id`, + `createtime`,`updatetime`,`rate` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `rent_contract_id` = #{rentContractId} + and `agile_renevue_id` = #{agileRenevueId} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml new file mode 100644 index 000000000..e8e9a537c --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueItemMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`renevue_id`,`begin_time`,`end_time`,`rate`, + `createtime`,`updatetime`,`is_free`,`is_father` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `rent_contract_id` = #{rentContractId} + and `renevue_id` = #{renevueId} + and `is_father` = #{isFather} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + delete from wx_rent_contract_agile_renevue_item where `un_deposit_id` = #{unDepositId} + + + + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml new file mode 100644 index 000000000..3d749af54 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileRenevueMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`, + `time_period`,`time_unit`,`calcute_time`,`fees_create_rule`,`createtime`,`updatetime` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `rent_contract_id` = #{rentContractId} + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml index d3a8ea0af..612d5c9ea 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositMapper.xml @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`setting_method`,`fees_id`,`price`,`price_unit`, + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`setting_method`,`fees_id`, `time_period`,`time_unit`,`calcute_time`,`fees_create_rule`,`createtime`,`updatetime`