마이페이지 반품 임시 커밋

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

@@ -260,16 +260,15 @@ public class TscOrderChangeService {
 						for (Order point : orderChangeDao.getCustPointHst(vo)) {
 							while (pntDcAmt > 0) {
 								if (pntDcAmt < (point.getPntAmt() * -1)) {
-									point.setPntAmt(pntDcAmt);
+									point.setPntAmt(pntDcAmt * -1);
 									pntDcAmt -= pntDcAmt;
 								} else {
+									point.setPntAmt(point.getPntAmt() * -1);
 									pntDcAmt -= (point.getPntAmt() * -1);
 								}
 
 								point.setOccurGb(TscConstants.PointOccurGb.USE_POINT_CANCEL.value());
-								// TODO
-								// 사용포인트 포인트반영상태 처리
-								// point.setPntUploadStat(TscConstants.PntUploadStat.);
+								point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
 								point.setOccurDtlDesc("포인트사용취소");
 								point.setRegNo(custNo);
 								point.setUpdNo(custNo);
@@ -286,7 +285,7 @@ public class TscOrderChangeService {
 
 						for (Order point : orderChangeDao.getCustPointHst(vo)) {
 							point.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT_CANCEL.value());
-							point.setPntUploadStat(TscConstants.PntUploadStat.BEFORE_APPLY_CANCEL.value());
+							point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_EXPECT.value());
 							point.setOccurDtlDesc("예정포인트적립취소");
 							point.setPntAmt(savePntAmt * -1);
 							point.setRegNo(custNo);
@@ -1910,11 +1909,9 @@ public class TscOrderChangeService {
 
 		for (Order point : orderChangeDao.getCustPointHst(vo)) {
 			point.setOccurGb(TscConstants.PointOccurGb.USE_POINT_CANCEL.value());
-			// TODO
-			// 사용포인트 포인트반영상태 처리
-			// point.setPntUploadStat(TscConstants.PntUploadStat.);
+			point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
 			point.setOccurDtlDesc("포인트사용취소");
-			point.setPayAmt(point.getPayAmt() * -1);
+			point.setPntAmt(point.getPntAmt() * -1);
 			point.setRegNo(regNo);
 			point.setUpdNo(updNo);
 
@@ -1928,9 +1925,9 @@ public class TscOrderChangeService {
 
 		for (Order point : orderChangeDao.getCustPointHst(vo)) {
 			point.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT_CANCEL.value());
-			point.setPntUploadStat(TscConstants.PntUploadStat.BEFORE_APPLY_CANCEL.value());
+			point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_EXPECT.value());
 			point.setOccurDtlDesc("예정포인트적립취소");
-			point.setPayAmt(point.getPayAmt() * -1);
+			point.setPntAmt(point.getPntAmt() * -1);
 			point.setRegNo(regNo);
 			point.setUpdNo(updNo);