위시리스트 마스터 저장

src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -541,16 +541,23 @@ public class PchReqService extends CommonService {
  
     /* 위시리스트 마스터 저장 */
     @Transactional
-    public String saveWishListRequest(String userId, String wishlistMgntNo, String wishlistNm, String storeId, String delYn) throws Exception {
-        try { 
+    public WishMasterSaveResponse saveWishListMaster(String userId, String wishlistMgntNo, String wishlistNm, String storeId, String delYn) throws Exception {
+        try { //PchWishListEntity
             
-            if (wishlistMgntNo == null || "".equals(wishlistMgntNo)) { 
-                wishlistMgntNo = pchReqMapper.selectWishListMgntNo();
+            if (wishlistMgntNo == null || "".equals(wishlistMgntNo)) {
+                wishlistMgntNo = fnGetDealNo(37,"");
                 System.out.println("saveWishListRequest wishlistMgntNo=="+wishlistMgntNo+" wishlistNm=="+wishlistNm+" storeId="+storeId);
                 pchReqMapper.saveWishListRequest(userId, wishlistMgntNo, wishlistNm, storeId, delYn);
             } else {
                 pchReqMapper.updateWishListRequest(userId, wishlistMgntNo, wishlistNm, storeId, delYn);
             }
+
+            PchWishListEntity entity = new PchWishListEntity();
+            entity.setWishlistMgntNo(wishlistMgntNo);
+            entity.setWishlistNm(wishlistNm);
+
+            return WishMasterSaveResponse.toDTO(entity );
+
         } catch (GlobalException e) {
             e.getStackTrace();
             throw new GlobalException(e.getSystemMessageCode());
@@ -558,7 +565,7 @@ public class PchReqService extends CommonService {
             e.getStackTrace();
             throw new RuntimeException();
         }
-        return wishlistMgntNo;
+
     }
 
     /* 위시리시트 품목 저장 */

src/main/java/com/oqpo/api/web/controller/pomng/PchReqController.java

@@ -10,6 +10,7 @@ import com.oqpo.api.web.dto.response.SelectResponse;
 import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInfoResponse;
 import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqInitInfoResponse;
 import com.oqpo.api.web.dto.response.pomng.pchReq.PchReqRejectTargetResponse;
+import com.oqpo.api.web.dto.response.pomng.pchReq.WishMasterSaveResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -193,20 +194,21 @@ public class PchReqController {
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
             @ApiImplicitParam(name = "wishlistMgntNo", value = "위시리스트번호", required = false, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "wishlistNm", value = "위시리스트명", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "storeId", value = "매장코드", required = true, dataType = "String", paramType = "query") 
+            @ApiImplicitParam(name = "storeId", value = "매장코드", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "delYn", value = "삭제여부", required = true, dataType = "String", paramType = "query")
     })
     @ApiOperation(value = "위시리스트 마스터 저장")
     @PostMapping("/save-wishlist")
-    public ResponseEntity<MessageResponse> saveWishListRequest(@ApiIgnore String userId, 
-        @RequestParam(value = "wishlistMgntNo", required = false) String wishlistMgntNo,
-        @RequestParam(value = "wishlistNm") String wishlistNm, 
-        @RequestParam(value = "storeId") String storeId,
-        @RequestParam(value = "delYn") String delYn
+    public ResponseEntity<WishMasterSaveResponse> saveWishListRequest(@ApiIgnore String userId,
+                                      @RequestParam(value = "wishlistMgntNo", required = false) String wishlistMgntNo,
+                                      @RequestParam(value = "wishlistNm") String wishlistNm,
+                                      @RequestParam(value = "storeId") String storeId,
+                                      @RequestParam(value = "delYn") String delYn
     ) throws Exception {
-        String result = pchReqService.saveWishListRequest(userId, wishlistMgntNo, wishlistNm, storeId, delYn );
-        return ResponseEntity.ok(MessageResponse.toDTO("ok",result));
+        return ResponseEntity.ok(pchReqService.saveWishListMaster(userId, wishlistMgntNo, wishlistNm, storeId, delYn ));
     }
 
+
     
     /**
      * 설명 : 위시리스트 품목조회

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/WishMasterSaveResponse.java

@@ -0,0 +1,37 @@
+package com.oqpo.api.web.dto.response.pomng.pchReq;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
+import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
+import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
+import com.oqpo.api.entity.pomng.PchWishListEntity;
+import com.oqpo.api.entity.stinfo.BrandEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class WishMasterSaveResponse {
+
+    @ApiModelProperty(value = "위시리스트번호") private String wishlistMgntNo;
+    @ApiModelProperty(value = "위시리스트명") private String wishlistNm;
+
+
+    public static WishMasterSaveResponse toDTO( PchWishListEntity entity ) {
+        if (entity == null) return null;
+        return WishMasterSaveResponse.builder()
+                .wishlistMgntNo(entity.getWishlistMgntNo())
+                .wishlistNm(entity.getWishlistNm() == null ? "" :entity.getWishlistNm())
+                .build();
+    }
+
+
+}