diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
index 2bbe494f9..8af8cc985 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
@@ -69,7 +69,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@Excel(name = "交易价格(元)", width = 20, orderNum = "5")
private String salePriceStr;
- @Excel(name = "状态", width = 20, replace = {"可以退款_0", "已经使用_1", "已经过期_2", "已经退款_3"}, orderNum = "14")
+ @Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus")
private Integer couponOrderStatus;
@@ -141,9 +141,15 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@Transient
private Long couponId;
+
+ @Excel(name = "券类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "积分券_50", "家积分停车券_51", "消费卡_100"})
@Transient
private Integer couponType;
+ @Excel(name = "核销商户", width = 50, orderNum = "16")
+ @Transient
+ private String verifyMerchantName;
+
@Transient
private Integer floor;
@Transient
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index c843b8ca8..f24499988 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -378,6 +378,8 @@
+
+
@@ -407,14 +409,19 @@