|
@@ -1618,29 +1618,32 @@ public class TscOrderService {
|
|
|
rmPntAmt = 0;
|
|
rmPntAmt = 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 8.1 포인트정보변경
|
|
|
|
|
- custPointInfo.setUsPntAmt(usPntAmt);
|
|
|
|
|
- custPointInfo.setRmPntAmt(rmPntAmt);
|
|
|
|
|
- custPointInfo.setCustNo(order.getCustNo());
|
|
|
|
|
- orderDao.updateCustPoint(custPointInfo);
|
|
|
|
|
-
|
|
|
|
|
- // 주문사용포인트
|
|
|
|
|
- if (orderDetail.getOrdDtlNo() > 0) {
|
|
|
|
|
- custPointInfo.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT.value());
|
|
|
|
|
- custPointInfo.setOccurDtlDesc("구매포인트사용");
|
|
|
|
|
- }
|
|
|
|
|
- // 사은품사용포인트
|
|
|
|
|
- else {
|
|
|
|
|
- custPointInfo.setOccurGb(TscConstants.PointOccurGb.FREEGIFT_USE_POINT.value());
|
|
|
|
|
- custPointInfo.setOccurDtlDesc("사은품포인트사용");
|
|
|
|
|
|
|
+ // 2021.05.10 0원이상일때 동작 (소원씨찾음)
|
|
|
|
|
+ if (usPntAmt > 0) {
|
|
|
|
|
+ // 8.1 포인트정보변경
|
|
|
|
|
+ custPointInfo.setUsPntAmt(usPntAmt);
|
|
|
|
|
+ custPointInfo.setRmPntAmt(rmPntAmt);
|
|
|
|
|
+ custPointInfo.setCustNo(order.getCustNo());
|
|
|
|
|
+ orderDao.updateCustPoint(custPointInfo);
|
|
|
|
|
+
|
|
|
|
|
+ // 주문사용포인트
|
|
|
|
|
+ if (orderDetail.getOrdDtlNo() > 0) {
|
|
|
|
|
+ custPointInfo.setOccurGb(TscConstants.PointOccurGb.ORD_USE_POINT.value());
|
|
|
|
|
+ custPointInfo.setOccurDtlDesc("구매포인트사용");
|
|
|
|
|
+ }
|
|
|
|
|
+ // 사은품사용포인트
|
|
|
|
|
+ else {
|
|
|
|
|
+ custPointInfo.setOccurGb(TscConstants.PointOccurGb.FREEGIFT_USE_POINT.value());
|
|
|
|
|
+ custPointInfo.setOccurDtlDesc("사은품포인트사용");
|
|
|
|
|
+ }
|
|
|
|
|
+ custPointInfo.setPntAmt(usPntAmt * -1);
|
|
|
|
|
+ custPointInfo.setOrdNo(orderDetail.getOrdNo());
|
|
|
|
|
+ custPointInfo.setOrdDtlNo(orderDetail.getOrdDtlNo());
|
|
|
|
|
+ custPointInfo.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
|
|
|
|
|
+
|
|
|
|
|
+ // 8.2 포인트이력정보등록
|
|
|
|
|
+ orderDao.createCustPointHst(custPointInfo);
|
|
|
}
|
|
}
|
|
|
- custPointInfo.setPntAmt(usPntAmt * -1);
|
|
|
|
|
- custPointInfo.setOrdNo(orderDetail.getOrdNo());
|
|
|
|
|
- custPointInfo.setOrdDtlNo(orderDetail.getOrdDtlNo());
|
|
|
|
|
- custPointInfo.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
|
|
|
|
|
-
|
|
|
|
|
- // 8.2 포인트이력정보등록
|
|
|
|
|
- orderDao.createCustPointHst(custPointInfo);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1672,20 +1675,23 @@ public class TscOrderService {
|
|
|
rmGfcdAmt = 0;
|
|
rmGfcdAmt = 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 10.1 포인트정보변경
|
|
|
|
|
- custGiftcardInfo.setUsGfcdAmt(usGfcdAmt);
|
|
|
|
|
- custGiftcardInfo.setRmGfcdAmt(rmGfcdAmt);
|
|
|
|
|
- custGiftcardInfo.setCustNo(order.getCustNo());
|
|
|
|
|
- orderDao.updateCustGiftcard(custGiftcardInfo);
|
|
|
|
|
-
|
|
|
|
|
- custGiftcardInfo.setOccurGb("G074_12");
|
|
|
|
|
- custGiftcardInfo.setOccurDtlDesc("상품권사용");
|
|
|
|
|
- custGiftcardInfo.setGfcdAmt(usGfcdAmt * -1);
|
|
|
|
|
- custGiftcardInfo.setOrdNo(orderDetail.getOrdNo());
|
|
|
|
|
- custGiftcardInfo.setOrdDtlNo(orderDetail.getOrdDtlNo());
|
|
|
|
|
|
|
+ // 2021.05.10 0원이상일때 동작 (소원씨찾음)
|
|
|
|
|
+ if (usGfcdAmt > 0) {
|
|
|
|
|
+ // 10.1 포인트정보변경
|
|
|
|
|
+ custGiftcardInfo.setUsGfcdAmt(usGfcdAmt);
|
|
|
|
|
+ custGiftcardInfo.setRmGfcdAmt(rmGfcdAmt);
|
|
|
|
|
+ custGiftcardInfo.setCustNo(order.getCustNo());
|
|
|
|
|
+ orderDao.updateCustGiftcard(custGiftcardInfo);
|
|
|
|
|
|
|
|
- // 10.2 포인트이력정보등록
|
|
|
|
|
- orderDao.createCustGiftcardHst(custGiftcardInfo);
|
|
|
|
|
|
|
+ custGiftcardInfo.setOccurGb("G074_12");
|
|
|
|
|
+ custGiftcardInfo.setOccurDtlDesc("상품권사용");
|
|
|
|
|
+ custGiftcardInfo.setGfcdAmt(usGfcdAmt * -1);
|
|
|
|
|
+ custGiftcardInfo.setOrdNo(orderDetail.getOrdNo());
|
|
|
|
|
+ custGiftcardInfo.setOrdDtlNo(orderDetail.getOrdDtlNo());
|
|
|
|
|
+
|
|
|
|
|
+ // 10.2 포인트이력정보등록
|
|
|
|
|
+ orderDao.createCustGiftcardHst(custGiftcardInfo);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|