From 845fc6d285fe5e77109bde6bde38b89f59b47115 Mon Sep 17 00:00:00 2001
From: "996472796@qq.com" <996472796@qq.com>
Date: Mon, 8 Apr 2024 16:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Evpi=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/user/ActivityUserCommandController.java     | 9 ++++++++-
 .../api/command/activity/user/request/ActivityDto.java   | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

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 475002a..feccabb 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
@@ -4,6 +4,8 @@ import com.qniao.dam.api.command.activity.user.request.ActivityDto;
 import com.qniao.dam.api.command.activity.user.request.ChangeActivityDto;
 import com.qniao.dam.application.service.activity.ActivityApplicationService;
 import com.qniao.dam.domain.aggregate.activity.entity.Activity;
+import com.qniao.dam.domain.aggregate.activity.entity.ActivityProduct;
+import com.qniao.framework.utils.TypeConvertUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Api(tags = "活动")
 @RestController
@@ -24,7 +27,11 @@ public class ActivityUserCommandController {
     @ApiOperation("保存活动")
     @PostMapping("save/activity")
     public String saveActivity(@RequestBody ActivityDto activityDto){
-        Activity activity = activityDto.trans2Domain(activityDto);
+        Activity activity = TypeConvertUtils.convert(activityDto,Activity.class);
+        if(activityDto.getId() == null){
+            activity.setId(null);
+        }
+        activity.setActivityProductList(activityDto.getActivityProductList());
         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 e3d3cf8..9cb31b5 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,9 @@ public class ActivityDto {
     @ApiModelProperty("活动产品集合")
     private List<ActivityProduct> activityProductList;
 
-    public Activity trans2Domain(ActivityDto dto){
+    /*public Activity trans2Domain(ActivityDto dto){
         Activity activity = TypeConvertUtils.convert(dto,Activity.class);
         activity.setStatus(ActivityStatusEnum.ENABLE.getValue());
         return activity;
-    }
+    }*/
 }