Merge branch 'style' into yujung_style

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

@@ -339,6 +339,10 @@ public class TscKcpService {
 		param.setTranCd("00200000");
 		c_PayPlus.mf_do_tx(env.getProperty("pg.kcp.site.cd"), env.getProperty("pg.kcp.site.key"), param.getTranCd(), custIp, "", env.getProperty("pg.kcp.log.level"), "1");
 
+		if (!"UTF-8".equals(System.getProperty("file.encoding"))) {
+			setFileEncoding("UTF-8");
+		}
+
 		log.info("CHECK KCP PG RESULT ::::: {}", c_PayPlus.getRecvObj().toString());
 
 		if("0000".equals(c_PayPlus.m_res_cd)) {
@@ -377,7 +381,11 @@ public class TscKcpService {
 				e.printStackTrace();
 			}
 		} else {
-			throw new IllegalArgumentException("결제 취소 실패하였습니다.");
+			if ("bos".equals(env.getProperty("server.site.name"))) {
+				throw new IllegalArgumentException(c_PayPlus.m_res_msg);
+			} else {
+				throw new IllegalArgumentException("결제 취소 실패하였습니다.");
+			}
 		}
 	}
 
@@ -452,11 +460,14 @@ public class TscKcpService {
 
 		c_PayPlus.mf_do_tx(siteCd, siteKey, tranCd, custIp, ordNo, "3", "1" );
 
+		// 파일 인코딩 UTF-8 변경
+		setFileEncoding("UTF-8");
+
+		log.info("CHECK KCP PG RESULT ::::: {}", c_PayPlus.getRecvObj().toString());
+
 		result.set("resCd", c_PayPlus.m_res_cd);										// 결과 메시지
 		result.set("resMsg", c_PayPlus.m_res_msg);										// 결과 메시지
 		result.set("res_en_msg", c_PayPlus.getRecvMsgOfKey("res_en_msg"));				// 결과 메시지(영문)
-		// 파일 인코딩 UTF-8 변경
-		setFileEncoding("UTF-8");
 
 		return result;
 	}

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

@@ -1694,6 +1694,18 @@ public class TscOrderService {
 	@Transactional("shopTxnManager")
 	public void updateOrderInfo(Order order) {
 		
+		// 2021.10.01 세션유실시 CUST_NO 주문정보에 있는 CUST_NO로 방어 설정
+		if (order.getCustNo() < 1) {
+			int custNo = 0;
+			Collection<Order> orderInfo = orderDao.getOrderInfoList(order);
+			if (orderInfo != null) {
+				if (orderInfo.size() > 0) {
+					custNo = orderInfo.iterator().next().getCustNo();
+				}
+			}
+			order.setCustNo(custNo);
+		}
+		
 		// 1.1 무통장입금시 입금대기 
 		if (TscConstants.PayMeans.BANK_DEPOSIT.value().equals(order.getPayMeans())) {
 			order.setOrdDtlStat(TscConstants.OrderDetailStat.DEPOSIT_WAIT.value());

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

@@ -112,7 +112,6 @@ public class TscPointService {
 
 	/**
 	 * 자동 구매확정 포인트 생성
-	 *
 	 * @param point - 고객번호, 주문번호, 주문상세번호
 	 * @author jsshin
 	 * @since 2021. 04. 21
@@ -125,18 +124,9 @@ public class TscPointService {
 
 		// 2.구매확정 포인트 생성
 		pointDao.createOrderDecisionPoint(point);
+
 		// 3.구매확정 포인트 히스토리 수정
 		pointDao.updateOrderDecisionPointHst(point);
-		
-		// 4.주문상세 상태 변경 및 히스토리 생성
-		Order order = new Order();
-		order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
-		order.setOrdNo(point.getOrdNo());
-		order.setOrdDtlNo(point.getOrdDtlNo());
-		order.setRegNo(point.getRegNo());
-		order.setUpdNo(point.getUpdNo());
-		orderService.saveOrdDtlStat(order);
-
 	}
 
 	/**

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

@@ -1617,7 +1617,8 @@
 	<select id="getDeliveryFeeList" parameterType="Order" resultType="Order">
 		/* order.getDeliveryFeeList */
 		SELECT Z.*
-		  FROM (SELECT DF.DELV_FEE_GB
+		  FROM (
+		        SELECT DF.DELV_FEE_GB
 		             , FN_GET_CODE_NM('G018', DF.DELV_FEE_GB)       AS DELV_FEE_GB_NM
 		             , DF.DELV_FEE
 		             , DF.REAL_DELV_AMT
@@ -1636,24 +1637,45 @@
 		          FROM TB_DELIVERY_FEE DF
 		         WHERE 1 = 1
 		           AND DF.ORD_NO = #{ordNo}
-		           AND NOT EXISTS (SELECT 1
-		                        FROM TB_ORDER_CHANGE_DETAIL OCD
-		                       WHERE DF.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		                         AND OCD.CHG_STAT IN ('G685_19', 'G685_49', 'G685_69'))
-		           AND NOT EXISTS (SELECT 1
+		           AND DF.DELV_FEE_GB = 'G018_10'
+		        UNION  ALL
+		        SELECT DF.DELV_FEE_GB
+		             , FN_GET_CODE_NM('G018', DF.DELV_FEE_GB)       AS DELV_FEE_GB_NM
+		             , DF.DELV_FEE
+		             , DF.REAL_DELV_AMT
+		             , DF.DELV_USAC_YN
+		             , DATE_FORMAT(DF.DELV_USAC_DT, '%Y%m%d%H%i%S') AS DELV_USAC_DT
+		             , DF.SUPPLY_COMP_CD
+		             , DF.DELV_FEE_SQ
+		             , DF.DELV_CPN_SQ
+		             , DF.DELV_CPN_DC_AMT
+		             , DF.DELV_GFCD_USE_AMT
+		             , DF.DELV_FEE_CD
+		             , CASE WHEN DF.DELV_FEE_CD IN ('WMS')
+		                    THEN '자사'
+		                    ELSE (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY X WHERE X.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD)
+		                    END  SUPPLY_COMP_NM
+		          FROM TB_DELIVERY_FEE DF
+		         WHERE 1 = 1
+		           AND DF.ORD_NO = #{ordNo}
+		           AND EXISTS (SELECT 1
 		                        FROM TB_ORDER_CHANGE_DETAIL OCD
 		                       WHERE DF.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		                         AND OCD.DEL_YN = 'Y')
+		                         AND OCD.CHG_STAT IN ('G685_40', 'G685_60'))
 		  ) Z
 		 GROUP BY Z.DELV_FEE_GB
 		        , Z.DELV_FEE_GB_NM
 		        , Z.DELV_FEE
+		        , Z.REAL_DELV_AMT
 		        , Z.DELV_USAC_YN
 		        , Z.DELV_USAC_DT
 		        , Z.SUPPLY_COMP_CD
+		        , Z.SUPPLY_COMP_NM
 		        , Z.DELV_FEE_SQ
 		        , Z.DELV_CPN_SQ
 		        , Z.DELV_CPN_DC_AMT
+		        , Z.DELV_GFCD_USE_AMT
+		        , Z.DELV_FEE_CD
 	</select>
 
 	<!-- 주문상세 > 취소/반품/교환 요청정보 (변경상세단위) -->
@@ -3364,7 +3386,7 @@
 		FROM   TB_PAYMENT
 		WHERE  1=1
 		<choose>
-			<when test="payMeans == 'G014_70'">
+			<when test="payMeans == 'G014_70' || payMeans == 'G014_90'">
 		AND    ORD_NO = #{ordNo}
 			</when>
 			<otherwise>