提交 c2b0e626 authored 作者: 000516's avatar 000516

促销员活动上报时添加活动品项

...@@ -77,6 +77,11 @@ public class TemporaryActivityReportedDO implements Serializable { ...@@ -77,6 +77,11 @@ public class TemporaryActivityReportedDO implements Serializable {
*/ */
String activityPattern; String activityPattern;
/**
* 活动品项:老品/黑鸭/散称
*/
private String prdClass;
private String deptQcId; private String deptQcId;
private String deptQcOrgName; private String deptQcOrgName;
......
...@@ -76,6 +76,10 @@ public class TemporaryActivityReportedDto { ...@@ -76,6 +76,10 @@ public class TemporaryActivityReportedDto {
*/ */
String activityPattern; String activityPattern;
/**
* 活动品项:老品/黑鸭/散称
*/
private String prdClass;
private String deptQcId; private String deptQcId;
private String deptQcOrgName; private String deptQcOrgName;
......
...@@ -7,12 +7,14 @@ import com.fasterxml.uuid.Generators; ...@@ -7,12 +7,14 @@ import com.fasterxml.uuid.Generators;
import com.wangxiaolu.promotion.common.redis.RedisKeys; import com.wangxiaolu.promotion.common.redis.RedisKeys;
import com.wangxiaolu.promotion.common.redis.service.RedisCache; import com.wangxiaolu.promotion.common.redis.service.RedisCache;
import com.wangxiaolu.promotion.domain.activity.dao.*; import com.wangxiaolu.promotion.domain.activity.dao.*;
import com.wangxiaolu.promotion.domain.activityplanv2.dao.ActivityPlanInfoDao;
import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao; import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
import com.wangxiaolu.promotion.enums.activity.ActivityPhotoType; import com.wangxiaolu.promotion.enums.activity.ActivityPhotoType;
import com.wangxiaolu.promotion.enums.activity.LogType; import com.wangxiaolu.promotion.enums.activity.LogType;
import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus; import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
import com.wangxiaolu.promotion.exception.FlowException; import com.wangxiaolu.promotion.exception.FlowException;
import com.wangxiaolu.promotion.exception.ParamException; import com.wangxiaolu.promotion.exception.ParamException;
import com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.PromotionStoreDto; import com.wangxiaolu.promotion.pojo.activity.temporary.dto.PromotionStoreDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityMarketCellDto; import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityMarketCellDto;
import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto; import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
...@@ -57,6 +59,8 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe ...@@ -57,6 +59,8 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
private TemporaryInfoDao temporaryInfoDao; private TemporaryInfoDao temporaryInfoDao;
@Autowired @Autowired
private TemporaryActivityMarketCellDao temporaryActivityMarketCellDao; private TemporaryActivityMarketCellDao temporaryActivityMarketCellDao;
@Autowired
private ActivityPlanInfoDao activityPlanInfoDao;
/** /**
...@@ -72,6 +76,10 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe ...@@ -72,6 +76,10 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
throw new FlowException(RCode.DATA_HAVE_ERROR); throw new FlowException(RCode.DATA_HAVE_ERROR);
} }
// 获取计划信息,补充此计划的销售品项
ActivityPlanInfoDto planInfoDto = activityPlanInfoDao.selectById(temActDto.getPlanId());
temActDto.setPrdClass(Objects.isNull(planInfoDto) ? null : planInfoDto.getPrdClass());
// 返回生成的活动id // 返回生成的活动id
long reportedId = temporaryActivityReportedDao.activityDataSave(temActDto); long reportedId = temporaryActivityReportedDao.activityDataSave(temActDto);
temActDto.setId(reportedId); temActDto.setId(reportedId);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论