|
@@ -1490,6 +1490,18 @@ public class TscOrderService {
|
|
|
// 8. 2021.04.25 보증보험신청정보등록 (무통장결제, 실시간계좌이체)
|
|
// 8. 2021.04.25 보증보험신청정보등록 (무통장결제, 실시간계좌이체)
|
|
|
if (TscConstants.PayMeans.ACCOUNT_TRANSFER.value().equals(order.getPayMeans()) || TscConstants.PayMeans.BANK_DEPOSIT.value().equals(order.getPayMeans())) {
|
|
if (TscConstants.PayMeans.ACCOUNT_TRANSFER.value().equals(order.getPayMeans()) || TscConstants.PayMeans.BANK_DEPOSIT.value().equals(order.getPayMeans())) {
|
|
|
if ("Y".equals(order.getInsuranceYn())) {
|
|
if ("Y".equals(order.getInsuranceYn())) {
|
|
|
|
|
+
|
|
|
|
|
+ //G007_F : 여성
|
|
|
|
|
+ //G007_M : 남성
|
|
|
|
|
+ //G007_X : 알수없음
|
|
|
|
|
+ //G007_Z : 공통
|
|
|
|
|
+
|
|
|
|
|
+ if ("G007_F".equals(order.getSexGb())) {
|
|
|
|
|
+ order.setSexGb("2");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ order.setSexGb("1");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
orderDao.createInsurance(order);
|
|
orderDao.createInsurance(order);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1767,6 +1779,7 @@ public class TscOrderService {
|
|
|
int goodsSumAmt = 0; // 상품금액합계(판매가)
|
|
int goodsSumAmt = 0; // 상품금액합계(판매가)
|
|
|
int delvFeeSumAmt = 0; // 배송비합계
|
|
int delvFeeSumAmt = 0; // 배송비합계
|
|
|
int cpn1DcSumAmt = 0; // 즉시할인합계
|
|
int cpn1DcSumAmt = 0; // 즉시할인합계
|
|
|
|
|
+ int cpn11DcSumAmt = 0; // 즉시할인합계(실결제금액계산용)
|
|
|
int tmtbSumAmt = 0; // 다다익선합계
|
|
int tmtbSumAmt = 0; // 다다익선합계
|
|
|
int cpnDcSumAmt = 0; // 쿠폰할인합계
|
|
int cpnDcSumAmt = 0; // 쿠폰할인합계
|
|
|
int prePntDcSumAmt = 0; // 선포인트할인합계
|
|
int prePntDcSumAmt = 0; // 선포인트할인합계
|
|
@@ -1783,7 +1796,7 @@ public class TscOrderService {
|
|
|
for (Order orderDetail : orderDetailList) {
|
|
for (Order orderDetail : orderDetailList) {
|
|
|
listSumAmt = listSumAmt + ((orderDetail.getListPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty());
|
|
listSumAmt = listSumAmt + ((orderDetail.getListPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty());
|
|
|
goodsSumAmt = goodsSumAmt + ((orderDetail.getCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty());
|
|
goodsSumAmt = goodsSumAmt + ((orderDetail.getCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty());
|
|
|
- cpn1DcSumAmt = cpn1DcSumAmt + orderDetail.getCpn1DcAmt();
|
|
|
|
|
|
|
+ cpn11DcSumAmt = cpn11DcSumAmt + orderDetail.getCpn1DcAmt();
|
|
|
tmtbSumAmt = tmtbSumAmt + (orderDetail.getTmtb1DcAmt() + orderDetail.getTmtb2DcAmt());
|
|
tmtbSumAmt = tmtbSumAmt + (orderDetail.getTmtb1DcAmt() + orderDetail.getTmtb2DcAmt());
|
|
|
cpnDcSumAmt = cpnDcSumAmt + (orderDetail.getGoodsCpnDcAmt() + orderDetail.getCartCpnDcAmt());
|
|
cpnDcSumAmt = cpnDcSumAmt + (orderDetail.getGoodsCpnDcAmt() + orderDetail.getCartCpnDcAmt());
|
|
|
prePntDcSumAmt = prePntDcSumAmt + orderDetail.getPrePntDcAmt();
|
|
prePntDcSumAmt = prePntDcSumAmt + orderDetail.getPrePntDcAmt();
|
|
@@ -1851,7 +1864,7 @@ public class TscOrderService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
int ordSumAmt = goodsSumAmt + delvFeeSumAmt;
|
|
int ordSumAmt = goodsSumAmt + delvFeeSumAmt;
|
|
|
- int dcSumAmt = cpn1DcSumAmt + tmtbSumAmt + cpnDcSumAmt + prePntDcSumAmt + pntDcSumAmt + gfcdUseSumAmt + mileageDcAmt + allianceDcAmt;
|
|
|
|
|
|
|
+ int dcSumAmt = cpn11DcSumAmt + tmtbSumAmt + cpnDcSumAmt + prePntDcSumAmt + pntDcSumAmt + gfcdUseSumAmt + mileageDcAmt + allianceDcAmt;
|
|
|
int realOrdSumAmt = ordSumAmt - dcSumAmt;
|
|
int realOrdSumAmt = ordSumAmt - dcSumAmt;
|
|
|
|
|
|
|
|
// 6. 화면전송변수설정
|
|
// 6. 화면전송변수설정
|