Просмотр исходного кода

[胡][修改][开发优化合同需求]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
ce844b03b2
13 измененных файлов: 110 добавлений и 167 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java
  2. +14
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +26
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  5. +4
    -82
      mallinkService/src/main/java/com/iformall/domain/vo/OweMerchantVo.java
  6. +5
    -79
      mallinkService/src/main/java/com/iformall/domain/vo/WaitMerchantVo.java
  7. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java
  8. +24
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java
  9. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  10. +3
    -0
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml
  11. +7
    -0
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml
  12. +3
    -1
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
  13. +3
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 4
- 0
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() {


+ 14
- 0
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;


+ 26
- 0
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;
}


+ 1
- 0
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


+ 4
- 82
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;
}
}

+ 5
- 79
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;
}
}

+ 12
- 0
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);


+ 24
- 0
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;
}


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -771,8 +771,8 @@ public class WxBillAllServiceImpl implements WxBillAllService {
List<OweMerchantVo> list = new ArrayList<>();
for (Map<String, Object> 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<WaitMerchantVo> list = new ArrayList<>();
for (Map<String, Object> 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"));


+ 3
- 0
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Просмотреть файл

@@ -560,6 +560,9 @@
<if test="startdate!=null and enddate!=null">
and o.create_date between #{startdate} and #{enddate}
</if>
<if test="orderStatus!=null">
and o.order_status = #{orderStatus}
</if>
</where>

<if test=" null != sortColumns"> order by ${sortColumns} </if>


+ 7
- 0
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml Просмотреть файл

@@ -147,6 +147,13 @@
<if test="startdate!=null and enddate!=null">
and pso.create_time between #{startdate} and #{enddate}
</if>
<if test="sharingStatus!=null">
and pso.sharing_status = #{sharingStatus}
</if>
<if test="type!=null">
and pso.type = #{type}
</if>

</where>

<if test=" null != sortColumns"> order by ${sortColumns} </if>


+ 3
- 1
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml Просмотреть файл

@@ -134,7 +134,9 @@
<if test=" null != rentContractId">and rc.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != id">and rc.`id` = #{id}</if>
<if test=" null != rentShopType">and rc.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != applyStatus ">and rc.`apply_status` = #{applyStatus}</if>
<if test=" null != building and ''!= building">and b.id = #{building}</if>
<if test=" null != floor and ''!= floor">and f.id = #{floor}</if>
</where>

<if test=" null != sortColumns"> order by ${sortColumns} </if>


+ 3
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -138,7 +138,9 @@
<if test=" null != shopId">and rc.`shop_id` = #{shopId}</if>
<if test=" null != type ">and rc.`type` = #{type}</if>
<if test=" null != rentShopType ">and rc.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != applyStatus ">and rc.`apply_status` = #{applyStatus}</if>
<if test=" null != building and ''!= building">and b.id = #{building}</if>
<if test=" null != floor and ''!= floor">and f.id = #{floor}</if>
</where>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by rc.id desc </if>


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