From ac644257080756e76d660c688623755b2dde4735 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 3 Dec 2018 18:19:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=A0=E9=99=A4Coupon=E8=A1=A8=E5=86=97=E4=BD=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5targetAd=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=9A=E6=80=81?= =?UTF-8?q?=E9=A1=B9=E4=B8=BA=E5=8D=95=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCarController.java | 8 +++---- .../controller/WxCouponController.java | 10 ++------- .../java/com/iformall/domain/po/WxCoupon.java | 16 +++----------- .../iformall/domain/po/WxCouponChannel.java | 6 +++--- .../com/iformall/domain/vo/WxCouponCVo.java | 16 +++----------- .../com/iformall/domain/vo/WxCouponCarVo.java | 6 +++--- .../main/resources/mapper/WxCouponMapper.xml | 21 ++++++------------- 7 files changed, 23 insertions(+), 60 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index 2dc2e9756..91f37e774 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -225,10 +225,9 @@ public class WxCarController extends BaseController { priceStr = priceStr.replace("小时", ""); wxCoupon.setPrice((int) (Double.parseDouble(priceStr) * 100)); } - if (StringUtils.isNotBlank(coupon.getBusiness())) { - String[] arys = coupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); - } + + wxCoupon.setBusiness(coupon.getBusiness()); + if(coupon.getId() != null && coupon.getId().longValue() > 0) { wxCoupon.setId(coupon.getId()); } @@ -237,7 +236,6 @@ public class WxCarController extends BaseController { wxCoupon.setTitle(coupon.getTitle()); wxCoupon.setSubTitle(coupon.getSubTitle()); wxCoupon.setUseLimitQuantity(coupon.getUseLimitQuantity()); - wxCoupon.setTargetAd(coupon.getTargetAd()); wxCoupon.setSendType(coupon.getSendType()); wxCoupon.setValidType(coupon.getValidType()); wxCoupon.setValidStartDate(coupon.getValidStartDate()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index 6081ce3e2..d4a882c82 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -114,10 +114,7 @@ public class WxCouponController extends BaseController { if (StringUtils.isNotEmpty(wxCoupon.getPriceStr())) { wxCoupon.setPrice((int) (Double.parseDouble(wxCoupon.getPriceStr()) * 100)); } - if (StringUtils.isNotBlank(wxCoupon.getBusiness())) { - String[] arys = wxCoupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); - } + wxCoupon.setTenantId(getUser().getTenantId()); wxCoupon.setChannels(""); if (wxCoupon.getValidType() != null) { @@ -148,10 +145,7 @@ public class WxCouponController extends BaseController { if (StringUtils.isNotEmpty(wxCoupon.getPriceStr())) { wxCoupon.setPrice((int) (Double.parseDouble(wxCoupon.getPriceStr()) * 100)); } - if (StringUtils.isNotBlank(wxCoupon.getBusiness())) { - String[] arys = wxCoupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); - } + if (wxCoupon.getValidType() != null) { if (wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING)) { wxCoupon.setValidStartDate(null); 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 4bdd9a4ee..7f07a9541 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -89,9 +89,6 @@ public class WxCoupon implements Serializable { /*限领张数**/ @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") private Integer useLimitQuantity; - /*投放频道位置(1.banner图,2.限时抢购)**/ - @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") - private Integer targetAd; /*1.主动领取2.定向投放**/ @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") private Integer sendType; @@ -136,7 +133,7 @@ public class WxCoupon implements Serializable { private Date updateDate; /*业态**/ @io.swagger.annotations.ApiModelProperty(value="业态",name="business") - private String business; + private Integer business; public String getTenantId() { return tenantId; } @@ -191,12 +188,6 @@ public class WxCoupon implements Serializable { public void setUseLimitQuantity(Integer _useLimitQuantity) { useLimitQuantity = _useLimitQuantity; } - public Integer getTargetAd() { - return targetAd; - } - public void setTargetAd(Integer _targetAd) { - targetAd = _targetAd; - } public Integer getSendType() { return sendType; } @@ -281,10 +272,10 @@ public class WxCoupon implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } - public String getBusiness() { + public Integer getBusiness() { return business; } - public void setBusiness(String _business) { + public void setBusiness(Integer _business) { business = _business; } public String getSalePriceStr() { @@ -356,7 +347,6 @@ public class WxCoupon implements Serializable { ,SalePrice_ASC("`sale_price` ASC"),SalePrice_DESC("`sale_price` DESC") ,UsePrice_ASC("`use_price` ASC"),UsePrice_DESC("`use_price` DESC") ,UseLimitQuantity_ASC("`use_limit_quantity` ASC"),UseLimitQuantity_DESC("`use_limit_quantity` DESC") - ,TargetAd_ASC("`target_ad` ASC"),TargetAd_DESC("`target_ad` DESC") ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") ,SendStartDate_ASC("`send_start_date` ASC"),SendStartDate_DESC("`send_start_date` DESC") ,SendEndDate_ASC("`send_end_date` ASC"),SendEndDate_DESC("`send_end_ate` DESC") 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 cbac50789..b75490e01 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -72,7 +72,7 @@ public class WxCouponChannel implements Serializable { private Integer targetAd; /***/ @io.swagger.annotations.ApiModelProperty(value="",name="business") - private String business; + private Integer business; /*开始时间**/ @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") private Date beginTime; @@ -129,10 +129,10 @@ public class WxCouponChannel implements Serializable { public void setTargetAd(Integer _targetAd) { targetAd = _targetAd; } - public String getBusiness() { + public Integer getBusiness() { return business; } - public void setBusiness(String _business) { + public void setBusiness(Integer _business) { business = _business; } public Date getBeginTime() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index 0bbade3b7..ccc04333d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -93,9 +93,6 @@ public class WxCouponCVo implements Serializable { /*限领张数**/ @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") private Integer useLimitQuantity; - /*投放频道位置(1.banner图,2.限时抢购)**/ - @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") - private Integer targetAd; /*1.主动领取2.定向投放**/ @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") private Integer sendType; @@ -146,7 +143,7 @@ public class WxCouponCVo implements Serializable { private Date updateDate; /*业态**/ @io.swagger.annotations.ApiModelProperty(value="业态",name="business") - private String business; + private Integer business; /*发券商户信息*/ @@ -254,12 +251,6 @@ public class WxCouponCVo implements Serializable { public void setUseLimitQuantity(Integer _useLimitQuantity) { useLimitQuantity = _useLimitQuantity; } - public Integer getTargetAd() { - return targetAd; - } - public void setTargetAd(Integer _targetAd) { - targetAd = _targetAd; - } public Integer getSendType() { return sendType; } @@ -359,10 +350,10 @@ public class WxCouponCVo implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } - public String getBusiness() { + public Integer getBusiness() { return business; } - public void setBusiness(String _business) { + public void setBusiness(Integer _business) { business = _business; } @@ -467,7 +458,6 @@ public class WxCouponCVo implements Serializable { ,SalePrice_ASC("`salePrice` ASC"),SalePrice_DESC("`salePrice` DESC") ,UsePrice_ASC("`usePrice` ASC"),UsePrice_DESC("`usePrice` DESC") ,UseLimitQuantity_ASC("`useLimitQuantity` ASC"),UseLimitQuantity_DESC("`useLimitQuantity` DESC") - ,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC") ,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC") ,SendStartDate_ASC("`sendStartDate` ASC"),SendStartDate_DESC("`sendStartDate` DESC") ,SendEndDate_ASC("`sendEndDate` ASC"),SendEndDate_DESC("`sendEndDate` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java index d9afb92f3..89d2b03be 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java @@ -125,7 +125,7 @@ public class WxCouponCarVo implements Serializable { private Date updateDate; /*业态**/ @io.swagger.annotations.ApiModelProperty(value="业态",name="business") - private String business; + private Integer business; /*车场厂商类型**/ @io.swagger.annotations.ApiModelProperty(value="车场厂商类型1:ETCP,2:TJD",name="vendorType") private String vendorType; @@ -276,10 +276,10 @@ public class WxCouponCarVo implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } - public String getBusiness() { + public Integer getBusiness() { return business; } - public void setBusiness(String _business) { + public void setBusiness(Integer _business) { business = _business; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index e22c91f01..2858afb18 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -12,7 +12,6 @@ - @@ -27,11 +26,11 @@ - + - `id`,`tenant_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`target_ad`,`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` + `id`,`tenant_id`,`merchant_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` @@ -77,15 +76,10 @@ and `use_limit_quantity` = #{useLimitQuantity} - - and `target_ad` = #{targetAd} - - and `send_type` = #{sendType} - and `valid_type` = #{validType} @@ -138,12 +132,10 @@ and `update_date` = #{updateDate} - - and JSON_CONTAINS(`business`->'$',JSON_ARRAY('0')) - - - and (JSON_CONTAINS(`business`->'$',JSON_ARRAY('0')) or (JSON_CONTAINS(`business`->'$',JSON_ARRAY(#{business})))) + + and `business` = #{business} + and id in @@ -178,7 +170,6 @@ - @@ -193,7 +184,7 @@ - +