마이페이지 임시 커밋

src/main/java/com/style24/core/biz/dao/TscPointDao.java

@@ -1,8 +1,9 @@
 package com.style24.core.biz.dao;
 
+import org.springframework.stereotype.Repository;
+
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Point;
-import org.springframework.stereotype.Repository;
 
 
 /**
@@ -35,6 +36,7 @@ public interface TscPointDao {
 
 	/**
 	 * 구매확정 포인트 생성
+	 * 
 	 * @param Point
 	 * @return int
 	 * @author card007
@@ -44,6 +46,7 @@ public interface TscPointDao {
 
 	/**
 	 * 구매확정 포인트 이력 수정
+	 * 
 	 * @param Point
 	 * @return int
 	 * @author card007
@@ -51,4 +54,14 @@ public interface TscPointDao {
 	 */
 	int updateOrderDecisionPointHst(Point point);
 
+	/**
+	 * 구매확정 포인트 조회
+	 * 
+	 * @param Point
+	 * @return int
+	 * @author card007
+	 * @since 2021. 04. 07
+	 */
+	int getOrderDecisionPoint(Point point);
+
 }

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -465,9 +465,10 @@ public class TscOrderChangeService {
 		String isCustomer	= mav.getString("isCustomer").toString();							// 귀책사유 (고객, 회사)
 		String chgGb		= TscConstants.OrderChangeGb.RETURN.value(); 						// 반품요청
 		String wdGb			= mav.getString("wdGb");											// 회수방법
+		String wdInvoiceNo	= mav.getString("wdInvoiceNo");										// 회수송장번호
 		
 		// 4. 주문상세단품정보등록,변경 (단품단위)
-		List<Order> cancelOrderDetailList = new ArrayList<Order>();
+		List<Order> cancelOrderDetailList = new ArrayList<>();
 		
 		for (int i=0 ; i<cancelOrderRefundList.size() ; i++) {
 			Order cancelOrderRefundPo = cancelOrderRefundList.get(i);
@@ -475,7 +476,7 @@ public class TscOrderChangeService {
 			cancelOrderRefundPo.setUpdNo(userNo);
 
 			// 4.1 취소수량이 존재하면 주문상세단품정보 수정 및 주문상세단품이력정보 등록
-			if (cancelOrderRefundPo.getOrdCanChgQty() > 0) {				
+			if (cancelOrderRefundPo.getOrdCanChgQty() > 0) {
 				// 4.4 주문변경 상세 단위로 데이타 등록 (ORD_DTL_NO)
 				Boolean temp = false;
 				if (cancelOrderDetailList.size() > 0) {
@@ -511,6 +512,7 @@ public class TscOrderChangeService {
 				orderChange.setAddPayCost(0);
 				orderChange.setAddPayAmt(0);
 				orderChange.setWdGb(wdGb);
+				orderChange.setWdInvoiceNo(wdInvoiceNo);
 				orderChange.setRegNo(userNo);
 				orderChange.setUpdNo(userNo);
 				

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -1,16 +1,10 @@
 package com.style24.core.biz.service;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -22,7 +16,6 @@ import com.gagaframework.excel.env.GagaExcelConstants;
 import com.gagaframework.excel.xssf.GagaExcelResultHandler;
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.kcp.J_PP_CLI_N;
 import com.style24.core.biz.dao.TscOrderDao;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
@@ -1281,6 +1274,7 @@ public class TscOrderService {
 		Integer reviewSq = order.getReviewSq();
 		Integer regNo = order.getRegNo();
 		Integer updNo = order.getUpdNo();
+		int gvPointAmt = 0;
 		
 		try {
 			for (Integer ordDtlNo : order.getOrdDtlNoArr()) {
@@ -1293,7 +1287,7 @@ public class TscOrderService {
 				point.setRegNo(regNo);
 				point.setUpdNo(updNo);
 
-				pointService.createOrderDecisionPoint(point);
+				gvPointAmt += pointService.createOrderDecisionPoint(point);
 
 				// 주문상세 상태값 변경
 				order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
@@ -1301,11 +1295,10 @@ public class TscOrderService {
 				orderDao.changedOrdDtlStat(order);
 			}
 			
-			result.set("message", message.getMessage("SUCC_0004"));
+			result.set("message", NumberFormat.getInstance().format(gvPointAmt) + "P가 적립되었습니다.");
 			result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		} catch(Exception e) {
-			result.set("message", message.getMessage("FAIL_1003"));
-			result.set("status", GagaResponseStatus.FAIL.getCode());
+			throw new IllegalStateException(message.getMessage("FAIL_1003"));
 		}
 
 		return result;

src/main/java/com/style24/core/biz/service/TscPointService.java

@@ -1,12 +1,14 @@
 package com.style24.core.biz.service;
 
-import com.style24.core.biz.dao.TscPointDao;
-import com.style24.persistence.domain.Point;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.style24.core.biz.dao.TscPointDao;
+import com.style24.persistence.domain.Point;
+
+import lombok.extern.slf4j.Slf4j;
+
 
 /**
  * 포인트 Service
@@ -42,9 +44,13 @@ public class TscPointService {
 	 * @since 2021. 02. 17
 	 */
 	public int createOrderDecisionPoint(Point point) {
-		int result = pointDao.createOrderDecisionPoint(point);
-		result += pointDao.updateOrderDecisionPointHst(point);
-		return result;
+		// 구매확정 포인트 생성
+		pointDao.createOrderDecisionPoint(point);
+		// 구매확정 포인트 히스토리 수정
+		pointDao.updateOrderDecisionPointHst(point);
+
+		// 구매확정 포인트 적립금액 리턴
+		return pointDao.getOrderDecisionPoint(point);
 	}
 
 }

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -368,6 +368,7 @@
 			, CHGER_RTN_MEMO
 			, ADD_PAY_COST
 			, ADD_PAY_AMT
+			, WD_INVOICE_NO
 			, REG_NO
 			, REG_DT
 			, UPD_NO
@@ -387,6 +388,7 @@
 			 , #{chgerRtnMemo}
 			 , #{addPayCost}
 			 , #{addPayAmt}
+			 , #{wdInvoiceNo}
 			 , #{regNo}
 			 , NOW()
 			 , #{updNo}

src/main/java/com/style24/persistence/mybatis/shop/TscPoint.xml

@@ -82,7 +82,7 @@
 
 	<!-- 구매확정 포인트 생성 -->
 	<insert id="createOrderDecisionPoint" parameterType="Point" keyProperty="custPntSq">
-		/* TscOrder.createOrderDecisionPoint */
+		/* TscPoint.createOrderDecisionPoint */
 		INSERT INTO TB_CUST_POINT (
 		       CUST_NO
 		     , GV_PNT_AMT
@@ -116,7 +116,7 @@
 	
 	<!-- 구매확정 포인트 이력 수정 -->
 	<update id="updateOrderDecisionPointHst" parameterType="Point">
-		/* TscOrder.updateOrderDecisionPoint */
+		/* TscPoint.updateOrderDecisionPoint */
 		UPDATE TB_CUST_POINT_HST
 		SET    CUST_PNT_SQ = #{custPntSq}
 		<if test="reviewSq != null and reviewSq != ''">
@@ -133,5 +133,13 @@
 		AND    OCCUR_GB = 'G069_12'
 		AND    PNT_UPLOAD_STAT = 'G070_10'
 	</update>
+	
+	<!-- 구매확정 포인트 조회 -->
+	<select id="getOrderDecisionPoint" parameterType="Point" resultType="int">
+		/* TscPoint.getOrderDecisionPoint */
+		SELECT GV_PNT_AMT
+		  FROM TB_CUST_POINT
+		 WHERE CUST_PNT_SQ = #{custPntSq}
+	</select>
 
 </mapper>