From a20307a902caba229acaa019245dcbf67a6f7f33 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 5 Dec 2018 18:01:20 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E9=9C=80=E6=B1=82]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4couponchannel=E8=A1=A8=E5=92=8Ccouponsend=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84merchant=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCouponChannel.java | 9 --------- .../java/com/iformall/domain/po/WxCouponSend.java | 10 ---------- .../service/impl/WxCampaignServiceImpl.java | 1 - .../service/impl/WxCouponChannelServiceImpl.java | 13 ++++++------- .../iformall/service/impl/WxGameServiceImpl.java | 1 - .../main/resources/mapper/WxCouponChannelMapper.xml | 13 +------------ .../src/main/resources/mapper/WxCouponMapper.xml | 7 +++---- .../main/resources/mapper/WxCouponOrderMapper.xml | 2 +- .../main/resources/mapper/WxCouponSendMapper.xml | 8 +------- 9 files changed, 12 insertions(+), 52 deletions(-) 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 b75490e01..8e0d729d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -54,9 +54,6 @@ public class WxCouponChannel implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*商户id**/ - @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Long merchantId; /*卡券id**/ @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; @@ -99,12 +96,6 @@ public class WxCouponChannel implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } public Long getCouponId() { return couponId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 95957d9ec..cc316ba18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -44,9 +44,6 @@ public class WxCouponSend implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*商户id**/ - @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Long merchantId; /*卡券id**/ @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; @@ -86,12 +83,6 @@ public class WxCouponSend implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } public Long getCouponId() { return couponId; } @@ -159,7 +150,6 @@ public class WxCouponSend implements Serializable { { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 836902259..7f352b76d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -149,7 +149,6 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannel.setEndTime(record.getValidEndDate()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponId(couponId); - wxCouponChannel.setMerchantId(wxCoupon.getMerchantId()); wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setTenantId(wxCoupon.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 5c9f90b23..ee1b7771d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -173,9 +173,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponChannel.setEndTime(endTime); wxCouponChannel.setStatus(0); wxCouponChannel.setBeginTime(beginTime); - wxCouponChannel.setCouponId(couponid); - wxCouponChannel.setMerchantId(wxCoupon.getMerchantId()); wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setTargetAd(channelId); wxCouponChannel.setTenantId(tanantId); @@ -211,11 +209,12 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { for (WxCouponChannelVo wxcouponVo:wxCouponChannelVoList) { if(couponNamesMap.get(wxcouponVo.getCouponId())!=null){ wxcouponVo.setWxCoupon(couponNamesMap.get(wxcouponVo.getCouponId())); - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setId(wxcouponVo.getMerchantId()); - wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant); - if (wxMerchant != null) - wxcouponVo.setWxMerchant(wxMerchant); + //WxMerchant wxMerchant = new WxMerchant(); + //wxMerchant.setId(wxcouponVo.getMerchantId()); + //wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant); + //if (wxMerchant != null) + // wxcouponVo.setWxMerchant(wxMerchant); + //PENG TODO } } return new PageInfo<>(wxCouponChannelVoList); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index f19da9a33..f872845ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -213,7 +213,6 @@ public class WxGameServiceImpl implements WxGameService { wxCouponChannel.setEndTime(record.getValidEndDate()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponId(couponId); - wxCouponChannel.setMerchantId(wxCoupon.getMerchantId()); wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); wxCouponChannel.setTenantId(wxCoupon.getTenantId()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 450e2e073..58dedba55 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -4,7 +4,6 @@ - @@ -19,7 +18,7 @@ - `id`,`tenant_id`,`merchant_id`,`coupon_id`,`coupon_status`,`type`,`title`,`target_ad`,`business`,`begin_time`,`end_time`,`status`,`create_date`,`update_date`,`sub_target_id` + `id`,`tenant_id`,`coupon_id`,`coupon_status`,`type`,`title`,`target_ad`,`business`,`begin_time`,`end_time`,`status`,`create_date`,`update_date`,`sub_target_id` @@ -33,10 +32,6 @@ and `tenant_id` = #{tenantId} - - and `merchant_id` = #{merchantId} - - and `coupon_id` = #{couponId} @@ -111,7 +106,6 @@ - @@ -128,7 +122,6 @@ - select - from wx_coupon_channel cc, - wx_coupon c,wx_merchant m + from wx_coupon_channel cc, wx_coupon c + left join wx_merchant m on c.merchant_id = m.id left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 left join wx_shop s on ms.shop_id = s.id left join wx_mall_building mb on s.building = mb.id left join wx_mall_floor mf on s.floor = mf.id - where c.merchant_id = m.id - and cc.coupon_id = c.id + where cc.coupon_id = c.id and cc.id = #{id} diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index aab7b5e16..5d1186cae 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -191,7 +191,7 @@ inner JOIN wx_order o on o.id = co.order_id inner JOIN wx_coupon c on co.coupon_id = c.id inner JOIN wx_c_user cu on cu.id = co.c_user_id - inner JOIN wx_merchant m on o.merchant_id = m.id + left JOIN wx_merchant m on o.merchant_id = m.id left join wx_merchant_b_user bu on co.b_user_id = bu.id where 1 = 1 diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 35868f611..3089a3de9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -4,7 +4,6 @@ - @@ -17,7 +16,7 @@ - `id`,`tenant_id`,`merchant_id`,`coupon_id`,`type`,`title`,`send_type`,`status`,`send_start_time`,`send_end_time`,`create_date`,`update_date` + `id`,`tenant_id`,`coupon_id`,`type`,`title`,`send_type`,`status`,`send_start_time`,`send_end_time`,`create_date`,`update_date` @@ -33,11 +32,6 @@ - - and `merchant_id` = #{merchantId} - - - and `coupon_id` = #{couponId}