From b9825928a54e67877e02c7939243d79f6e11c365 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Dec 2018 16:34:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=AD=89=E7=BA=A7=E3=80=81=E6=8A=98=E6=89=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=EF=BC=8C=E5=95=86=E6=88=B7=E6=8A=98=E6=89=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxLevelConfig.java | 41 ++-- .../com/iformall/domain/po/WxMerchant.java | 33 +++ .../resources/mapper/WxLevelConfigMapper.xml | 15 +- .../resources/mapper/WxMerchantMapper.xml | 218 +++++++++--------- 4 files changed, 174 insertions(+), 133 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java index 1b946062e..419b0b5df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfig.java @@ -38,29 +38,37 @@ public class WxLevelConfig implements Serializable { public void setIds(List ids) { this.ids = ids; } + + /**租户id**/ + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + private String tenantId; - - - /*成长值**/ + /**成长值**/ @io.swagger.annotations.ApiModelProperty(value="成长值",name="points") private Integer points; - /*等级**/ + /**等级**/ @io.swagger.annotations.ApiModelProperty(value="等级",name="level") private String level; - /*描述**/ + /**描述**/ @io.swagger.annotations.ApiModelProperty(value="描述",name="description") private String description; - /*创建时间**/ + /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /*租户id**/ - @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") - private String tenantId; + /**是否启用,0:未启用,启用1,2,3,分别对应wx_merchant_discount里的rate_vip1, rate_vip2, rate_vip3**/ + @io.swagger.annotations.ApiModelProperty(value="是否启用",name="discountEnable") + private Integer discountEnable; @Transient protected Long count; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } public Integer getPoints() { return points; @@ -86,12 +94,7 @@ public class WxLevelConfig implements Serializable { public void setCreateDate(Date _createDate) { createDate = _createDate; } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } + public Long getCount() { return count; @@ -101,6 +104,14 @@ public class WxLevelConfig implements Serializable { this.count = count; } + public Integer getDiscountEnable() { + return discountEnable; + } + + public void setDiscountEnable(Integer discountEnable) { + this.discountEnable = discountEnable; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 347668574..ab87c0f0f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -172,6 +172,15 @@ public class WxMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="银行账号",name="bankAccount") private String bankAccount; + @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") + private Integer vipDiscountRate1; + + @io.swagger.annotations.ApiModelProperty(value="VIP折扣率2",name="vipDiscountRate2") + private Integer vipDiscountRate2; + + @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") + private Integer vipDiscountRate3; + public List> getShoplist() { return shoplist; @@ -497,6 +506,30 @@ public class WxMerchant implements Serializable { this.bankAccount = bankAccount; } + public Integer getVipDiscountRate1() { + return vipDiscountRate1; + } + + public void setVipDiscountRate1(Integer vipDiscountRate1) { + this.vipDiscountRate1 = vipDiscountRate1; + } + + public Integer getVipDiscountRate2() { + return vipDiscountRate2; + } + + public void setVipDiscountRate2(Integer vipDiscountRate2) { + this.vipDiscountRate2 = vipDiscountRate2; + } + + public Integer getVipDiscountRate3() { + return vipDiscountRate3; + } + + public void setVipDiscountRate3(Integer vipDiscountRate3) { + this.vipDiscountRate3 = vipDiscountRate3; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 2f58658b1..28bd89a36 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -3,15 +3,16 @@ + - + - `id`,`points`,`level`,`description`,`create_date`,`tenant_id` + `id`, `tenant_id`, `points`, `level`, `description`, `create_date`, `discount_enable` @@ -21,6 +22,10 @@ and `id` = #{id} + + and `tenant_id` = #{tenantId} + + and `points` = #{points} @@ -37,9 +42,11 @@ and `create_date` = #{createDate} - - and `tenant_id` = #{tenantId} + + and `discount_enable` = #{discountEnable} + + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 2c3f34215..e0afbaba3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -1,123 +1,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `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`,`corp_papers_type`,`corp_papers_number`,`corp_papers_person`,`corp_papers_pic_face`, `corp_papers_pic_back`,`taxpayer_type`,`tax_papers_type`,`tax_papers_number`,`invoice_type`,`invoice_buyer`, - `taxpayer_identify_number``invoice_address_phone`,`bank_account_number`,`bank_account_person`,`bank_name`,`bank_account` + `taxpayer_identify_number``invoice_address_phone`,`bank_account_number`,`bank_account_person`,`bank_name`,`bank_account`, + `vip_discount_rate1`,`vip_discount_rate2`,`vip_discount_rate3` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` = #{tenantId} - - - - - and `img_url` like concat('%', #{imgUrl},'%') - - - - - and `name` like concat('%', #{name},'%') - - - - - and `link_phone` like concat('%', #{linkPhone},'%') - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - - and `car_vendor_type` = #{carVendorType} - - - - - and `car_params` like concat('%', #{carParams},'%') - - - - - - and `status` = #{status} - - - - and `link_person` = #{linkPerson} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `img_url` like concat('%', #{imgUrl},'%') + + + + and `name` like concat('%', #{name},'%') + + + + and `link_phone` like concat('%', #{linkPhone},'%') + + + + and `create_date` = #{createDate} + + + + and `update_date` = #{updateDate} + + + + and `car_vendor_type` = #{carVendorType} + + + + and `car_params` like concat('%', #{carParams},'%') + + + + + and `status` = #{status} + + + and `link_person` = #{linkPerson} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + +