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 @@
-