Browse Source

[统计][修改][调整收缴率百分比精度]

release_toaliyun_real
luozukai 7 years ago
parent
commit
9557362cf0
24 changed files with 114 additions and 46 deletions
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java
  2. +7
    -8
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  3. +4
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  4. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  5. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  6. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  7. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
  8. +6
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  9. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  10. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  11. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  12. +8
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  13. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  14. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  15. +8
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java
  16. +8
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java
  17. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  18. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  19. +3
    -1
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  20. +2
    -1
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  21. +3
    -1
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  22. +4
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml
  23. +3
    -1
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml
  24. +2
    -2
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java View File

@@ -17,4 +17,10 @@ public class WxOrderReportDto extends BaseEntity{
private Date endTime;
private Integer type;
private Integer orderStatus;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
}

+ 7
- 8
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java View File

@@ -12,9 +12,7 @@ import java.util.List;
* @author gongbiao
*/
@Table(name = "wx_bill_daily")
public class WxBillDaily implements Serializable {
private static final long serialVersionUID = 1L;
public class WxBillDaily extends BaseEntity{
@Id
protected Long id;
@@ -29,17 +27,18 @@ public class WxBillDaily implements Serializable {
public void setId(Long id) {
this.id = id;
}
public String getSortColumns() {
return sortColumns;
}

public List<Long> getIds() {
return ids;
}
public void setIds(List<Long> ids) {
this.ids = ids;
}

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
@Transient
private String merchantName;



+ 4
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java View File

@@ -12,9 +12,7 @@ import java.util.List;
* @author gongbiao
*/
@Table(name = "wx_bill_other")
public class WxBillOther implements Serializable {
private static final long serialVersionUID = 1L;
public class WxBillOther extends BaseEntity {
@Id
protected Long id;
@@ -29,10 +27,11 @@ public class WxBillOther 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<Long> getIds() {
return ids;
}


+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java View File

@@ -12,9 +12,7 @@ import java.util.List;
* @author gongbiao
*/
@Table(name = "wx_bill_other_deposit")
public class WxBillOtherDeposit implements Serializable {
private static final long serialVersionUID = 1L;

public class WxBillOtherDeposit extends BaseEntity {
@Id
protected Long id;

@@ -31,8 +29,10 @@ public class WxBillOtherDeposit implements Serializable {
this.id = id;
}

@Override
public String getSortColumns() {
return sortColumns;
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

public List<Long> getIds() {


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java View File

@@ -21,7 +21,11 @@ public class WxBillProperty extends BaseEntity {
protected List<Long> ids;
@Transient
protected String sortColumns;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public Long getId() {
return id;
}


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java View File

@@ -21,7 +21,11 @@ public class WxBillRent extends BaseEntity {
protected List<Long> ids;
@Transient
protected String sortColumns;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public Long getId() {
return id;
}


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java View File

@@ -19,7 +19,11 @@ public class WxBrand extends BaseEntity{
protected List<Long> ids;
@Transient
protected String sortColumns;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public Long getId() {
return id;
}


+ 6
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java View File

@@ -12,10 +12,7 @@ import java.io.Serializable;

@Table(name = "wx_merchant_subsidy")
@Data
public class WxMerchantSubsidy implements Serializable {
private static final long serialVersionUID = 1L;


public class WxMerchantSubsidy extends BaseEntity {
@Id
protected Long id;
@@ -28,6 +25,11 @@ public class WxMerchantSubsidy implements Serializable {
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
/**租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;


+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java View File

@@ -8,9 +8,7 @@ import java.util.Date;
import java.util.List;

@Table(name = "wx_order")
public class WxOrder implements Serializable {
private static final long serialVersionUID = 1L;
public class WxOrder extends BaseEntity {
@Id
protected Long id;
@@ -26,11 +24,13 @@ public class WxOrder 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<Long> getIds() {
return ids;
}


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java View File

@@ -27,7 +27,11 @@ public class WxPropertyContract extends BaseEntity {
protected List<Long> ids;
@Transient
protected String sortColumns;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public Long getId() {
return id;
}


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -21,7 +21,11 @@ public class WxRentContract extends BaseEntity {
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public Long getId() {
return id;
}


+ 8
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java View File

@@ -1,6 +1,8 @@
package com.iformall.domain.po;

import cn.afterturn.easypoi.excel.annotation.Excel;
import com.iformall.common.SortColumn;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -40,7 +42,11 @@ public class WxShop extends BaseEntity {

@Transient
private String linkPhone;
@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@@ -57,6 +63,7 @@ public class WxShop extends BaseEntity {
/*建筑面积**/
@io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea")
@Excel(name="建筑面积(㎡)",width = 20,orderNum = "5")
@SortColumn(column = "buildArea")
private String buildArea;
/*经营面积**/
@io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea")


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java View File

@@ -7,7 +7,11 @@ import java.util.List;
* @author gongbiao
*/
public class WxBillAll extends BaseEntity {

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
@io.swagger.annotations.ApiModelProperty(value="appId",name="appId")
private String appId;



+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java View File

@@ -14,7 +14,11 @@ public class WxMerchantTradeDailyVo extends BaseEntity {
protected List<String> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public Long getId() {
return id;
}


+ 8
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java View File

@@ -1,12 +1,14 @@
package com.iformall.domain.vo;

import com.iformall.domain.po.BaseEntity;

import java.io.Serializable;
import java.util.Date;

/**
* @author gongbiao
*/
public class WxOrderQueryVo implements Serializable {
public class WxOrderQueryVo extends BaseEntity {

@io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId")
private String tenantId;
@@ -22,6 +24,11 @@ public class WxOrderQueryVo implements Serializable {

private Integer payment;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}
public String getTenantId() {
return tenantId;
}


+ 8
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java View File

@@ -1,12 +1,12 @@
package com.iformall.domain.vo;

import java.io.Serializable;
import com.iformall.domain.po.BaseEntity;
import java.util.Date;

/**
* @author gongbiao
*/
public class WxProfitSharingOrderQueryVo implements Serializable {
public class WxProfitSharingOrderQueryVo extends BaseEntity {

@io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId")
private String tenantId;
@@ -23,6 +23,12 @@ public class WxProfitSharingOrderQueryVo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate")
private Date enddate;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

public Long getId() {
return id;
}


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java View File

@@ -178,7 +178,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
}
}


@Override
public void deleteById(Long id) {
wxBillDailyMapper.deleteByPrimaryKey(id);


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -2309,12 +2309,17 @@ public class WxChartServiceImpl implements WxChartDataService {
datamap.put("total",total);
datamap.put("totalShop",totalShop);
datamap.put("totalPoint",totalPoint);

datamap.put("rentTotal",rentTotal);
datamap.put("rentTotalShop",rentTotalShop);
datamap.put("rentTotalPoint",rentTotalPoint);

datamap.put("notRentTotal",notRentTotal);
datamap.put("notRentTotalShop",notRentTotalShop);
datamap.put("notRentTotalPoint",notRentTotalPoint);

double totalRentRate = rentTotal/total*100;
// datamap.put("totalPoint",su);
return new ResultData(datamap);
}



+ 3
- 1
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml View File

@@ -83,7 +83,9 @@
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
</where>
order by id desc

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns">order by id desc</if>
</select>
<update id="updateNotPaidStatus" parameterType="hashmap">


+ 2
- 1
mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml View File

@@ -89,7 +89,8 @@
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
</where>
order by id desc
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by id desc </if>
</select>
<update id="updateNotPaidStatus" parameterType="hashmap">


+ 3
- 1
mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml View File

@@ -84,7 +84,9 @@
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>

</where>
order by id desc

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

<update id="updateNotPaidStatus" parameterType="hashmap">


+ 4
- 1
mallinkService/src/main/resources/mapper/WxOrderMapper.xml View File

@@ -559,7 +559,10 @@
and o.create_date between #{startdate} and #{enddate}
</if>
</where>
order by o.id desc

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns">order by o.id desc</if>

</select>


+ 3
- 1
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml View File

@@ -148,7 +148,9 @@
and pso.create_time between #{startdate} and #{enddate}
</if>
</where>
order by pso.id desc

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns">order by pso.id desc</if>
</select>
<select id="queryOrderForMerchantCount" resultType="Long" parameterType="hashmap">


+ 2
- 2
mallinkService/src/main/resources/mapper/WxShopMapper.xml View File

@@ -149,7 +149,7 @@
</select>

<select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap">
select s.id,s.shop_number shopNumber,s.build_area buildArea,
select s.id,s.shop_number shopNumber,CONVERT( s.build_area,SIGNED) buildArea,
s.img_url imgUrl,s.operation_area operationArea,
s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId,
m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone,
@@ -258,7 +258,7 @@
</foreach>
</if>

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

</select>



Loading…
Cancel
Save