diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904101312__ADD_SUB_BUSINESS_COLUMN.sql b/mallinkAdmin/src/main/resources/db/migration/V201904101312__ADD_SUB_BUSINESS_COLUMN.sql
new file mode 100644
index 000000000..70ba788ef
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201904101312__ADD_SUB_BUSINESS_COLUMN.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `wx_coupon`
+ADD COLUMN `sub_business` INT(11) NULL DEFAULT NULL AFTER `business`;
+ALTER TABLE `wx_coupon_channel`
+ADD COLUMN `sub_business` INT(11) NULL DEFAULT NULL AFTER `business`;
+ALTER TABLE `wx_merchant`
+ADD COLUMN `sub_business_id` INT(11) NULL DEFAULT NULL AFTER `business_id`;
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
index a478393a7..d86041946 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -136,6 +136,9 @@ public class WxCoupon implements Serializable {
/**业态**/
@io.swagger.annotations.ApiModelProperty(value="业态",name="business")
private Integer business;
+ /**子业态**/
+ @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness")
+ private Integer subBusiness;
/**是否支持转送(0:不支持,1支持)**/
@io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer")
private Integer supportTransfer;
@@ -327,6 +330,12 @@ public class WxCoupon implements Serializable {
public void setBusiness(Integer _business) {
business = _business;
}
+ public Integer getSubBusiness() {
+ return subBusiness;
+ }
+ public void setSubBusiness(Integer _subBusiness) {
+ subBusiness = _subBusiness;
+ }
public Integer getSupportTransfer() {
return supportTransfer;
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
index d883f5ee0..5d00faae2 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java
@@ -78,6 +78,9 @@ public class WxCouponChannel implements Serializable {
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="business")
private Integer business;
+ /**子业态**/
+ @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness")
+ private Integer subBusiness;
/*开始时间**/
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime")
private Date beginTime;
@@ -134,6 +137,15 @@ public class WxCouponChannel implements Serializable {
public void setBusiness(Integer _business) {
business = _business;
}
+
+ public Integer getSubBusiness() {
+ return subBusiness;
+ }
+
+ public void setSubBusiness(Integer subBusiness) {
+ this.subBusiness = subBusiness;
+ }
+
public Date getBeginTime() {
return beginTime;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
index 805bf740b..4b8cb6d1d 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
@@ -134,6 +134,9 @@ public class WxMerchant implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId")
private Integer businessId;
+ @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId")
+ private Integer subBusinessId;
+
@io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType")
private Integer shopType;
@@ -345,6 +348,14 @@ public class WxMerchant implements Serializable {
this.businessId = businessId;
}
+ public Integer getSubBusinessId() {
+ return subBusinessId;
+ }
+
+ public void setSubBusinessId(Integer subBusinessId) {
+ this.subBusinessId = subBusinessId;
+ }
+
public Integer getShopType() {
return shopType;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
index d0f0ca2af..c56975f31 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
@@ -30,6 +30,9 @@ public class WxMerchantVo {
/**商户业态**/
@io.swagger.annotations.ApiModelProperty(value="商户业态",name="businessId")
private Integer businessId;
+ /**商户子业态**/
+ @io.swagger.annotations.ApiModelProperty(value="商户子业态",name="subBusinessId")
+ private Integer subBusinessId;
/**商户业态**/
@io.swagger.annotations.ApiModelProperty(value="商户业态",name="parameter")
private String parameter;
@@ -98,6 +101,14 @@ public class WxMerchantVo {
this.businessId = businessId;
}
+ public Integer getSubBusinessId() {
+ return subBusinessId;
+ }
+
+ public void setSubBusinessId(Integer subBusinessId) {
+ this.subBusinessId = subBusinessId;
+ }
+
public String getMerchantImgUrl() {
return merchantImgUrl;
}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
index c6a772b11..705dd59e3 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
@@ -9,6 +9,7 @@
+
@@ -18,7 +19,7 @@
- cc.`id`,cc.`tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id`
+ cc.`id`,cc.`tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`,cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`begin_time`,cc.`end_time`,cc.`status`,cc.`create_date`,cc.`update_date`,cc.`sub_target_id`
@@ -52,6 +53,10 @@
and cc.`business` = #{business}
+
+ and cc.`sub_business` = #{subBusiness}
+
+
and cc.`create_date` between #{startdate} and #{enddate}
@@ -120,6 +125,7 @@
+
@@ -162,7 +168,7 @@
c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,
c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,
c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,
- c.create_date,c.update_date,c.business,c.support_transfer,c.press_limit_num, c.auto_refund
+ c.create_date,c.update_date,c.business,c.subBusiness,c.support_transfer,c.press_limit_num, c.auto_refund
@@ -195,6 +201,7 @@
+
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 4efb34127..4f51a0539 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -26,6 +26,7 @@
+
@@ -61,6 +62,7 @@
+
@@ -82,7 +84,7 @@
`id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
- `remark`,`status`,`create_date`,`update_date`,`business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
+ `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`
@@ -185,6 +187,10 @@
and `business` = #{business}
+
+ and `sub_business` = #{subBusiness}
+
+
and `support_transfer` = #{supportTransfer}
@@ -352,6 +358,10 @@
and c.`business` = #{business}
+
+ and `sub_business` = #{subBusiness}
+
+
and c.`support_transfer` = #{supportTransfer}
@@ -419,6 +429,7 @@
+
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml
index 947e5ed01..cca006362 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml
@@ -64,7 +64,7 @@
m.id,
- m.img_url,m.name,m.link_phone,m.status,m.business_id,
+ m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name,
cm.parameter
@@ -77,6 +77,7 @@
+
@@ -105,7 +106,7 @@
m.id,
- m.img_url,m.name,m.link_phone,m.status,m.business_id,
+ m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id,
cm.parameter
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index 84c75c35a..f7d8d6447 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -14,6 +14,7 @@
+
@@ -24,7 +25,7 @@
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`,
- `business_id`,`shop_type`,`brand`,`type`,`is_public`,email
+ `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email
@@ -66,6 +67,10 @@
and `business_id` = #{businessId}
+
+ and `sub_business_id` = #{subBusinessId}
+
+
and `car_params` like concat('%', #{carParams},'%')
@@ -108,7 +113,7 @@
m.id,
- m.img_url,m.name,m.link_phone,m.status,m.business_id,
+ m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name,m.is_public,m.email
@@ -120,6 +125,7 @@
+
@@ -172,6 +178,10 @@
and m.`business_id` = #{businessId}
+
+ and m.`sub_business_id` = #{subBusinessId}
+
+
and m.`status` = #{merchantStatus}