diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java index feccabb..afd0d63 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/ActivityUserCommandController.java @@ -27,11 +27,9 @@ public class ActivityUserCommandController { @ApiOperation("保存活动") @PostMapping("save/activity") public String saveActivity(@RequestBody ActivityDto activityDto){ - Activity activity = TypeConvertUtils.convert(activityDto,Activity.class); - if(activityDto.getId() == null){ - activity.setId(null); - } - activity.setActivityProductList(activityDto.getActivityProductList()); + /* Activity activity = TypeConvertUtils.convert(activityDto,Activity.class); + activity.setActivityProductList(activityDto.getActivityProductList());*/ + Activity activity = activityDto.trans2Domain(); return activityApplicationService.saveActivity(activity); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java index 9cb31b5..5b91e1f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/activity/user/request/ActivityDto.java @@ -34,9 +34,10 @@ public class ActivityDto { @ApiModelProperty("活动产品集合") private List activityProductList; - /*public Activity trans2Domain(ActivityDto dto){ - Activity activity = TypeConvertUtils.convert(dto,Activity.class); + public Activity trans2Domain(){ + Activity activity = TypeConvertUtils.convert(this,Activity.class); activity.setStatus(ActivityStatusEnum.ENABLE.getValue()); + activity.setActivityProductList(this.getActivityProductList()); return activity; - }*/ + } }