|
|
|
@@ -11,16 +11,13 @@ import com.iformall.domain.po.WxActivity; |
|
|
|
import com.iformall.domain.po.WxCampaign; |
|
|
|
import com.iformall.domain.po.WxCoupon; |
|
|
|
import com.iformall.domain.po.WxCouponChannel; |
|
|
|
import com.iformall.domain.vo.WxCouponChannelAddVo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.mapper.WxActivityMapper; |
|
|
|
import com.iformall.mapper.WxCampaignMapper; |
|
|
|
import com.iformall.mapper.WxCouponChannelMapper; |
|
|
|
import com.iformall.service.QrCodeService; |
|
|
|
import com.iformall.service.WxCampaignService; |
|
|
|
import com.iformall.service.WxCouponChannelService; |
|
|
|
import com.iformall.service.WxCouponService; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@@ -130,7 +127,8 @@ public class WxCampaignServiceImpl implements WxCampaignService { |
|
|
|
if (wxCampaign.getProduceType() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "produceType不能为空"); |
|
|
|
} |
|
|
|
if (wxCampaign.getProduceId() == null) { |
|
|
|
if (wxCampaign.getProduceType().equals(EnumCampaignProductType.ACTIVITY_JOIN.getCode()) |
|
|
|
&& wxCampaign.getProduceId() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "produceId不能为空"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(wxCampaign.getPagePath())) { |
|
|
|
|