winter 2 лет назад
Родитель
Сommit
cba89d808a
10 измененных файлов: 145 добавлений и 499 удалений
  1. +27
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +3
    -43
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  3. +5
    -43
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
  4. +3
    -47
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  5. +3
    -44
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  6. +6
    -96
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  7. +5
    -42
      mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
  8. +4
    -98
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  9. +6
    -86
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java
  10. +83
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java

+ 27
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -259,6 +259,33 @@ public class WxBillAllController extends BaseController {
return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize));
}
/**
* 欠缴账单列表
* @param wxBillAll
* @param pageNum
* @param pageSize
* @return
*/
@GetMapping("exportOweBillList")
public void oweBillList(@ModelAttribute WxMerchant wxMerchant,Integer billType, HttpServletRequest request, HttpServletResponse response) {
if (null == billType) {
return ;
}
wxMerchant.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchant.setFloorForRule(dataRule.getFloorIds());
wxMerchant.setBusinessForRule(dataRule.getBussinessIds());
}
wxMerchant.setOnlyOwe(EnumYesOrNo.YES.getCode());
EnumBillAllType btype = EnumBillAllType.getEnum(billType);
if (null == btype) {
return ;
}
PageInfo page = billAllHelper.getBillList(btype, wxMerchant,1,10000);
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false);
}
/**
* 欠缴商户列表


+ 3
- 43
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -20,30 +22,18 @@ import java.util.List;
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillDaily extends TenantEntity {
public class WxBillDaily extends WxBillBaseEntity {
/**
*
*/
private static final long serialVersionUID = 5004263718907992977L;


protected Long id;


@TableField(exist = false)
private String merchantName;

@Excel(name = "费用类型*", replace = {"水费_1", "电费_2"}, width = 20, orderNum = "2")
@NotNull
@io.swagger.annotations.ApiModelProperty(value="账单类型EnumBillDailyType",name="type")
private Integer type;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private String receivePay;

@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private String pay;

@Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd")
@NotNull
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
@@ -58,8 +48,6 @@ public class WxBillDaily extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private String owe;
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
@@ -70,8 +58,6 @@ public class WxBillDaily extends TenantEntity {
private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;
@io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId")
@@ -107,11 +93,6 @@ public class WxBillDaily extends TenantEntity {
@TableField(exist = false)
private WxMerchant merchant;

@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime;

@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime;
@io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze")
private Integer freeze;

@@ -121,31 +102,10 @@ public class WxBillDaily extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private String realReceivePay;

@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
private String serviceChargePayUpdate;
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 5
- 43
mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java Просмотреть файл

@@ -3,6 +3,8 @@ 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.domain.po.base.WxBillBaseEntity;

import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -15,22 +17,15 @@ import java.util.List;
@TableName(value = "wx_bill_rent_deposit")
@Data
@EqualsAndHashCode(callSuper = true)
public class WxBillDeposit extends TenantEntity {

protected Long id;

@TableField(exist = false)
private String merchantName;
public class WxBillDeposit extends WxBillBaseEntity {

@TableField(exist = false)
private String shopNumber;

@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
private Long rentContractId;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private String receivePay;
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private String pay;
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
@@ -40,8 +35,6 @@ public class WxBillDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private String owe;
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
@@ -52,10 +45,6 @@ public class WxBillDeposit extends TenantEntity {
private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;
@io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId")
@@ -63,12 +52,6 @@ public class WxBillDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime;

@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime;

@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime;

@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType;

@@ -87,13 +70,6 @@ public class WxBillDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private String realReceivePay;
@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;

@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
@@ -102,18 +78,4 @@ public class WxBillDeposit extends TenantEntity {
private List<Long> rentContractIdList;
@TableField(exist = false)
private List<Long> merchantIds;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 3
- 47
mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -20,19 +22,13 @@ import java.util.List;
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillOther extends TenantEntity {
public class WxBillOther extends WxBillBaseEntity {

/**
*
*/
private static final long serialVersionUID = -5919107280859407195L;

protected Long id;

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName;

@Excel(name = "其他费用名称", width = 20, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="账单名称",name="name")
private String name;
@@ -41,13 +37,6 @@ public class WxBillOther extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="账单备注",name="comments")
private String comments;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private String receivePay;
@Excel(name = "实收金额(元)", orderNum = "5", width = 20)
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private String pay;

@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd")
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
private Date receiveDate;
@@ -63,9 +52,6 @@ public class WxBillOther extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@Excel(name = "欠缴金额(元)", orderNum = "6", width = 20)
@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private String owe;
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
@@ -77,8 +63,6 @@ public class WxBillOther extends TenantEntity {
private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;
@io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId")
@@ -108,12 +92,6 @@ public class WxBillOther extends TenantEntity {
@Excel(name = "商铺号", width = 20, orderNum = "1")
private String shopName;

@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime;

@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime;

@TableField(exist = false)
private WxMerchant merchant;

@@ -124,33 +102,11 @@ public class WxBillOther extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;
@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "4")
@TableField(exist = false)
private String realReceivePay;

@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
private String serviceChargePayUpdate;

@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;

}

+ 3
- 44
mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -21,13 +23,7 @@ import java.util.Map;
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillOtherDeposit extends TenantEntity {

protected Long id;

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName;
public class WxBillOtherDeposit extends WxBillBaseEntity {

@io.swagger.annotations.ApiModelProperty(value = "账单名称", name = "name")
private String name;
@@ -36,13 +32,6 @@ public class WxBillOtherDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "账单备注", name = "comments")
private String comments;

@io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay")
private String receivePay;

@Excel(name = "实收金额(元)", orderNum = "5", width = 20)
@io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay")
private String pay;

@io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate")
private Date receiveDate;

@@ -56,9 +45,6 @@ public class WxBillOtherDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "逾期天数", name = "expiredDay")
private Long expiredDay;

@io.swagger.annotations.ApiModelProperty(value = "欠缴", name = "owe")
private String owe;

@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status")
private Integer status;
@@ -70,8 +56,6 @@ public class WxBillOtherDeposit extends TenantEntity {
private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value = "删除 是1否0", name = "isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value = "账号ID", name = "userId")
private Long userId;
@io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId")
@@ -121,43 +105,18 @@ public class WxBillOtherDeposit extends TenantEntity {
@TableField(exist = false)
private List<Map<String, Object>> shops;

@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime;

@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime;
@io.swagger.annotations.ApiModelProperty(value = "冻结状态,0正常1冻结", name = "freeze")
private Integer freeze;

@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "4")
@TableField(exist = false)
private String realReceivePay;

@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
private String serviceChargePayUpdate;

@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 6
- 96
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -20,46 +22,19 @@ import java.util.List;
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillProperty extends TenantEntity {
public class WxBillProperty extends WxBillBaseEntity {

/**
*
*/
private static final long serialVersionUID = -4019665043805504986L;

protected Long id;

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName;

@io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId")
private Long propertyContractId;

@SortColumn(column = "receivePay")
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private String receivePay;

// public String getReceivePayStr() {
// return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString();
// }
//
// @TableField(exist = false)
// private String receivePayStr;


// public String getPayStr() {
// return new BigDecimal(pay == null ? 0 : pay).divide(new BigDecimal(100)).toPlainString();
// }
//
// @Excel(name = "实收账款(元)", width = 20, orderNum = "7")
// @TableField(exist = false)
// private String payStr;

@Excel(name = "实收账款(元)", width = 20, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private String pay;

@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;
@@ -74,18 +49,6 @@ public class WxBillProperty extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@Excel(name = "欠缴金额(元)", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private String owe;

// public String getOweStr() {
// return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString();
// }
//
// @Excel(name = "欠缴金额(元)", width = 20, orderNum = "9")
// @TableField(exist = false)
// private String oweStr;

@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
@@ -98,12 +61,6 @@ public class WxBillProperty extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;

@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
private String needPay;

@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;

@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;

@@ -113,14 +70,6 @@ public class WxBillProperty extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime;

@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime;

@Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime;

@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType;

@@ -137,14 +86,6 @@ public class WxBillProperty extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice")
private String latePayPrice;

// public String getLatePayPriceStr() {
// return new BigDecimal(latePayPrice == null ? 0 : latePayPrice).divide(new BigDecimal(100)).toPlainString();
// }
//
// @Excel(name = "滞纳金(元)", width = 20, orderNum = "12")
// @TableField(exist = false)
// private String latePayPriceStr;

@io.swagger.annotations.ApiModelProperty(value = "账期", name = "period")
private Integer period;

@@ -198,46 +139,15 @@ public class WxBillProperty extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private String realReceivePay;
@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;

@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
private String serviceChargePayUpdate;

@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "6")
@TableField(exist = false)
private String realReceivePayStr;

public String getRealReceivePayStr() {
//return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString();
return realReceivePay;
}



@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private List<Long> propertyContractIds;
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 5
- 42
mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java Просмотреть файл

@@ -3,6 +3,8 @@ 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.domain.po.base.WxBillBaseEntity;

import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -15,22 +17,15 @@ import java.util.List;
@TableName(value = "wx_bill_property_deposit")
@Data
@EqualsAndHashCode(callSuper = true)
public class WxBillPropertyDeposit extends TenantEntity {

protected Long id;

@TableField(exist = false)
private String merchantName;
public class WxBillPropertyDeposit extends WxBillBaseEntity {

@TableField(exist = false)
private String shopNumber;

@io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId")
private Long propertyContractId;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay")
private String receivePay;
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private String pay;
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
@@ -39,8 +34,6 @@ public class WxBillPropertyDeposit extends TenantEntity {
private Date createtime;
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;
@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private String owe;
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
@@ -51,10 +44,6 @@ public class WxBillPropertyDeposit extends TenantEntity {
private Date applyUpdateTime;
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;
@io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId")
@@ -62,12 +51,6 @@ public class WxBillPropertyDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime;

@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime;

@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime;

@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType;

@@ -86,21 +69,6 @@ public class WxBillPropertyDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private String realReceivePay;

@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
@@ -110,9 +78,4 @@ public class WxBillPropertyDeposit extends TenantEntity {
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;
}

+ 4
- 98
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java Просмотреть файл

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -22,58 +24,19 @@ import java.util.List;
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillRent extends TenantEntity {

protected Long id;

public class WxBillRent extends WxBillBaseEntity {

@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName;

@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
private Long rentContractId;

@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="实际应收金额(做了减免之后和need可能不一样)",name="receivePay")
private String receivePay;

// public String getReceivePayStr() {
// return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString();
// }

// @TableField(exist = false)
// private String receivePayStr;

// public String getPayStr() {
// return new BigDecimal(pay == null ? 0 : pay).divide(new BigDecimal(100)).toPlainString();
// }

@Excel(name = "实收账款(元)", width = 20, orderNum = "9")
@TableField(exist = false)
private String payStr;

@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
private String pay;

@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="收款截止日期,过了有手续费",name="receiveDate")
private Date receiveDate;
@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime;
@Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime;
@TableField(exist = false)
private Date endtimeBegin;
@TableField(exist = false)
private Date endtimeEnd;

@Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
private Date payDate;
@@ -85,17 +48,6 @@ public class WxBillRent extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
private String owe;

// public String getOweStr() {
// return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString();
// }

@Excel(name = "欠缴金额(元)", width = 20, orderNum = "11")
@TableField(exist = false)
private String oweStr;

@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期EnumBillRentStatus", name = "status")
private Integer status;
@@ -115,13 +67,6 @@ public class WxBillRent extends TenantEntity {
private String contractNeedPay;

// @TableField(exist = false)
// private String contractNeedPayStr;

// public String getContractNeedPayStr() {
// return new BigDecimal(contractNeedPay == null ? 0 : contractNeedPay).divide(new BigDecimal(100)).toPlainString();
// }

@io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo")
private String rentPriceInfo;

@@ -151,9 +96,6 @@ public class WxBillRent extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="运营管理费应收金额",name="operatingManageFeeNeedPay")
private String operatingManageFeeNeedPay;

@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;

@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;

@@ -247,8 +189,6 @@ public class WxBillRent extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "联营租金", name = "joinRentPrice")
private String joinRentPrice;



@TableField(exist = false)
private String serviceChargePayBefore;
@TableField(exist = false)
@@ -257,41 +197,7 @@ public class WxBillRent extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
private String realReceivePay;

@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8")
@TableField(exist = false)
private String realReceivePayStr;

// public String getRealReceivePayStr() {
// return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString();
// }

@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
private String billTypeName;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private List<Long> rentContractIdList;
@TableField(exist = false)
private List<Long> merchantIdList;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;


}

+ 6
- 86
mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -20,43 +22,18 @@ import java.util.List;
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillRentManage extends TenantEntity {

protected Long id;
public class WxBillRentManage extends WxBillBaseEntity {

@Excel(name = "商铺号", width = 20, orderNum = "1")
@TableField(exist = false)
private String shopNumber;
@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
private String merchantName;

@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
private Long rentContractId;

@io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay")
private String receivePay;

// public String getReceivePayStr() {
// return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString();
// }

// @TableField(exist = false)
// private String receivePayStr;

// public String getPayStr() {
// return new BigDecimal(pay == null ? 0 : pay).divide(new BigDecimal(100)).toPlainString();
// }
//
// @Excel(name = "实收账款(元)", width = 20, orderNum = "9")
// @TableField(exist = false)
// private String payStr;

@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
@Excel(name = "实收账款(元)", width = 20, orderNum = "9")
private String pay;

@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;
@@ -72,18 +49,6 @@ public class WxBillRentManage extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
@Excel(name = "欠缴金额(元)", width = 20, orderNum = "11")
private String owe;

// public String getOweStr() {
// return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString();
// }
//
// @Excel(name = "欠缴金额(元)", width = 20, orderNum = "11")
// @TableField(exist = false)
// private String oweStr;

@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status")
private Integer status;
@@ -98,12 +63,6 @@ public class WxBillRentManage extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel")
private Integer isDel;

@io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;

@io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId")
private Long userId;

@@ -113,14 +72,6 @@ public class WxBillRentManage extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime;

@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime;

@Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime;

@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType;

@@ -177,25 +128,9 @@ public class WxBillRentManage extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8")
@TableField(exist = false)
private String realReceivePay;

// @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8")
// @TableField(exist = false)
// private String realReceivePayStr;
//
// public String getRealReceivePayStr() {
// return new BigDecimal(realReceivePay == null ? 0 : realReceivePay).divide(new BigDecimal(100)).toPlainString();
// }
@io.swagger.annotations.ApiModelProperty(value="管理费类型,EnumRentContractManageFeeType",name="manageFeeType")
private Integer manageFeeType;
@io.swagger.annotations.ApiModelProperty(value="账单类型名称-管理费",name="billTypeName")
private String billTypeName;
public void initByBillRent(WxBillRent billRent) {
this.rentContractId = billRent.getRentContractId();
this.pay = billRent.getPay();
@@ -217,23 +152,8 @@ public class WxBillRentManage extends TenantEntity {
this.latePayRatio = billRent.getLatePayRatio();
}
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
private Long building;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private Integer hasMerchant;
@TableField(exist = false)
private String month;
@TableField(exist = false)
private Integer onlyOwe;

}

+ 83
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java Просмотреть файл

@@ -0,0 +1,83 @@
package com.iformall.domain.po.base;

import cn.afterturn.easypoi.excel.annotation.Excel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.apache.commons.lang3.StringUtils;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class WxBillBaseEntity extends TenantEntity {

protected Long id;

@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
protected Long merchantId;
@Excel(name = "商户名称", width = 20, orderNum = "2")
@TableField(exist = false)
protected String merchantName;

@io.swagger.annotations.ApiModelProperty(value="实际应收金额(做了减免之后和need可能不一样)",name="receivePay")
protected String receivePay;

@Excel(name = "实收账款(元)", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay")
protected String pay;

@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
protected Date starttime;
@Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
protected Date endtime;
@TableField(exist = false)
protected Date endtimeBegin;
@TableField(exist = false)
protected Date endtimeEnd;

@Excel(name = "欠缴金额(元)", width = 20, orderNum = "11")
@io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe")
protected String owe;

@Excel(name = "实际应收总金额(元)(包括滞纳金服务费等)", width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="realReceivePay")
@TableField(exist = false)
protected String realReceivePay;

@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
protected String billTypeName;
@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;
@TableField(exist = false)
protected List<Long> merchantIdList;
@TableField(exist = false)
protected String month;
@TableField(exist = false)
protected Integer onlyOwe;

}

Загрузка…
Отмена
Сохранить