diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 852240f07..f51053363 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -58,7 +58,6 @@ public class WxCouponOrderController extends BaseController { wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); } - wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 16a0d41c1..14d875380 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -4,10 +4,13 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.WxBillAll; +import com.iformall.enums.EnumFilterHasPay; import com.iformall.service.WxBillAllService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.collections.map.LinkedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -95,7 +98,6 @@ public class WxBillAllController extends BaseController { } - @ApiOperation("导出欠缴商户列表") @GetMapping("/exportOweMerchantlist") @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index d86c2f317..1bfa2c6c1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -1,9 +1,9 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -63,21 +63,25 @@ public class WxBillDaily extends BaseEntity{ /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") + @SortColumn(column = "receivePay") private Long receivePay; /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; /*截止收款日期**/ @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") + @SortColumn(column = "receiveDate") private Date receiveDate; /*到账日期**/ @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") + @SortColumn(column = "payDate") private Date payDate; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; /*逾期天数**/ @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") + @SortColumn(column = "expiredDay") private Long expiredDay; /*租户**/ @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") @@ -113,7 +117,55 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value = "费用明细", name = "priceDetail") private String priceDetail; - public String getPriceDetail() { + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + @Transient + @SortColumn(column = "needPay") + private Long needPay; + + @Transient + @SortColumn(column = "latePayPrice") + private Long latePayPrice; + + @Transient + @SortColumn(column = "period") + private Integer period; + + public Integer getAllPeriod() { + return allPeriod; + } + + public void setAllPeriod(Integer allPeriod) { + this.allPeriod = allPeriod; + } + + public Long getNeedPay() { + return needPay; + } + + public void setNeedPay(Long needPay) { + this.needPay = needPay; + } + + public Long getLatePayPrice() { + return latePayPrice; + } + + public void setLatePayPrice(Long latePayPrice) { + this.latePayPrice = latePayPrice; + } + + public Integer getPeriod() { + return period; + } + + public void setPeriod(Integer period) { + this.period = period; + } + + public String getPriceDetail() { return priceDetail; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index ad875fdcb..dcf5bb0c8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -74,21 +76,25 @@ public class WxBillOther extends BaseEntity { /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") + @SortColumn(column = "receivePay") private Long receivePay; /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; /*截止收款日期**/ @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") + @SortColumn(column = "receiveDate") private Date receiveDate; /*到账日期**/ @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") + @SortColumn(column = "payDate") private Date payDate; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; /*逾期天数**/ @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") + @SortColumn(column = "expiredDay") private Long expiredDay; /*租户**/ @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") @@ -121,6 +127,34 @@ public class WxBillOther extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + @Transient + @SortColumn(column = "needPay") + private Long needPay; + + @Transient + @SortColumn(column = "latePayPrice") + private Long latePayPrice; + + @Transient + @SortColumn(column = "period") + private Integer period; + + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; + + public Integer getAllPeriod() { + return allPeriod; + } + + public void setAllPeriod(Integer allPeriod) { + this.allPeriod = allPeriod; + } + public Integer getPayWay() { return payWay; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 928eb801b..b975c482d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -1,9 +1,9 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -78,15 +78,18 @@ public class WxBillOtherDeposit extends BaseEntity { /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") + @SortColumn(column = "receivePay") private Long receivePay; /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") private Long pay; /*截止收款日期**/ @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") + @SortColumn(column = "receiveDate") private Date receiveDate; /*到账日期**/ @io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate") + @SortColumn(column = "payDate") private Date payDate; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") @@ -128,6 +131,58 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + @Transient + @SortColumn(column = "needPay") + private Long needPay; + + @Transient + @SortColumn(column = "latePayPrice") + private Long latePayPrice; + + @Transient + @SortColumn(column = "period") + private Integer period; + + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; + + public Integer getAllPeriod() { + return allPeriod; + } + + public void setAllPeriod(Integer allPeriod) { + this.allPeriod = allPeriod; + } + + public Long getNeedPay() { + return needPay; + } + + public void setNeedPay(Long needPay) { + this.needPay = needPay; + } + + public Long getLatePayPrice() { + return latePayPrice; + } + + public void setLatePayPrice(Long latePayPrice) { + this.latePayPrice = latePayPrice; + } + + public Integer getPeriod() { + return period; + } + + public void setPeriod(Integer period) { + this.period = period; + } + public Integer getPayWay() { return payWay; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index c956a3bff..f3e972edc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -1,9 +1,10 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -47,21 +48,25 @@ public class WxBillProperty extends BaseEntity { private Long propertyContractId; /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") + @SortColumn(column = "receivePay") private Long receivePay; /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; /*收款日期**/ @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") + @SortColumn(column = "receiveDate") private Date receiveDate; /*到账日期**/ @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") + @SortColumn(column = "payDate") private Date payDate; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; /*逾期天数**/ @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") + @SortColumn(column = "expiredDay") private Long expiredDay; /*租户**/ @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") @@ -77,6 +82,7 @@ public class WxBillProperty extends BaseEntity { private Integer isDel; /*应收金额**/ @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") + @SortColumn(column = "needPay") private Long needPay; /*商户ID**/ @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") @@ -110,6 +116,7 @@ public class WxBillProperty extends BaseEntity { private Date latePayTime; @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") + @SortColumn(column = "latePayPrice") private Long latePayPrice; @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") @@ -130,6 +137,18 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + public Integer getAllPeriod() { + return allPeriod; + } + + public void setAllPeriod(Integer allPeriod) { + this.allPeriod = allPeriod; + } + public String getComments() { return comments; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index a28479bb4..0802e2518 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -1,9 +1,10 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -48,21 +49,25 @@ public class WxBillRent extends BaseEntity { private Long rentContractId; /*实际应收金额**/ @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") + @SortColumn(column = "receivePay") private Long receivePay; /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; /*收款日期**/ @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") + @SortColumn(column = "receiveDate") private Date receiveDate; /*到账日期**/ @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") + @SortColumn(column = "payDate") private Date payDate; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; /*逾期天数**/ @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") + @SortColumn(column = "expiredDay") private Long expiredDay; /*租户**/ @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") @@ -78,6 +83,7 @@ public class WxBillRent extends BaseEntity { private Integer isDel; /*应收金额**/ @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") + @SortColumn(column = "needPay") private Long needPay; /*商户ID**/ @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") @@ -113,9 +119,11 @@ public class WxBillRent extends BaseEntity { private Date latePayTime; @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") + @SortColumn(column = "latePayPrice") private Long latePayPrice; @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") + @SortColumn(column = "period") private Integer period; @io.swagger.annotations.ApiModelProperty(value = "预览账单0否1是", name = "isPreview") @@ -134,6 +142,18 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + public Integer getAllPeriod() { + return allPeriod; + } + + public void setAllPeriod(Integer allPeriod) { + this.allPeriod = allPeriod; + } + public String getComments() { return comments; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 6fe0e42d8..788153e17 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -2,12 +2,9 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; import com.iformall.domain.vo.WxCouponStatisVo; -import org.apache.commons.lang3.StringUtils; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 6e81d324f..d32346dee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -1,18 +1,15 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; import com.iformall.enums.EnumCouponType; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @Table(name = "wx_coupon_channel") -public class WxCouponChannel implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxCouponChannel extends BaseEntity { @Id protected Long id; @@ -30,8 +27,10 @@ public class WxCouponChannel implements Serializable { this.id = id; } - public String getSortColumns() { - return sortColumns; + @Override + public String getSortColumns(){ + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { @@ -112,6 +111,41 @@ public class WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; + @Transient + @SortColumn(column = "sale_price") + private String salePriceStr; + + @Transient + @SortColumn(column = "use_price") + private String usePriceStr; + + @Transient + @SortColumn(column = "price") + private String priceStr; + + public String getSalePriceStr() { + return salePriceStr; + } + + public void setSalePriceStr(String salePriceStr) { + this.salePriceStr = salePriceStr; + } + + public String getUsePriceStr() { + return usePriceStr; + } + + public void setUsePriceStr(String usePriceStr) { + this.usePriceStr = usePriceStr; + } + + public String getPriceStr() { + return priceStr; + } + + public void setPriceStr(String priceStr) { + this.priceStr = priceStr; + } public String getTenantId() { return tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index 6a19f52ba..55c178ba1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -3,14 +3,11 @@ package com.iformall.domain.po; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @Table(name = "wx_msg_callback") -public class WxMsgCallback implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxMsgCallback extends BaseEntity{ @Id protected Long id; @@ -26,10 +23,13 @@ public class WxMsgCallback implements Serializable { public void setId(Long id) { this.id = id; } - + + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } + public List getIds() { return ids; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index fd7f4db89..322ee9314 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -8,9 +8,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_msg_model") -public class WxMsgModel implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxMsgModel extends BaseEntity { @Id protected Long id; @@ -26,9 +24,11 @@ public class WxMsgModel implements Serializable { public void setId(Long id) { this.id = id; } - + + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } public List getIds() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index 5282be2e8..cca3f550d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -8,9 +8,8 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "wx_msg_signature") -public class WxMsgSignature implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxMsgSignature extends BaseEntity { + @Id protected Long id; @@ -26,10 +25,13 @@ public class WxMsgSignature implements Serializable { public void setId(Long id) { this.id = id; } - + + @Override public String getSortColumns() { - return sortColumns; + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); } + public List getIds() { return ids; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index efee2aa5d..9ff040fa1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -1,5 +1,8 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; +import io.swagger.models.auth.In; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -63,6 +66,35 @@ public class WxRentContract extends BaseEntity { @Transient private String depositStr; + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + @Transient + @SortColumn(column = "period") + private Integer period; + + @Transient + @SortColumn(column = "needPay") + private Integer needPay; + + @Transient + @SortColumn(column = "receivePay") + private Integer receivePay; + + @Transient + @SortColumn(column = "owe") + private Integer owe; + + @Transient + @SortColumn(column = "receiveDate") + private String receiveDate; + + @Transient + @SortColumn(column = "latePayPrice") + private Integer latePayPrice; + + /** * 月计租方式 3按自然月 * adjustPeriod 1日 2月 monthHandleType 2按账单周期 3按自然月 @@ -71,6 +103,62 @@ public class WxRentContract extends BaseEntity { @Transient private Integer monthHandleType; + public Integer getAllPeriod() { + return allPeriod; + } + + public void setAllPeriod(Integer allPeriod) { + this.allPeriod = allPeriod; + } + + public Integer getPeriod() { + return period; + } + + public void setPeriod(Integer period) { + this.period = period; + } + + public Integer getNeedPay() { + return needPay; + } + + public void setNeedPay(Integer needPay) { + this.needPay = needPay; + } + + public Integer getReceivePay() { + return receivePay; + } + + public void setReceivePay(Integer receivePay) { + this.receivePay = receivePay; + } + + public Integer getOwe() { + return owe; + } + + public void setOwe(Integer owe) { + this.owe = owe; + } + + public String getReceiveDate() { + return receiveDate; + } + + public void setReceiveDate(String receiveDate) { + this.receiveDate = receiveDate; + } + + public Integer getLatePayPrice() { + return latePayPrice; + } + + public void setLatePayPrice(Integer latePayPrice) { + this.latePayPrice = latePayPrice; + } + public Integer getMonthHandleType() { return monthHandleType; } @@ -139,6 +227,7 @@ public class WxRentContract extends BaseEntity { /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") + @SortColumn(column = "payDate") private Integer payDate; /*是否删除1是0否**/ @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 234be8a32..d0974e874 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -1,6 +1,9 @@ package com.iformall.domain.vo; +import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; + +import javax.persistence.Transient; import java.util.List; /** @@ -59,18 +62,35 @@ public class WxBillAll extends BaseEntity { //费用收缴数据 @io.swagger.annotations.ApiModelProperty(value = "欠缴租金", name = "rentOwe") + @SortColumn(column = "rentOwe") private Integer rentOwe; @io.swagger.annotations.ApiModelProperty(value = "欠缴物业费", name = "propertyOwe") + @SortColumn(column = "propertyOwe") private Integer propertyOwe; @io.swagger.annotations.ApiModelProperty(value = "欠缴押金", name = "depositOwe") + @SortColumn(column = "depositOwe") private Integer depositOwe; @io.swagger.annotations.ApiModelProperty(value = "欠缴其他费用", name = "otherOwe") + @SortColumn(column = "otherOwe") private Integer otherOwe; @io.swagger.annotations.ApiModelProperty(value = "欠缴总额", name = "totalOwe") + @SortColumn(column = "totalOwe") private Integer totalOwe; private List billTypeList; + @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") + @Transient + private Integer filterHasPay; + + public Integer getFilterHasPay() { + return filterHasPay; + } + + public void setFilterHasPay(Integer filterHasPay) { + this.filterHasPay = filterHasPay; + } + public List getBillTypeList() { return billTypeList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 5bda75a9b..441d02d75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -199,6 +199,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { this.sendType = sendType; } + @Override public String getSalePriceStr() { if(salePrice!=null) { salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); @@ -209,7 +210,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public void setSalePriceStr(String salePriceStr) { this.salePriceStr = salePriceStr; } - + @Override public String getUsePriceStr() { if(usePrice!=null) { usePriceStr = new BigDecimal(usePrice).divide(new BigDecimal(100)).toString(); @@ -220,7 +221,7 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public void setUsePriceStr(String usePriceStr) { this.usePriceStr = usePriceStr; } - + @Override public String getPriceStr() { if(price!=null) { priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFilterHasPay.java b/mallinkService/src/main/java/com/iformall/enums/EnumFilterHasPay.java new file mode 100644 index 000000000..726527c2f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFilterHasPay.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumFilterHasPay { + + + HAS_PAY(1, "过滤已收"), + ; + + public static EnumFilterHasPay getEnum(Integer code) { + for (EnumFilterHasPay value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumFilterHasPay(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/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 1790beb4c..66fdede14 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -41,4 +41,5 @@ public interface WxBillAllMapper { * @return */ List> getOweBillAsPage(WxBillAll record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 802bd6b65..ad8e72a23 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -43,7 +43,6 @@ public interface WxBillAllService { */ Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); - void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void updateBillStatus(WxBillAll record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 019848b75..16f1906f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -790,4 +790,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { String name = "欠缴商户列表"; excelService.exportExcel(list,null, name, OweMerchantVo.class,name+".xls",response); } + + } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 9c5c1796e..455496c6b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -510,37 +510,102 @@ select bill.tenant_id,bill.merchant_id,bill.bill_type,sum(owe) owe,bill.receive_date,bill.expired_day from ( select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' - bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_rent where is_preview = 0 and status = 1 and tenant_id = #{tenantId} + bill_type,need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' + endtime,rent_shop_type from wx_bill_rent where is_preview = 0 and status = #{status} and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' - bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_property where is_preview = 0 and status = 1 and tenant_id = #{tenantId} + bill_type,need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' + endtime,rent_shop_type from wx_bill_property where is_preview = 0 and status = #{status} and tenant_id = #{tenantId} union select res.id,res.merchant_id,res.shop_id,res.tenant_id,res.name,res.bill_type_value,res.bill_type,res.need_pay, res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type from( select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,2 bill_type_value,'欠缴押金' - bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_rent_deposit where status = 1 and tenant_id = #{tenantId} + bill_type,need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' + endtime,rent_shop_type from wx_bill_rent_deposit where status = #{status} and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,4 bill_type_value,'欠缴押金' - bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type from wx_bill_property_deposit where status = 1 and tenant_id = #{tenantId} + bill_type,need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' + endtime,rent_shop_type from wx_bill_property_deposit where status = #{status} and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,8 bill_type_value,'欠缴押金' bill_type,0 as - need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type - from wx_bill_other_deposit where status = 1 and tenant_id = #{tenantId} + need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type + from wx_bill_other_deposit where status = #{status} and tenant_id = #{tenantId} ) res union select res.id,res.merchant_id,res.shop_id,res.tenant_id,res.name,res.bill_type_value,res.bill_type,res.need_pay, - res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type from( + res.receive_pay,res.pay, + owe + ,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type from( select id,merchant_id,shop_id,tenant_id,'其他费用' name,5 bill_type_value,'其他费用' bill_type,0 as - need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type - from wx_bill_daily where type in(1,2) and status = 1 and tenant_id = #{tenantId} + need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type + from wx_bill_daily where type in(1,2) and status = #{status} and tenant_id = #{tenantId} union select id,merchant_id,shop_id,tenant_id,'其他费用' name,7 bill_type_value,'其他费用' bill_type,0 as - need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type - from wx_bill_other where status = 1 and tenant_id = #{tenantId} + need_pay,receive_pay,pay, + + + (receive_pay-pay) owe + + + owe + + + ,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type + from wx_bill_other where status = #{status} and tenant_id = #{tenantId} ) res ) bill @@ -554,7 +619,13 @@ left join wx_merchant_shop ms on ms.`merchant_id` = m.id left join wx_shop ws on ms.`shop_id` = ws.id where m.status=1 and m.tenant_id = #{tenantId} + + and date_format(bill.receive_date,'%Y-%m')=#{month} + + order by ${sortColumns} order by totalOwe desc + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 477ec0ad6..2b0bb4b18 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -376,6 +376,7 @@ order by ${sortColumns} + order by id desc