diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplate.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplate.java
new file mode 100644
index 000000000..6c5b5a4aa
--- /dev/null
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplate.java
@@ -0,0 +1,86 @@
+package com.iformall.domain.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author gongbiao
+ */
+@Data
+public class WxBillExcelTemplate {
+
+
+ @Excel(name = "商户名", width = 20, orderNum = "2")
+ private String merchantName;
+
+ @Excel(name = "商户类型", width = 20, orderNum = "3", replace = {"店铺_1", "多经点位_2"})
+ private Integer rentShopType;
+
+ @Excel(name = "费用类型", width = 20, orderNum = "4")
+ private String billType;
+
+ @Excel(name = "实际应收金额(元)", width = 20, orderNum = "5")
+ private String receivePayStr;
+
+ @Excel(name = "实收金额(元)", width = 20, orderNum = "6")
+ private String payStr;
+
+ @Excel(name = "欠缴金额(元)", width = 20, orderNum = "7")
+ private String oweStr;
+
+ @Excel(name = "缴款截止日期", width = 20, orderNum = "8", format = "yyyy-MM-dd")
+ private Date receiveDate;
+
+ @Excel(name = "逾期天数", width = 20, orderNum = "9")
+ private Integer expiredDay;
+
+ @Excel(name = "账单状态", width = 20, orderNum = "10", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "_7"})
+ private Integer status;
+
+ private Integer billTypeValue;
+ private Long needPay;
+ private Long receivePay;
+ private Long pay;
+ private Long owe;
+ private Date payDate;
+ private Date starttime;
+ private Date endtime;
+
+ private String manager;
+ private String managerPhone;
+
+ private String shopInfo;
+
+ private String name;
+
+ @io.swagger.annotations.ApiModelProperty(value = "评论", name = "comments")
+ private String comments;
+
+ public String getReceivePayStr() {
+ if (getReceivePay() != null) {
+ receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString();
+ }
+ return receivePayStr;
+ }
+
+ public void setReceivePayStr(String receivePayStr) {
+ this.receivePayStr = receivePayStr;
+ }
+
+ public String getPayStr() {
+ if (getPay() != null) {
+ payStr = new BigDecimal(getPay()).divide(new BigDecimal(100)).toString();
+ }
+ return payStr;
+ }
+
+ public String getOweStr() {
+ if (getOwe() != null) {
+ oweStr = new BigDecimal(getOwe()).divide(new BigDecimal(100)).toString();
+ }
+ return oweStr;
+ }
+}
diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
index dbcc17885..1f905f1f7 100644
--- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
@@ -452,7 +452,7 @@
#{idItem}
- order by s.${sortColumns}
+ order by ${sortColumns}
@@ -506,7 +506,7 @@
and s.`point_type` = #{pointType}
- order by s.${sortColumns}
+ order by ${sortColumns}