|
|
@@ -15,15 +15,16 @@ import com.sqx.common.utils.PageUtils;
|
|
|
import com.sqx.modules.activity.dao.ActivityDao;
|
|
|
import com.sqx.modules.activity.dto.ActivityDTO;
|
|
|
import com.sqx.modules.activity.dto.ActivityOfFullReductionDTO;
|
|
|
+import com.sqx.modules.activity.dto.ActivityOfGlobalDiscountDTO;
|
|
|
import com.sqx.modules.activity.dto.ActivityOfTimeIntervalDTO;
|
|
|
import com.sqx.modules.activity.dto.ActivityQueryDTO;
|
|
|
-import com.sqx.modules.activity.dto.ActivityOfGlobalDiscountDTO;
|
|
|
import com.sqx.modules.activity.entity.Activity;
|
|
|
import com.sqx.modules.activity.entity.ActivityShop;
|
|
|
import com.sqx.modules.activity.enums.ActivityTypeEnum;
|
|
|
import com.sqx.modules.activity.enums.FullActivityTypeEnum;
|
|
|
import com.sqx.modules.activity.service.ActivityService;
|
|
|
import com.sqx.modules.activity.service.ActivityShopService;
|
|
|
+import com.sqx.modules.activity.util.ActivityUtil;
|
|
|
import com.sqx.modules.activity.vo.ActivityVO;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -54,7 +55,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
public ActivityVO getActivityById(Long id) {
|
|
|
Activity activity = this.findById(id);
|
|
|
|
|
|
- return convertEntityToVO(activity);
|
|
|
+ return ActivityUtil.convertActivityEntityToVO(activity);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -73,7 +74,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
IPage<Activity> page = this.page(pages, queryWrapper);
|
|
|
PageUtils pageUtils = new PageUtils(page);
|
|
|
|
|
|
- List<ActivityVO> vos = pageUtils.getList().stream().map(e -> this.convertEntityToVO((Activity) e)).collect(Collectors.toList());
|
|
|
+ List<ActivityVO> vos = pageUtils.getList().stream().map(e -> ActivityUtil.convertActivityEntityToVO((Activity) e)).collect(Collectors.toList());
|
|
|
pageUtils.setList(vos);
|
|
|
return pageUtils;
|
|
|
}
|
|
|
@@ -155,28 +156,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 活动实体类转成vo类
|
|
|
- * @param activity 活动实体
|
|
|
- * @return vo
|
|
|
- */
|
|
|
- private ActivityVO convertEntityToVO(Activity activity) {
|
|
|
- ActivityVO vo = new ActivityVO();
|
|
|
- BeanUtils.copyProperties(activity, vo);
|
|
|
-
|
|
|
- String type = activity.getType();
|
|
|
- String config = activity.getConfig();
|
|
|
-
|
|
|
- if (ActivityTypeEnum.TIME.getTypeCode().equals(type)) {
|
|
|
- vo.setTimeIntervalInfos(JSONUtil.toList(JSONUtil.parseArray(config), ActivityOfTimeIntervalDTO.class));
|
|
|
- } else if (ActivityTypeEnum.FULL.getTypeCode().equals(type)) {
|
|
|
- vo.setFullReductionInfo(JSONUtil.toBean(config, ActivityOfFullReductionDTO.class));
|
|
|
- } else if (ActivityTypeEnum.GLOBAL.getTypeCode().equals(type)) {
|
|
|
- vo.setGlobalDiscountsInfo(JSONUtil.toBean(config, ActivityOfGlobalDiscountDTO.class));
|
|
|
- }
|
|
|
- return vo;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
* 根据id获取活动信息
|
|
|
* 如id对应记录不存在,则抛出数据不存在异常
|
|
|
* @param id 活动id
|