기능추가: 포인트 관련 댓글 기능 업그레이드

src/main/java/com/kh/tripply/point/controller/PointController.java

@@ -16,11 +16,15 @@
 import com.kh.tripply.member.domain.Member;
 import com.kh.tripply.point.domain.Point;
 import com.kh.tripply.point.service.PointService;
+import com.kh.tripply.trade.domain.Trade;
+import com.kh.tripply.trade.service.TradeService;
 
 @Controller
 public class PointController {
 	@Autowired
 	PointService pService;
+	@Autowired
+	TradeService tService;
 
 	/**
 	 * 포인트 충전 페이지 이동
@@ -29,7 +33,6 @@ public class PointController {
 	 */
 	@RequestMapping(value="/point/chargeView.kh",method=RequestMethod.GET)
 	public ModelAndView pointChargeView(ModelAndView mv) {
-
 		mv.setViewName("/point/pointCharge");
 		return mv;
 	}
@@ -80,9 +83,19 @@ public ModelAndView pointHistoryView(ModelAndView mv,
 	 * @return
 	 */
 	@RequestMapping(value="/point/send.kh",method=RequestMethod.GET)
-	public ModelAndView pointSendView(ModelAndView mv) {
+	public ModelAndView pointSendView(ModelAndView mv,
+			HttpSession session) {
+
+		//1.세션에서 로그인유저의 객체를 가져온다.
+		Member loginUser = (Member)session.getAttribute("loginUser");
 
-		mv.setViewName("/point/pointSend1");
+		//2.채택된 거래게시물의 목록을 가져온다.
+		List<Trade> tList = tService.printMyTrade(loginUser);
+		if(!tList.isEmpty()) {
+			mv.addObject("tList",tList)
+			.setViewName("/point/pointSend1");
+		}else {
+		}
 		return mv;
 	}
 

src/main/java/com/kh/tripply/trade/controller/TradeController.java

@@ -376,13 +376,23 @@ public ModelAndView tradeReplyModify(ModelAndView mv,
 		return mv;
 	}
 
+	/**
+	 * 댓글 삭제
+	 * @param mv
+	 * @param tReply
+	 * @param currentPage
+	 * @return
+	 */
 	@RequestMapping(value="/trade/reply/remove.kh",method=RequestMethod.POST)
 	public ModelAndView tradeReplyRemove(ModelAndView mv,
 			@ModelAttribute TradeReply tReply,
 			@RequestParam("currentPage") Integer currentPage) {
 
+		//1. UPDATE문을 이용하여 게시물의 내용과 상태를 변경한다.
 		int result = tService.removeTradeReply(tReply);
 		if(result>0) {
+
+			//2.로직 성공 후 현재의 상세페이지로 리다이렉트한다.
 			int boardNo = tReply.getBoardNo();
 			mv.setViewName("redirect:/trade/detailView.kh?currentPage="+currentPage+"&boardNo="+boardNo);
 		}else {
@@ -401,17 +411,26 @@ public ModelAndView tradeReplyRemove(ModelAndView mv,
 	public ModelAndView tradeReplyChoice(ModelAndView mv,
 			@RequestParam("buyer") String buyer,
 			@RequestParam("boardNo") String boardNo,
-			@RequestParam("currentPage") Integer currentPage) {
+			@RequestParam("currentPage") Integer currentPage,
+			@ModelAttribute TradeReply tReply) {
 
+		//1. 채택된 구매희망자의 아이디와 게시물번호를 HashMap에 담는다.
 		HashMap<String,String> paramMap = new HashMap<>();
 		paramMap.put("boardNo", boardNo);
 		paramMap.put("buyer",buyer);
-		System.out.println(buyer);
+
+		//2.게시물에 buyerId를 UPDATE한다.
 		int result = tService.modifyBuyer(paramMap);
 		if(result>0) {
-			mv.setViewName("redirect:/trade/detailView.kh?currentPage="+currentPage+"&boardNo="+boardNo);
-		}else {
 
+			//3.성공 시 해당 게시물의 최종 입찰 금액을 채택 댓글의 구매희망금액으로 UPDATE한다.
+			int updateResult = tService.modifyFinalBiddingPrice(tReply);
+			if(updateResult > 0) {
+				//4.로직 처리 후 현재 상세페이지로 리다이렉트한다.
+				mv.setViewName("redirect:/trade/detailView.kh?currentPage="+currentPage+"&boardNo="+boardNo);
+			}else {
+			}
+		}else {
 		}
 		return mv;
 	}

src/main/java/com/kh/tripply/trade/domain/Trade.java

@@ -19,13 +19,15 @@ public class Trade {
 	private String buyerId;
 	private String soldOut;
 	private String thumbnailPath;
+	private int finalBiddingPrice;
 
 	public Trade() {
 	}
 
 	public Trade(int boardNo, String tradeTitle, String tradeContents, String tradeWriter, String tLocationCode,
 			String tLocationName, String tradeFileName, String tradeFileReName, String tradeFilePath, int tradeCount,
-			Date tCreateDate, Date tUpdateDate, String tStatus, String buyerId, String soldOut, String thumbnailPath) {
+			Date tCreateDate, Date tUpdateDate, String tStatus, String buyerId, String soldOut, String thumbnailPath,
+			int finalBiddingPrice) {
 		super();
 		this.boardNo = boardNo;
 		this.tradeTitle = tradeTitle;
@@ -43,6 +45,7 @@ public Trade(int boardNo, String tradeTitle, String tradeContents, String tradeW
 		this.buyerId = buyerId;
 		this.soldOut = soldOut;
 		this.thumbnailPath = thumbnailPath;
+		this.finalBiddingPrice = finalBiddingPrice;
 	}
 
 	public int getBoardNo() {
@@ -173,14 +176,25 @@ public void setThumbnailPath(String thumbnailPath) {
 		this.thumbnailPath = thumbnailPath;
 	}
 
+	public int getFinalBiddingPrice() {
+		return finalBiddingPrice;
+	}
+
+	public void setFinalBiddingPrice(int finalBiddingPrice) {
+		this.finalBiddingPrice = finalBiddingPrice;
+	}
+
 	@Override
 	public String toString() {
 		return "Trade [boardNo=" + boardNo + ", tradeTitle=" + tradeTitle + ", tradeContents=" + tradeContents
 				+ ", tradeWriter=" + tradeWriter + ", tLocationCode=" + tLocationCode + ", tLocationName="
 				+ tLocationName + ", tradeFileName=" + tradeFileName + ", tradeFileReName=" + tradeFileReName
 				+ ", tradeFilePath=" + tradeFilePath + ", tradeCount=" + tradeCount + ", tCreateDate=" + tCreateDate
 				+ ", tUpdateDate=" + tUpdateDate + ", tStatus=" + tStatus + ", buyerId=" + buyerId + ", soldOut="
-				+ soldOut + ", thumbnailPath=" + thumbnailPath + "]";
+				+ soldOut + ", thumbnailPath=" + thumbnailPath + ", finalBiddingPrice=" + finalBiddingPrice + "]";
 	}
 
+
+
+
 }

src/main/java/com/kh/tripply/trade/domain/TradeReply.java

@@ -13,12 +13,14 @@ public class TradeReply {
 	private String trStatus;
 	private String reReplyYn;
 	private String trChoiced;
-
+	private int biddingPrice;
+
 	public TradeReply() {
 	}
 
 	public TradeReply(int tReplyNo, int boardNo, int tRefReplyNo, String tReplyWriter, String tReplyContents,
-			Date trCreateDate, Date trUpdateDate, String trStatus, String reReplyYn, String trChoiced) {
+			Date trCreateDate, Date trUpdateDate, String trStatus, String reReplyYn, String trChoiced,
+			int biddingPrice) {
 		super();
 		this.tReplyNo = tReplyNo;
 		this.boardNo = boardNo;
@@ -30,14 +32,7 @@ public TradeReply(int tReplyNo, int boardNo, int tRefReplyNo, String tReplyWrite
 		this.trStatus = trStatus;
 		this.reReplyYn = reReplyYn;
 		this.trChoiced = trChoiced;
-	}
-
-	@Override
-	public String toString() {
-		return "TradeReply [tReplyNo=" + tReplyNo + ", boardNo=" + boardNo + ", tRefReplyNo=" + tRefReplyNo
-				+ ", tReplyWriter=" + tReplyWriter + ", tReplyContents=" + tReplyContents + ", trCreateDate="
-				+ trCreateDate + ", trUpdateDate=" + trUpdateDate + ", trStatus=" + trStatus + ", reReplyYn="
-				+ reReplyYn + ", trChoiced=" + trChoiced + "]";
+		this.biddingPrice = biddingPrice;
 	}
 
 	public int gettReplyNo() {
@@ -120,4 +115,23 @@ public void setTrChoiced(String trChoiced) {
 		this.trChoiced = trChoiced;
 	}
 
+	public int getBiddingPrice() {
+		return biddingPrice;
+	}
+
+	public void setBiddingPrice(int biddingPrice) {
+		this.biddingPrice = biddingPrice;
+	}
+
+	@Override
+	public String toString() {
+		return "TradeReply [tReplyNo=" + tReplyNo + ", boardNo=" + boardNo + ", tRefReplyNo=" + tRefReplyNo
+				+ ", tReplyWriter=" + tReplyWriter + ", tReplyContents=" + tReplyContents + ", trCreateDate="
+				+ trCreateDate + ", trUpdateDate=" + trUpdateDate + ", trStatus=" + trStatus + ", reReplyYn="
+				+ reReplyYn + ", trChoiced=" + trChoiced + ", biddingPrice=" + biddingPrice + "]";
+	}
+
+
+
+
 }

src/main/java/com/kh/tripply/trade/service/TradeService.java

@@ -5,6 +5,7 @@
 
 import com.kh.tripply.common.Paging;
 import com.kh.tripply.common.Search;
+import com.kh.tripply.member.domain.Member;
 import com.kh.tripply.trade.domain.Trade;
 import com.kh.tripply.trade.domain.TradeReply;
 
@@ -25,11 +26,14 @@ public interface TradeService {
 	public List<TradeReply> printTradeReplyByNo(int boardNo);
 	public int modifyTradeReply(TradeReply tReply);
 	public int removeTradeReply(TradeReply tReply);
+
 
 	////////////////////조회수 카운트
 	public int tradeViewCount(int boardNo);
 
 	/////////////////////거래
 	public int modifyBuyer(HashMap<String,String> paramMap);
+	public int modifyFinalBiddingPrice(TradeReply tReply);
+	public List<Trade> printMyTrade(Member loginUser);
 
 }

src/main/java/com/kh/tripply/trade/service/logic/TradeServiceImpl.java

@@ -9,6 +9,7 @@
 
 import com.kh.tripply.common.Paging;
 import com.kh.tripply.common.Search;
+import com.kh.tripply.member.domain.Member;
 import com.kh.tripply.trade.domain.Trade;
 import com.kh.tripply.trade.domain.TradeReply;
 import com.kh.tripply.trade.service.TradeService;
@@ -106,4 +107,16 @@ public int removeTradeReply(TradeReply tReply) {
 		return result;
 	}
 
+	@Override
+	public int modifyFinalBiddingPrice(TradeReply tReply) {
+		int result = tStore.updateFinalBiddingPrice(session, tReply);
+		return result;
+	}
+
+	@Override
+	public List<Trade> printMyTrade(Member loginUser) {
+		List<Trade> tList = tStore.selectMyTrade(session, loginUser);
+		return tList;
+	}
+
 }

src/main/java/com/kh/tripply/trade/store/TradeStore.java

@@ -7,6 +7,7 @@
 
 import com.kh.tripply.common.Paging;
 import com.kh.tripply.common.Search;
+import com.kh.tripply.member.domain.Member;
 import com.kh.tripply.trade.domain.Trade;
 import com.kh.tripply.trade.domain.TradeReply;
 
@@ -32,4 +33,6 @@ public interface TradeStore {
 
 		/////////////////////거래
 	public int updateBuyer(SqlSessionTemplate session,HashMap<String,String> paramMap);
+	public int updateFinalBiddingPrice(SqlSessionTemplate session,TradeReply tReply);
+	public List<Trade> selectMyTrade(SqlSessionTemplate session,Member loginUser);
 }

src/main/java/com/kh/tripply/trade/store/logic/TradeStoreLogic.java

@@ -9,6 +9,7 @@
 
 import com.kh.tripply.common.Paging;
 import com.kh.tripply.common.Search;
+import com.kh.tripply.member.domain.Member;
 import com.kh.tripply.trade.domain.Trade;
 import com.kh.tripply.trade.domain.TradeReply;
 import com.kh.tripply.trade.store.TradeStore;
@@ -104,4 +105,16 @@ public int deleteTradeReply(SqlSessionTemplate session, TradeReply tReply) {
 		return result;
 	}
 
+	@Override
+	public int updateFinalBiddingPrice(SqlSessionTemplate session, TradeReply tReply) {
+		int result = session.update("TradeMapper.updateFinalBiddingPrice", tReply);
+		return result;
+	}
+
+	@Override
+	public List<Trade> selectMyTrade(SqlSessionTemplate session, Member loginUser) {
+		List<Trade> tList = session.selectList("TradeMapper.selectMyTrade", loginUser);
+		return tList;
+	}
+
 }

src/main/resources/mappers/trade-mapper.xml

@@ -5,22 +5,23 @@
 
  <mapper namespace="TradeMapper">
   <resultMap type="Trade" id="TradeResultMap">
-	  	<id 	column="BOARD_NO" 			property="boardNo"/>
-	  	<result column="TRADE_TITLE"		property="tradeTitle"/>
-	  	<result column="TRADE_CONTENTS" 	property="tradeContents"/>
-	  	<result column="TRADE_WRITER" 		property="tradeWriter"/>
-	  	<result column="T_LOCATION_CODE" 	property="tLocationCode"/>
-	  	<result column="LOCATION_NAME" 		property="tLocationName"/>
-	  	<result column="TRADE_FILENAME" 	property="tradeFileName"/>
-	  	<result column="TRADE_RENAME"	    property="tradeFileReName"/>
-	  	<result column="TRADE_FILEPATH"	    property="tradeFilePath"/>
-	  	<result column="TRADE_COUNT" 		property="tradeCount"/>
-	  	<result column="T_CREATE_DATE"	    property="tCreateDate"/>
-	  	<result column="T_UPDATE_DATE" 		property="tUpdateDate"/>
-	  	<result column="T_STATUS" 			property="tStatus"/>
-	  	<result column="BUYER_ID" 			property="buyerId"/>
-	  	<result column="SOLD_OUT" 			property="soldOut"/>
-	  	<result column="THUMBNAIL_PATH" 	property="thumbnailPath"/>
+	  	<id 	column="BOARD_NO" 				property="boardNo"/>
+	  	<result column="TRADE_TITLE"			property="tradeTitle"/>
+	  	<result column="TRADE_CONTENTS" 		property="tradeContents"/>
+	  	<result column="TRADE_WRITER" 			property="tradeWriter"/>
+	  	<result column="T_LOCATION_CODE" 		property="tLocationCode"/>
+	  	<result column="LOCATION_NAME" 			property="tLocationName"/>
+	  	<result column="TRADE_FILENAME" 		property="tradeFileName"/>
+  		<result column="TRADE_RENAME"	        property="tradeFileReName"/>
+	  	<result column="TRADE_FILEPATH"	        property="tradeFilePath"/>
+	  	<result column="TRADE_COUNT" 			property="tradeCount"/>
+	  	<result column="T_CREATE_DATE"	    	property="tCreateDate"/>
+	  	<result column="T_UPDATE_DATE" 			property="tUpdateDate"/>
+	  	<result column="T_STATUS" 				property="tStatus"/>
+	  	<result column="BUYER_ID" 				property="buyerId"/>
+	  	<result column="SOLD_OUT" 				property="soldOut"/>
+	  	<result column="THUMBNAIL_PATH" 		property="thumbnailPath"/>
+	  	<result column="FINAL_BIDDING_PRICE"    property="finalBiddingPrice"/>
   </resultMap>
 
   <select id="selectOneTrade" resultMap="TradeResultMap">
@@ -83,6 +84,12 @@
   		</where>
   </select>
 
+  <select id="selectMyTrade" resultMap="TradeResultMap">
+  	SELECT BOARD_NO,TRADE_TITLE,TRADE_WRITER,FINAL_BIDDING_PRICE,SOLD_OUT 
+  	FROM TRADE_TBL
+  	WHERE BUYER_ID=#{memberId}
+  </select>
+
   <insert id="insertTrade">
   	INSERT INTO TRADE_TBL
   	VALUES(SEQ_BOARDNO.NEXTVAL,#{tradeTitle},#{tradeContents},#{tradeWriter},#{tLocationCode},#{tradeFileName},#{tradeFileReName},#{tradeFilePath},DEFAULT,DEFAULT,DEFAULT,DEFAULT,NULL,DEFAULT,#{thumbnailPath})
@@ -103,6 +110,11 @@
   	WHERE BOARD_NO=#{boardNo}
   </update>
 
+  <update id="updateFinalBiddingPrice">
+  	UPDATE TRADE_TBL SET FINAL_BIDDING_PRICE=#{biddingPrice}
+  	WHERE BOARD_NO = #{boardNo}
+  </update>
+
   <delete id="deleteTrade">
   	DELETE FROM TRADE_TBL WHERE BOARD_NO=#{boardNo}
   </delete>

src/main/resources/mappers/trade-reply-mapper.xml

@@ -15,16 +15,17 @@
   		<result column="T_R_STATUS" property="trStatus"/>
   		<result column="T_R_CHOICED" property="trChoiced"/>
   		<result column="RE_REPLY_YN" property="reReplyYn"/>
+  		<result column="BIDDING_PRICE" property="biddingPrice"/>
   	</resultMap>
 
   	<insert id="insertTradeReply">
   		<if test='tRefReplyNo == -1'>
   			INSERT INTO TRADE_REPLY_TBL
-  			VALUES(SEQ_REPLYNO.NEXTVAL,#{boardNo},SEQ_REPLYNO.CURRVAL,#{tReplyWriter},#{tReplyContents},DEFAULT,DEFAULT,DEFAULT,DEFAULT,#{reReplyYn})
+  			VALUES(SEQ_REPLYNO.NEXTVAL,#{boardNo},SEQ_REPLYNO.CURRVAL,#{tReplyWriter},#{tReplyContents},DEFAULT,DEFAULT,DEFAULT,DEFAULT,#{reReplyYn},#{biddingPrice})
   		</if>
   		<if test='tRefReplyNo != -1'>
   			INSERT INTO TRADE_REPLY_TBL
-  			VALUES(SEQ_REPLYNO.NEXTVAL,#{boardNo},#{tRefReplyNo},#{tReplyWriter},#{tReplyContents},DEFAULT,DEFAULT,DEFAULT,DEFAULT,#{reReplyYn})
+  			VALUES(SEQ_REPLYNO.NEXTVAL,#{boardNo},#{tRefReplyNo},#{tReplyWriter},#{tReplyContents},DEFAULT,DEFAULT,DEFAULT,DEFAULT,#{reReplyYn},#{biddingPrice})
   		</if>
   	</insert>
 
@@ -36,8 +37,8 @@
 
   	<update id="updateTradeReply">
   		UPDATE TRADE_REPLY_TBL
-  		SET T_REPLY_CONTENTS=#{tReplyContents}, T_R_UPDATE_DATE=SYSDATE
-  		WHERE T_REPLY_NO=#{tReplyNo}
+  		SET T_REPLY_CONTENTS=#{tReplyContents}, T_R_UPDATE_DATE=SYSDATE, T_R_STATUS='N'
+  		WHERE T_REPLY_NO=#{tReplyNo} AND T_R_STATUS='Y'
   	</update>
 
   	<update id="deleteTradeReply">