diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index ffa93a3b1..3244bbc2a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -106,9 +106,8 @@ public class WxCampaign implements Serializable { private Date updateTime; @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") private String html; - @io.swagger.annotations.ApiModelProperty(value="外部链接",name="link") - private String link; - public String getTenantId() { + + public String getTenantId() { return tenantId; } public void setTenantId(String _tenantId) { @@ -219,14 +218,6 @@ public class WxCampaign implements Serializable { this.html = html; } - public String getLink() { - return link; - } - - public void setLink(String link) { - this.link = link; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` 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 f4ea3a6fb..7df4b1f07 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -59,7 +59,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { return wxCampaignMapper.selectByPrimaryKey(id); } - @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData saveOrUpdate(WxCampaign wxCampaign) { if(wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { @@ -90,22 +90,21 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); } //type 为固定格式才会有券的信息 才会有投放的问题 - wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign.getId()); - if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { - if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { - addOrUpdateBatch(JSONArray.parseArray(wxCampaign.getCouponIds(), String.class), wxCampaign); - } else { - delBatch(wxCampaign); - } - } + couponInject(wxCampaign); return new ResultData(Result.SUCCESS,"操作成功"); } + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData updateStatus(WxCampaign wxCampaign) { wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); - wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign); //type 为固定格式才会有券的信息 才会有投放的问题 + couponInject(wxCampaign); + return new ResultData(Result.SUCCESS, "操作成功"); + } + + public void couponInject(WxCampaign wxCampaign) { + wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaign.getId()); if (wxCampaign.getType().equals(EnumCampaignType.STABLE.getCode())) { if (wxCampaign.getStatus().equals(EnumCampaignStatus.STATUS_THROW_IN.getCode())) { addOrUpdateBatch(JSONArray.parseArray(wxCampaign.getCouponIds(), String.class), wxCampaign); @@ -113,7 +112,6 @@ public class WxCampaignServiceImpl implements WxCampaignService { delBatch(wxCampaign); } } - return new ResultData(Result.SUCCESS, "操作成功"); } public void delBatch(WxCampaign record) { diff --git a/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx b/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx index 443338895..2929b4a0f 100644 Binary files a/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx and b/mallinkService/src/main/resources/contract-word-template/contract_rent_property.docx differ diff --git a/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx b/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx index 119d92d3a..1f26e8e62 100644 Binary files a/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx and b/mallinkService/src/main/resources/contract-word-template/contract_rent_property_by_ratio.docx differ