|
|
|
@@ -7,11 +7,7 @@ import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.WxCUserBasicInfo; |
|
|
|
import com.iformall.domain.po.WxCoupon; |
|
|
|
import com.iformall.domain.po.WxCouponChannel; |
|
|
|
import com.iformall.domain.po.WxCouponPassword; |
|
|
|
import com.iformall.domain.po.WxPayAccount; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.TtCouponVo; |
|
|
|
import com.iformall.domain.vo.WxCouponStatisVo; |
|
|
|
@@ -53,7 +49,7 @@ public class WxCouponController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxCouponPasswordService couponPasswordService; |
|
|
|
@Autowired |
|
|
|
private WxCouponChannelMapper wxCouponChannelMapper; |
|
|
|
private WxCouponChannelService wxCouponChannelService; |
|
|
|
@Autowired |
|
|
|
private WxFlowService wxFlowService; |
|
|
|
@Autowired |
|
|
|
@@ -195,12 +191,15 @@ public class WxCouponController extends BaseController { |
|
|
|
query.updateTenantInfo(wxCoupon); |
|
|
|
query.setCouponId(wxCoupon.getId()); |
|
|
|
query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) { |
|
|
|
if (CollectionUtils.isNotEmpty(wxCouponChannelService.findList(query))) { |
|
|
|
return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); |
|
|
|
} |
|
|
|
// query.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode()); |
|
|
|
// if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) { |
|
|
|
// return new ResultData(ResultData.ERROR, "有活动正在预审核."); |
|
|
|
// if (CollectionUtils.isNotEmpty(wxCouponChannelService.findList(query))) { |
|
|
|
// TtCouponChannelPoi ttCouponChannelPoi = wxCouponService.getCouponChannelPoi(getTenantInfo(),wxCoupon.getId()); |
|
|
|
// if(EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus())){ |
|
|
|
// return new ResultData(ResultData.ERROR, "有活动正在预审核."); |
|
|
|
// } |
|
|
|
// } |
|
|
|
} |
|
|
|
|
|
|
|
@@ -248,7 +247,7 @@ public class WxCouponController extends BaseController { |
|
|
|
query.updateTenantInfo(wxCoupon); |
|
|
|
query.setCouponId(wxCoupon.getId()); |
|
|
|
query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) { |
|
|
|
if (CollectionUtils.isNotEmpty(wxCouponChannelService.findList(query))) { |
|
|
|
return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); |
|
|
|
} |
|
|
|
} |
|
|
|
|