Merge branch 'develop' into bin2107

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

@@ -26,26 +26,11 @@
 	<!-- 적립예정 포인트조회-->
 	<select id="getExpectedPointInfo" parameterType="Point" resultType="int">
 		/* TsfPoint.getExpectedPointInfo */
-		SELECT IFNULL(SUM(A.PNT_AMT + B.PNT_AMT),0) AS EXPECTED_PNT_AMT
-		FROM (
-		      SELECT SUM(PNT_AMT) AS PNT_AMT
-		           , ORD_NO
-		      FROM   TB_CUST_POINT_HST
-		      WHERE  OCCUR_GB = 'G069_12' -- 적립예정
-		      AND    PNT_UPLOAD_STAT = 'G070_10'
-		      AND    CUST_NO = #{custNo}
-		      GROUP BY ORD_NO
-		      ) A
-		   , (
-		      SELECT SUM(PNT_AMT) AS PNT_AMT
-		           , ORD_NO
-		      FROM   TB_CUST_POINT_HST
-		      WHERE  OCCUR_GB = 'G069_13' -- 적립예정취소
-		      AND    PNT_UPLOAD_STAT = 'G070_20'
-		      AND    CUST_NO = #{custNo}
-		      GROUP BY ORD_NO
-		      ) B
-		WHERE A.ORD_NO = B.ORD_NO
+		SELECT IFNULL(SUM(CPH.PNT_AMT), 0) AS PNT_AMT
+		FROM   TB_CUST_POINT_HST CPH
+		WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')             -- 적립예정, 적립취소
+		AND    CPH.PNT_UPLOAD_STAT IN ('G070_10')                 -- 반영예정
+		AND    CPH.CUST_NO = #{custNo}
 	</select>
 	
 	<!-- 한달 이내 소멸예정 포인트조회-->
@@ -237,7 +222,7 @@
 		               SELECT SUM(US_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
-		              ), 0)                           AS US_PNT_AMT -- 사용포인트
+		              ), 0)                           AS US_PNT_AMT     -- 사용포인트
 		     , IFNULL((
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
@@ -246,27 +231,12 @@
 		               AND    EXP_CMP_DT IS NOT NULL
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
-		               SELECT SUM(A.PNT_AMT + B.PNT_AMT) AS PNT_AMT
-		               FROM (
-		                   SELECT SUM(PNT_AMT) AS PNT_AMT
-		                        , ORD_NO
-		                   FROM   TB_CUST_POINT_HST
-		                   WHERE  OCCUR_GB = 'G069_12' -- 적립예정
-		                   AND    PNT_UPLOAD_STAT = 'G070_10' -- 포인트반영
-		                   AND    CUST_NO = #{custNo}
-		                   GROUP BY ORD_NO
-		               ) A
-		               , (
-		                  SELECT SUM(PNT_AMT) AS PNT_AMT
-		                       , ORD_NO
-		                  FROM   TB_CUST_POINT_HST
-		                  WHERE  OCCUR_GB = 'G069_13' -- 적립예정취소
-		                  AND    PNT_UPLOAD_STAT = 'G070_20' -- 포인트반영전취소
-		                  AND    CUST_NO = #{custNo}
-		                  GROUP BY ORD_NO
-		                ) B
-		                 WHERE A.ORD_NO = B.ORD_NO
-		                ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
+		               SELECT SUM(CPH.PNT_AMT) AS PNT_AMT
+		               FROM   TB_CUST_POINT_HST CPH
+		               WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')       -- 적립예정, 적립취소
+		               AND    CPH.PNT_UPLOAD_STAT IN ('G070_10')           -- 반영예정
+		               AND    CPH.CUST_NO = #{custNo}
+		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
 		     , IFNULL((
 		                SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
 		                FROM  TB_CUST_POINT

src/main/webapp/WEB-INF/views/web/SigninFormWeb.html

@@ -101,7 +101,9 @@
 						</ul>
 					</div>
 					<div class="t_c mt30">
-						<button type="button" class="btn_nonMb"><span>비회원 주문조회</span></button>
+						<button type="button" class="btn_nonMb" onclick="cfnGoToPage(_PAGE_NON_CUSTOMER_ORDER_CONFIRM);">
+							<span>비회원 주문조회</span>
+						</button>
 					</div>
 				</form>
 			</div>

src/main/webapp/WEB-INF/views/web/customer/NonCustOrderConfirmFormWeb.html

@@ -53,7 +53,7 @@
 						<label class="input_label sr-only">주문번호</label>
 						<div class="ui_col_12">
 							<div class="input_wrap">
-								<input type="text" name="ordNo" placeholder="주문 번호" id="ordNo" required="required" data-valid-type="numeric" data-valid-name="주문번호"/>
+								<input type="text" name="ordNo" placeholder="주문 번호" id="ordNo" required="required" data-valid-type="numeric" data-valid-name="주문번호" maxlength="30"/>
 							</div>
 						</div>
 					</div>

src/main/webapp/ux/style24_link.js

@@ -33,6 +33,7 @@ const _PAGE_CUSTOMER_CONSENT_USERINFO = _frontUrl + "/customer/consent/useinfo/f
 const _PAGE_USE_TERMS_LAYER = _frontUrl + "/customer/use/terms/layer";								// 회원가입 > 이용약관
 const _PAGE_PRIVACY_POLICY_LAYER = _frontUrl + "/customer/privacy/policy/layer";					// 회원가입 > 개인정보취급방침
 const _PAGE_PRIVACY_TRUST_LAYER = _frontUrl + "/customer/privacy/trust/layer";						// 회원가입 > 개인정보취급위탁
+const _PAGE_NON_CUSTOMER_ORDER_CONFIRM = _frontUrl + "/customer/noncust/order/confirm/form";		// 고객 > 비회원주문확인
 
 //== 상품상세 ==/
 const _PAGE_GOODS_DETAIL = _frontUrl + "/goods/detail/form?goodsCd=";								// 상품 상세