diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java
index c7d5b6d5b..0253d3285 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java
@@ -7,28 +7,33 @@ import java.io.Serializable;
public class WxMerchantMicroPayVo implements Serializable {
private static final long serialVersionUID = 1L;
- @Id
+ /*商户id**/
protected Long id;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId")
private String tenantId;
- /*商户id**/
- @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId")
- private Long merchantId;
/*交易额**/
@io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt")
private Integer tradeAmt;
/*日期**/
@io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate")
private String reportDate;
-
-
+ /*商户电话**/
+ @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId")
+ private Long merchantPhone;
/*商户名**/
@io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName")
private String merchantName;
-
public String getMerchantName() {
return merchantName;
}
@@ -45,14 +50,6 @@ public class WxMerchantMicroPayVo implements Serializable {
tenantId = _tenantId;
}
- public Long getMerchantId() {
- return merchantId;
- }
-
- public void setMerchantId(Long _merchantId) {
- merchantId = _merchantId;
- }
-
public Integer getTradeAmt() {
return tradeAmt;
}
@@ -61,6 +58,14 @@ public class WxMerchantMicroPayVo implements Serializable {
tradeAmt = _tradeAmt;
}
+ public Long getMerchantPhone() {
+ return merchantPhone;
+ }
+
+ public void setMerchantPhone(Long merchantPhone) {
+ this.merchantPhone = merchantPhone;
+ }
+
public String getReportDate() {
return reportDate;
}
diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
index 363239218..0e11d120e 100644
--- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
@@ -347,37 +347,40 @@
+
- m.id as id,
- m.tenant_id as tenant_id,
- m.name as merchant_name,
+ wm.id as id,
+ wm.tenant_id as tenant_id,
+ wm.name as merchant_name,
+ wm.link_phone as merchant_phone,
+ mo.xTime as report_date,
(case when mo.amount > 0 then mo.amount else 0 end) trade_amt