diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java
index 8b051691a..39db0f5f7 100644
--- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java
+++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java
@@ -50,6 +50,9 @@ public class WxCouponCVo implements Serializable {
@Transient
private String priceStr;
+ /*频道id**/
+ @io.swagger.annotations.ApiModelProperty(value="频道id",name="couponChannelId")
+ private Long couponChannelId;
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@@ -170,6 +173,13 @@ public class WxCouponCVo implements Serializable {
private String floorName;
+ public Long getCouponChannelId() {
+ return couponChannelId;
+ }
+
+ public void setCouponChannelId(Long couponChannelId) {
+ this.couponChannelId = couponChannelId;
+ }
public String getTenantId() {
return tenantId;
@@ -437,6 +447,7 @@ public class WxCouponCVo implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,CouponChannelId_ASC("`couponChannelId` ASC"),CouponChannelId_DESC("`couponChannelId` DESC")
,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 1c112f384..8293cd513 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -465,6 +465,7 @@
+
@@ -507,7 +508,7 @@
- c.id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business,
+ c.id,cc.id as counpon_channel_id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business,
m.img_url,m.name,m.link_phone,m.status,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name,