| @@ -682,8 +682,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { | |||||
| if(takeRate == null){ | if(takeRate == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未获取到计划"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未获取到计划"); | ||||
| } | } | ||||
| if(EnumCpsPlanContentType.LIVE.getCode().equals(takeRate.getContentType()) | |||||
| || EnumCpsPlanContentType.VIDEO.getCode().equals(record.getContentType())){ | |||||
| if(!EnumCpsPlanContentType.LIVE.getCode().equals(takeRate.getContentType()) | |||||
| && !EnumCpsPlanContentType.VIDEO.getCode().equals(record.getContentType())){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"带货场景不支持"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"带货场景不支持"); | ||||
| } | } | ||||
| List<String> douyinIdList = JSONObject.parseArray(takeRate.getDouyinId(), String.class); | List<String> douyinIdList = JSONObject.parseArray(takeRate.getDouyinId(), String.class); | ||||
| @@ -726,8 +726,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { | |||||
| if(takeRate == null){ | if(takeRate == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未获取到计划"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未获取到计划"); | ||||
| } | } | ||||
| if(EnumCpsPlanContentType.LIVE.getCode().equals(takeRate.getContentType()) | |||||
| || EnumCpsPlanContentType.VIDEO.getCode().equals(record.getContentType())){ | |||||
| if(!EnumCpsPlanContentType.LIVE.getCode().equals(takeRate.getContentType()) | |||||
| && !EnumCpsPlanContentType.VIDEO.getCode().equals(record.getContentType())){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"带货场景不支持"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"带货场景不支持"); | ||||
| } | } | ||||
| Map<String, Integer> douyinMap = JSONObject.parseObject(takeRate.getDouyinIdStatus(), Map.class); | Map<String, Integer> douyinMap = JSONObject.parseObject(takeRate.getDouyinIdStatus(), Map.class); | ||||