|
|
|
@@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { |
|
|
|
if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { |
|
|
|
wxCampaign.setStatus(null); |
|
|
|
} |
|
|
|
wxCampaign.updateTenantInfo(getTenantInfo()); |
|
|
|
wxCampaign.updateTenantInfo(ifParentUpdateTenantInfo()); |
|
|
|
wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -78,7 +78,7 @@ public class WxCampaignController extends BaseController { |
|
|
|
wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); |
|
|
|
} |
|
|
|
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); |
|
|
|
wxCampaign.updateTenantInfo(getTenantInfo()); |
|
|
|
wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); |
|
|
|
wxCampaignService.saveOrUpdate(wxCampaign); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
@@ -89,7 +89,7 @@ public class WxCampaignController extends BaseController { |
|
|
|
public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); |
|
|
|
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); |
|
|
|
wxCampaign.updateTenantInfo(getTenantInfo()); |
|
|
|
wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); |
|
|
|
wxCampaignService.addForPath(wxCampaign); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
@@ -99,7 +99,7 @@ public class WxCampaignController extends BaseController { |
|
|
|
@SystemControllerLog(description = "宣传页-id更新") |
|
|
|
public ResultData update(@RequestBody WxCampaign wxCampaign) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCampaignController::update"); |
|
|
|
|
|
|
|
ifParentUpdateAloneTenantInfo(); |
|
|
|
if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { |
|
|
|
String[] arys = wxCampaign.getCouponIds().split(","); |
|
|
|
wxCampaign.setCouponIds(JSON.toJSONString(arys)); |
|
|
|
@@ -114,6 +114,7 @@ public class WxCampaignController extends BaseController { |
|
|
|
@SystemControllerLog(description = "宣传页-更新状态") |
|
|
|
public ResultData updateStatus(@RequestBody WxCampaign wxCampaign) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCampaignController::updateStatus"); |
|
|
|
ifParentUpdateAloneTenantInfo(); |
|
|
|
WxCampaign campaign = wxCampaignService.getById(wxCampaign.getId()); |
|
|
|
// check coupon 状态 |
|
|
|
if (campaign.getType().equals(EnumCampaignType.STABLE.getCode())) { |
|
|
|
@@ -146,6 +147,7 @@ public class WxCampaignController extends BaseController { |
|
|
|
@SystemControllerLog(description = "宣传页-删除") |
|
|
|
public ResultData delete(Long id) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCampaignController::delete"); |
|
|
|
ifParentUpdateAloneTenantInfo(); |
|
|
|
wxCampaignService.deleteById(id); |
|
|
|
return new ResultData(Result.SUCCESS, "删除成功", null); |
|
|
|
} |
|
|
|
@@ -159,7 +161,6 @@ public class WxCampaignController extends BaseController { |
|
|
|
WxCampaign wxCampaign = wxCampaignService.getById(id); |
|
|
|
if (wxCampaign != null) { |
|
|
|
WxCouponChannel wxCouponChannel = new WxCouponChannel(); |
|
|
|
wxCouponChannel.updateTenantInfo(getTenantInfo()); |
|
|
|
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); |
|
|
|
wxCouponChannel.setSubTargetId(wxCampaign.getId()); |
|
|
|
wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); |
|
|
|
|