From 8667b3725684272689db0b8e33d115749ec546ba Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 4 Aug 2024 23:07:38 +0800 Subject: [PATCH] fix --- .../com/iformall/tenant/TenantInfoImpl.java | 3 +- .../db/migration/V202408000000001.sql | 22 +++++++ .../com/iformall/tenant/TenantInfoImpl.java | 2 + .../com/iformall/tenant/TenantInfoImpl.java | 2 + .../com/iformall/tenant/TenantInfoImpl.java | 2 + .../domain/po/WxFinancePrintData.java | 28 +++++++++ .../domain/po/WxFinancePrintTemplate.java | 38 ++++++++++++ .../enums/EnumFinancePrintDataType.java | 33 +++++++++++ .../mapper/WxFinancePrintDataMapper.java | 11 ++++ .../mapper/WxFinancePrintTemplateMapper.java | 19 ++++++ .../service/impl/WxFinanceServiceImpl.java | 10 ++-- .../mapper/WxFinancePrintDataMapper.xml | 51 ++++++++++++++++ .../mapper/WxFinancePrintTemplateMapper.xml | 58 +++++++++++++++++++ 13 files changed, 274 insertions(+), 5 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumFinancePrintDataType.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintDataMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 0b7535b17..34f3d73ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -73,7 +73,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_user_visit", "tt_goods_category", "tt_merchant_poi", - + "wx_finance_print_data" }; @@ -130,6 +130,7 @@ public class TenantInfoImpl implements TenantInfo { "fengniao_map_config", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; @Override diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index d689189c4..ec88c6d25 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -144,3 +144,25 @@ ALTER TABLE wx_rent_contract ADD COLUMN revenue_jumps_remark varchar(1000) COMME ALTER TABLE wx_rent_contract ADD COLUMN free_period_remark varchar(1000) COMMENT '免租期设置说明'; ALTER TABLE wx_rent_contract DROP COLUMN bus_discount_ratio; +CREATE TABLE `wx_finance_print_data` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '数据项名称', + `is_del` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, + `remark` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='租赁合同'; + +CREATE TABLE `wx_finance_print_template` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '模板名称', + `is_del` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, + `content` text COLLATE utf8mb4_unicode_ci COMMENT '内容', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='租赁合同'; + + + diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 81182ed52..3c12f8368 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -60,6 +60,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_user_visit", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; private static String[] filterSubTables = new String[] { @@ -104,6 +105,7 @@ public class TenantInfoImpl implements TenantInfo { "fengniao_map_config", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; @Override diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 50a2f3b10..0c03a30c5 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -65,6 +65,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_user_visit", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; private static String[] filterSubTables = new String[] { @@ -117,6 +118,7 @@ public class TenantInfoImpl implements TenantInfo { "fengniao_map_config", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 50a2f3b10..0c03a30c5 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -65,6 +65,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_user_visit", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; private static String[] filterSubTables = new String[] { @@ -117,6 +118,7 @@ public class TenantInfoImpl implements TenantInfo { "fengniao_map_config", "tt_goods_category", "tt_merchant_poi", + "wx_finance_print_data" }; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java new file mode 100644 index 000000000..02def4956 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintData.java @@ -0,0 +1,28 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@TableName(value = "wx_finance_print_data") +@Data +@EqualsAndHashCode(callSuper = true) +public class WxFinancePrintData extends BaseEntity { + + private static final long serialVersionUID = 5442054213918470425L; + + @TableId(type= IdType.AUTO) + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="数据项名称",name="name") + private String name; + @io.swagger.annotations.ApiModelProperty(value="",name="isDel") + private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value="省",name="remark") + private String remark; + @io.swagger.annotations.ApiModelProperty(value="EnumFinancePrintDataType",name="type") + private Integer type; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java new file mode 100644 index 000000000..75a841bc7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinancePrintTemplate.java @@ -0,0 +1,38 @@ +package com.iformall.domain.po; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + */ +@TableName(value = "wx_finance_print_template") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxFinancePrintTemplate 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",name="name") + private String name; + + @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 = "isDel", name = "isDel") + private Integer isDel; + + @io.swagger.annotations.ApiModelProperty(value = "单价", name = "content") + private String content; +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFinancePrintDataType.java b/mallinkService/src/main/java/com/iformall/enums/EnumFinancePrintDataType.java new file mode 100644 index 000000000..542d30afa --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFinancePrintDataType.java @@ -0,0 +1,33 @@ +package com.iformall.enums; + +public enum EnumFinancePrintDataType { + + FINANCE_BILL(1,"财务账单"), + FINANCE_RECEIVE(2,"财务收款单") + ; + + public static EnumFinancePrintDataType getEnum(Integer code) { + for (EnumFinancePrintDataType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumFinancePrintDataType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintDataMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintDataMapper.java new file mode 100644 index 000000000..95c5b0272 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintDataMapper.java @@ -0,0 +1,11 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFinancePrintData; +import java.util.List; + +public interface WxFinancePrintDataMapper extends CommonMapper { + + List findList(WxFinancePrintData wxMall); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java new file mode 100644 index 000000000..8b4517ba6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinancePrintTemplateMapper.java @@ -0,0 +1,19 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFinancePrintTemplate; + +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + */ +public interface WxFinancePrintTemplateMapper extends CommonMapper { + + List findList(WxFinancePrintTemplate wxBillRent); + + WxFinancePrintTemplate selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 7dbd4b2ea..e82ec67db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -6,8 +6,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.common.Result; -import com.iformall.common.ResultData; import com.iformall.domain.dto.FinanceReceiveCalcuteDTO; import com.iformall.domain.dto.FinanceSetOffCalcuteDTO; import com.iformall.domain.dto.FinanceSetOffDTO; @@ -29,13 +27,14 @@ import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceSetOffDetailVo; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; -import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveType; import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPayWayMapper; import com.iformall.mapper.WxEnergyFeesSetoffMapper; +import com.iformall.mapper.WxFinancePrintDataMapper; +import com.iformall.mapper.WxFinancePrintTemplateMapper; import com.iformall.mapper.WxFinanceReceiveBillMapper; import com.iformall.mapper.WxFinanceReceiveMapper; import com.iformall.mapper.WxFinanceReceivePaywayMapper; @@ -46,7 +45,6 @@ import com.iformall.service.WxMerchantService; import com.iformall.service.WxShopService; import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.Constant; -import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -81,6 +79,10 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxFinanceReceiveSetoffMapper wxFinanceReceiveSetoffMapper; @Autowired WxFinanceReceivePaywayMapper wxFinanceReceivePaywayMapper; + @Autowired + WxFinancePrintDataMapper wxFinancePrintDataMapper; + @Autowired + WxFinancePrintTemplateMapper wxFinancePrintTemplateMapper; @Lazy @Autowired diff --git a/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml b/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml new file mode 100644 index 000000000..42fd7e9ae --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFinancePrintDataMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + `id`,`name`,`is_del`,`remark`,`type` + + + + where id > 0 + + + and `id` = #{id} + + + + and `name` like concat('%', #{name},'%') + + + + and `is_del` = #{isDel} + + + + and `type` = #{type} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml b/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml new file mode 100644 index 000000000..3eb5146ef --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`name`,`price`,`content` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and name like concat('%', #{name},'%') + and `is_del` = #{isDel} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + update wx_finance_print_template set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId} + + + +