From ce844b03b273659c0f88c705dcc29b0fc81140df Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 17 May 2019 17:41:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=83=A1][=E4=BF=AE=E6=94=B9][=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C=E9=9C=80=E6=B1=82?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/MarkingCouponDataReportDto.java | 4 + .../java/com/iformall/domain/po/WxCoupon.java | 14 +++ .../domain/po/WxPropertyContract.java | 26 ++++++ .../iformall/domain/po/WxRentContract.java | 1 + .../com/iformall/domain/vo/OweMerchantVo.java | 86 +------------------ .../iformall/domain/vo/WaitMerchantVo.java | 84 ++---------------- .../iformall/domain/vo/WxOrderQueryVo.java | 12 +++ .../vo/WxProfitSharingOrderQueryVo.java | 24 ++++++ .../service/impl/WxBillAllServiceImpl.java | 8 +- .../main/resources/mapper/WxOrderMapper.xml | 3 + .../mapper/WxProfitSharingOrderMapper.xml | 7 ++ .../mapper/WxPropertyContractMapper.xml | 4 +- .../resources/mapper/WxRentContractMapper.xml | 4 +- 13 files changed, 110 insertions(+), 167 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 5e961249e..746b00649 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -26,6 +26,10 @@ public class MarkingCouponDataReportDto extends BaseEntity{ @SortColumn(column = "sendCount") private Integer sendCount; + @Transient + private Integer pv; + @Transient + private Integer uv; @Override public String getSortColumns() { 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 2c175137d..9ebc24c11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -194,6 +194,20 @@ public class WxCoupon extends BaseEntity { private Integer pressJoinCount; @Transient private Integer paymentRate; + @Transient + private Integer saleCount; + @Transient + private Integer transferCount; + @Transient + private Integer saleAmount; + @Transient + private Integer sumPayment; + @Transient + private Integer sumSubsidy; + @Transient + private Integer backpayCount; + @Transient + private Integer pressSuccCount; public Long getCouponChannelId() { return couponChannelId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 7c9e97df9..1cf5bab4f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.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; @@ -46,6 +48,7 @@ public class WxPropertyContract extends BaseEntity { } @Transient + @SortColumn(column = "shopNumber") private String shopNumber; public String getShopNumber() { @@ -192,6 +195,29 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") private Integer priceUnit; + + @Transient + private String building; + + @Transient + private String floor; + + public String getBuilding() { + return building; + } + + public void setBuilding(String building) { + this.building = building; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + public Integer getPriceUnit() { return priceUnit; } 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 0ec12b6d2..3a62d4810 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -43,6 +43,7 @@ public class WxRentContract extends BaseEntity { } @Transient + @SortColumn(column = "shopNumber") private String shopNumber; @Transient diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java index aef79ec20..103b2cff2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java @@ -1,17 +1,18 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; - +import lombok.Data; import java.math.BigDecimal; +@Data public class OweMerchantVo { @Excel(name="商户名",width = 20,orderNum = "1") private String name; @Excel(name="楼座",width = 20,orderNum = "2") - private Long building; + private String building; @Excel(name="楼层",width = 20,orderNum = "3") - private Long floor; + private String floor; @Excel(name="负责人",width = 20,orderNum = "4") private String linkPerson; @Excel(name="负责人电话",width = 20,orderNum = "5") @@ -27,83 +28,4 @@ public class OweMerchantVo { @Excel(name="欠缴总额(元)",width = 20,orderNum = "10") private BigDecimal totalOwe; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getBuilding() { - return building; - } - - public void setBuilding(Long building) { - this.building = building; - } - - public Long getFloor() { - return floor; - } - - public void setFloor(Long floor) { - this.floor = floor; - } - - public String getLinkPerson() { - return linkPerson; - } - - public void setLinkPerson(String linkPerson) { - this.linkPerson = linkPerson; - } - - public String getLinkPhone() { - return linkPhone; - } - - public void setLinkPhone(String linkPhone) { - this.linkPhone = linkPhone; - } - - public BigDecimal getRentOwe() { - return rentOwe; - } - - public void setRentOwe(BigDecimal rentOwe) { - this.rentOwe = rentOwe; - } - - public BigDecimal getPropertyOwe() { - return propertyOwe; - } - - public void setPropertyOwe(BigDecimal propertyOwe) { - this.propertyOwe = propertyOwe; - } - - public BigDecimal getDepositOwe() { - return depositOwe; - } - - public void setDepositOwe(BigDecimal depositOwe) { - this.depositOwe = depositOwe; - } - - public BigDecimal getOtherOwe() { - return otherOwe; - } - - public void setOtherOwe(BigDecimal otherOwe) { - this.otherOwe = otherOwe; - } - - public BigDecimal getTotalOwe() { - return totalOwe; - } - - public void setTotalOwe(BigDecimal totalOwe) { - this.totalOwe = totalOwe; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java index 988cd5666..493f0de89 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java @@ -1,17 +1,20 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; import java.math.BigDecimal; + +@Data public class WaitMerchantVo { @Excel(name="商户名",width = 20,orderNum = "1") private String name; @Excel(name="楼座",width = 20,orderNum = "2") - private Long building; + private String building; @Excel(name="楼层",width = 20,orderNum = "3") - private Long floor; + private String floor; @Excel(name="负责人",width = 20,orderNum = "4") private String linkPerson; @Excel(name="负责人电话",width = 20,orderNum = "5") @@ -27,83 +30,6 @@ public class WaitMerchantVo { @Excel(name="应收总额(元)",width = 20,orderNum = "10") private BigDecimal totalReceivePay; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getBuilding() { - return building; - } - - public void setBuilding(Long building) { - this.building = building; - } - - public Long getFloor() { - return floor; - } - - public void setFloor(Long floor) { - this.floor = floor; - } - - public String getLinkPerson() { - return linkPerson; - } - - public void setLinkPerson(String linkPerson) { - this.linkPerson = linkPerson; - } - - public String getLinkPhone() { - return linkPhone; - } - - public void setLinkPhone(String linkPhone) { - this.linkPhone = linkPhone; - } - - public BigDecimal getRentReceivePay() { - return rentReceivePay; - } - - public void setRentReceivePay(BigDecimal rentReceivePay) { - this.rentReceivePay = rentReceivePay; - } - - public BigDecimal getPropertyReceivePay() { - return propertyReceivePay; - } - - public void setPropertyReceivePay(BigDecimal propertyReceivePay) { - this.propertyReceivePay = propertyReceivePay; - } - - public BigDecimal getDepositReceivePay() { - return depositReceivePay; - } - - public void setDepositReceivePay(BigDecimal depositReceivePay) { - this.depositReceivePay = depositReceivePay; - } - - public BigDecimal getOtherReceivePay() { - return otherReceivePay; - } - - public void setOtherReceivePay(BigDecimal otherReceivePay) { - this.otherReceivePay = otherReceivePay; - } - public BigDecimal getTotalReceivePay() { - return totalReceivePay; - } - public void setTotalReceivePay(BigDecimal totalReceivePay) { - this.totalReceivePay = totalReceivePay; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index 08add70f9..60c14baeb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; +import javax.persistence.Transient; import java.io.Serializable; import java.util.Date; @@ -24,6 +25,17 @@ public class WxOrderQueryVo extends BaseEntity { private Integer payment; + @Transient + private Integer orderStatus; + + public Integer getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(Integer orderStatus) { + this.orderStatus = orderStatus; + } + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index 0b3678c1e..fa1ecdd20 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -1,6 +1,8 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; + +import java.beans.Transient; import java.util.Date; /** @@ -23,12 +25,34 @@ public class WxProfitSharingOrderQueryVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") private Date enddate; + @javax.persistence.Transient + private Integer sharingStatus; + + @javax.persistence.Transient + private Integer type; + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getSharingStatus() { + return sharingStatus; + } + + public void setSharingStatus(Integer sharingStatus) { + this.sharingStatus = sharingStatus; + } + public Long getId() { return id; } 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 6b1a0aebf..46ff1ff18 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -771,8 +771,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { List list = new ArrayList<>(); for (Map map:data) { OweMerchantVo oweMerchantVo = new OweMerchantVo(); - oweMerchantVo.setBuilding((Long)map.get("building")); - oweMerchantVo.setFloor((Long)map.get("floor")); + oweMerchantVo.setBuilding((String)map.get("building")); + oweMerchantVo.setFloor((String)map.get("floor")); oweMerchantVo.setLinkPerson((String)map.get("manager")); oweMerchantVo.setName((String)map.get("merchantName")); oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); @@ -794,8 +794,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { List list = new ArrayList<>(); for (Map map:data) { WaitMerchantVo oweMerchantVo = new WaitMerchantVo(); - oweMerchantVo.setBuilding((Long)map.get("building")); - oweMerchantVo.setFloor((Long)map.get("floor")); + oweMerchantVo.setBuilding((String)map.get("building")); + oweMerchantVo.setFloor((String)map.get("floor")); oweMerchantVo.setLinkPerson((String)map.get("manager")); oweMerchantVo.setName((String)map.get("merchantName")); oweMerchantVo.setLinkPhone((String)map.get("managerPhone")); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 1b4885548..7c181ca51 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -560,6 +560,9 @@ and o.create_date between #{startdate} and #{enddate} + + and o.order_status = #{orderStatus} + order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 93f7ef3f8..2b503c744 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -147,6 +147,13 @@ and pso.create_time between #{startdate} and #{enddate} + + and pso.sharing_status = #{sharingStatus} + + + and pso.type = #{type} + + order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 9dd4e0dc5..6d53beeaa 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -134,7 +134,9 @@ and rc.`rent_contract_id` = #{rentContractId} and rc.`id` = #{id} and rc.`rent_shop_type` = #{rentShopType} - + and rc.`apply_status` = #{applyStatus} + and b.id = #{building} + and f.id = #{floor} order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 2712dc1aa..5a704f7f2 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -138,7 +138,9 @@ and rc.`shop_id` = #{shopId} and rc.`type` = #{type} and rc.`rent_shop_type` = #{rentShopType} - + and rc.`apply_status` = #{applyStatus} + and b.id = #{building} + and f.id = #{floor} order by ${sortColumns} order by rc.id desc