Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-198(다다익선등록오류)

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -402,24 +402,31 @@ public class TsaGoodsService {
 
 		if ("Y".equals(goodsSearch.getImageViewYn())) {
 			// 헤더 title 설정
-			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "자사즉시할인가", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부"};
+			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목",
+				"전시재고", "상품상태", "스타일년도", "시즌", "정상가", "판매가", "자사즉시할인가", "가격변경일",
+				"포인트적립율(PC)", "포인트적립율(MO)", "선포인트적용여부(PC)", "선포인트적용여부(MO)", "선물포장여부", "1인당최대구매수량", "최수주문수량", "신규고객주문가능일시",
+				"ERP재고연동여부", "정상이월구분", "반품가능여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
 			String[] cellNames = {"SYS_IMG_NM", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
-				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE",
-				"BENEFIT_PRICE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
+				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT",
+				"PNT_PRATE", "PNT_MRATE", "PRE_PPNT_USABLE_YN", "PRE_MPNT_USABLE_YN", "GIFT_PACK_YN", "DAY_MAX_ORD_QTY", "MIN_ORD_QTY", "NEW_CUST_ORD_DT",
+				"ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
 
-			String[] cellTypes = {GagaExcelConstants.CellType.IMAGE.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name()};
+			String[] cellTypes = {
+					GagaExcelConstants.CellType.IMAGE.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+					GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+					GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			String targetPath = env.getProperty("upload.goods.view");
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch); // map형식으로 조회
@@ -444,22 +451,31 @@ public class TsaGoodsService {
 
 		} else {
 			// 헤더 title 설정
-			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "자사즉시할인가", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부"};
+			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목",
+				"전시재고", "상품상태", "스타일년도", "시즌", "정상가", "판매가", "자사즉시할인가", "가격변경일",
+				"포인트적립율(PC)", "포인트적립율(MO)", "선포인트적용여부(PC)", "선포인트적용여부(MO)", "선물포장여부", "1인당최대구매수량", "최수주문수량", "신규고객주문가능일시",
+				"ERP재고연동여부", "정상이월구분", "반품가능여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
-			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM", "STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR",
-				"SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
+			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_ENM", "GOODS_NM", "ITEMKIND_NM",
+				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT",
+				"PNT_PRATE", "PNT_MRATE", "PRE_PPNT_USABLE_YN", "PRE_MPNT_USABLE_YN", "GIFT_PACK_YN", "DAY_MAX_ORD_QTY", "MIN_ORD_QTY", "NEW_CUST_ORD_DT",
+				"ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {
+				GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
+				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+				GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch);
 

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -826,10 +826,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @since 2021. 01. 04.
 	 */
 	@GetMapping("/refund/account/create/form")
-	public ModelAndView refundAccountCreateForm(@RequestParam(value = "ordNo") int ordNo) {
+	public ModelAndView refundAccountCreateForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordChgSq") int ordChgSq) {
 		ModelAndView mav = new ModelAndView();
 		Order order = new Order();
 		order.setOrdNo(ordNo);
+		order.setOrdChgSq(ordChgSq);
 
 		Collection<Order> orderInfoList 		= coreOrderService.getOrderInfoList(order);
 		Collection<Order> orderRfAccountInfo 	= coreOrderChangeService.getRefundAccount(order);
@@ -837,6 +838,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("bankList"				, rendererService.getCommonCodeList("G942"));
 		mav.addObject("orderRfAccountInfo"		, orderRfAccountInfo);
 		mav.addObject("orderInfoList"			, orderInfoList);
+		mav.addObject("ordNo"					, ordNo);
+		mav.addObject("ordChgSq"				, ordChgSq);
 
 		mav.setViewName("order/RefundAccountRegistForm");
 		
@@ -875,9 +878,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		
 		if (isValid) {
 			// 2021.06.09 비회원이 아닌경우만 고객 계좌에 등록
-			if (order.getCustNo() > 0) {
-				// 환불계좌등록
-				coreOrderChangeService.saveRefundAccount(order);
+			if (order.getOrdChgSq() > 0) {
+				coreOrderChangeService.saveTbRefundAccount(order);
 			}
 		} else {
 			throw new IllegalStateException("환불계좌정보가 맞지 않습니다!");

src/main/java/com/style24/persistence/domain/Goods.java

@@ -218,5 +218,7 @@ public class Goods extends TscBaseDomain {
 	private int pageNo = 1;
 	private int pageSize = 50;
 	private int pageUnit = 10;
+	
+	private String newCustOrdDt;	// 신규고객주문가능일시
 
 }

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

@@ -480,7 +480,6 @@
 		              , G.CHANGEABLE_YN
 		              , G.RETURNABLE_YN
 		              , G.NEW_CUST_ORD_YN
-		              , G.GIFT_PACK_YN
 		              , G.DELV_LOC_CD
 		              , G.DELV_FEE_CD
 		              , G.MAIN_COLOR_CD
@@ -500,6 +499,19 @@
 		              , 0 AS TMP_DISP_ORD
 		                  </otherwise>
 		              </choose>
+		              , G.PNT_PRATE                              /*PC포인트적립율*/
+		              , G.PNT_MRATE                              /*모바일포인트적립율*/
+		              , G.PRE_PPNT_USABLE_YN                     /*PC선포인트적용여부*/
+		              , G.PRE_MPNT_USABLE_YN                     /*모바일선포인트적용여부*/
+		              , G.GIFT_PACK_YN                           /*선물포장여부*/
+		              , G.DAY_MAX_ORD_QTY                        /*ID당1일최대구매수량*/
+		              , G.MIN_ORD_QTY                            /*최수주문수량*/
+		              , CASE WHEN G.NEW_CUST_ORD_STDT IS NOT NULL AND G.NEW_CUST_ORD_EDDT IS NOT NULL THEN
+		                         CONCAT(DATE_FORMAT(G.NEW_CUST_ORD_STDT,'%Y-%m-%d %H:%i:%S'),
+		                                ' ~ ',
+		                                DATE_FORMAT(G.NEW_CUST_ORD_EDDT,'%Y-%m-%d %H:%i:%S'))
+		                     ELSE ''
+		                END                   AS NEW_CUST_ORD_DT /*신규고객주문가능일시*/
 		        FROM TB_GOODS G
 		       -- JOIN ( SELECT @rownum := 0) R
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
@@ -856,13 +868,13 @@
 		           , G.GOODS_NM
 		           , G.GOODS_TYPE
 		           , FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
-		           , G.LIST_PRICE
-		           , G.CURR_PRICE
+		           , FORMAT(G.LIST_PRICE,0)               AS LIST_PRICE
+		           , FORMAT(G.CURR_PRICE,0)               AS CURR_PRICE
 		          -- , G.DC_RATE
 		           , G.SELF_GOODS_YN
-		           , FN_GET_CODE_NM('G009', G.FORMAL_GB) AS FORMAL_GB
+		           , FN_GET_CODE_NM('G009', G.FORMAL_GB)  AS FORMAL_GB
 		           , G.STYLE_YEAR
-		           , FN_GET_CODE_NM('G006', G.SEASON_CD) AS SEASON_CD
+		           , FN_GET_CODE_NM('G006', G.SEASON_CD)  AS SEASON_CD
 		           , G.ERP_STOCK_LINK_YN
 		           , G.CHANGEABLE_YN
 		           , G.RETURNABLE_YN
@@ -887,6 +899,19 @@
 		           , 0 AS TMP_DISP_ORD
 		           </otherwise>
 		           </choose>
+		           , G.PNT_PRATE                                    /*PC포인트적립율*/
+		           , G.PNT_MRATE                                    /*모바일포인트적립율*/
+		           , G.PRE_PPNT_USABLE_YN                           /*PC선포인트적용여부*/
+		           , G.PRE_MPNT_USABLE_YN                           /*모바일선포인트적용여부*/
+		           , G.GIFT_PACK_YN                                 /*선물포장여부*/
+		           , FORMAT(G.DAY_MAX_ORD_QTY,0) AS DAY_MAX_ORD_QTY /*ID당1일최대구매수량*/
+		           , FORMAT(G.MIN_ORD_QTY,0)     AS MIN_ORD_QTY     /*최수주문수량*/
+		           , CASE WHEN G.NEW_CUST_ORD_STDT IS NOT NULL AND G.NEW_CUST_ORD_EDDT IS NOT NULL THEN
+		                      CONCAT(DATE_FORMAT(G.NEW_CUST_ORD_STDT,'%Y-%m-%d %H:%i:%S'),
+		                             ' ~ ',
+		                             DATE_FORMAT(G.NEW_CUST_ORD_EDDT,'%Y-%m-%d %H:%i:%S'))
+		                  ELSE ''
+		             END                         AS NEW_CUST_ORD_DT /*신규고객주문가능일시*/
 		      FROM TB_GOODS G
 		      INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		      INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD

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

@@ -226,15 +226,12 @@
 		                       OR FRONT_GB = 'A'
 		               </if>
 		                      )
-		               <if test='mallGb != null and mallGb != ""'>
-		               AND    IFNULL(EXTMALL_ID,'') != '' /*제휴몰만*/
-		                   <if test='multiExtmallId != null and multiExtmallId != ""'>
+	                   <if test='multiExtmallId != null and multiExtmallId != ""'>
 		               AND    EXTMALL_ID IN
-		                       <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
-		                       #{item}
-		                       </foreach>
-		                   </if>
-		               </if>
+	                       <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
+	                       #{item}
+	                       </foreach>
+	                   </if>
 		               AND    (
 		                       1 = 1
 		               <if test='distributionGbWms != null and distributionGbWms != ""'>
@@ -303,14 +300,11 @@
 		        OR SOD.FRONT_GB = 'A'
 		</if>
 		       )
-		<if test='mallGb != null and mallGb != ""'>
-		AND    IFNULL(SOD.EXTMALL_ID,'') != '' /*제휴몰만*/
-		    <if test='multiExtmallId != null and multiExtmallId != ""'>
+		<if test='multiExtmallId != null and multiExtmallId != ""'>
 		AND    SOD.EXTMALL_ID IN
-		        <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
-		        #{item}
-		        </foreach>
-		    </if>
+	        <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
+	        #{item}
+	        </foreach>
 		</if>
 		AND    (
 		        1 = 1
@@ -1299,7 +1293,17 @@
 		                SELECT 1
 		                FROM TB_COUPON X, TB_CUST_COUPON Y
 		                WHERE X.CPN_ID = Y.CPN_ID
-		                    AND Y.CUST_CPN_SQ = B.GOODS_CPN_SQ -- B.CPN1_CPN_SQ, B.CART_CPN_SQ (쿠폰종류에따라 설정)
+				<choose>
+					<when test="cpnType == 'G230_11'">
+						AND Y.CUST_CPN_SQ = B.GOODS_CPN_SQ
+					</when>
+					<when test='cpnType == "G230_20"'>
+						AND Y.CUST_CPN_SQ = B.CART_CPN_SQ
+					</when>
+		    	<otherwise>
+					 AND Y.CUST_CPN_SQ = B.CPN1_CPN_SQ
+				</otherwise>
+			  </choose>
 		                    AND X.CPN_ID = #{cpnId} -- 쿠폰번호변수
 		            )
 		            GROUP BY C.BRAND_CD, C.GOODS_CD, A.CUST_NO

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

@@ -194,10 +194,10 @@
 		    AND    A.RECALL_STAT  = #{recallStat}
 			</if>
 			<if test='stDate != null and stDate != ""'>
-		    AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		    AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 			</if>
 			<if test='edDate != null and edDate != ""'>
-		    AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') + 1 , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+		    AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY) 
 			</if>
 			<if test='reasonCode != null and reasonCode != ""'>
 		    AND    B.REASON_CODE = #{reasonCode}
@@ -366,10 +366,10 @@
 		            AND    A.RECALL_STAT  = #{recallStat}
 					</if>
 					<if test='stDate != null and stDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 					</if>
 					<if test='edDate != null and edDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY)
 					</if>
 					<if test='reasonCode != null and reasonCode != ""'>
 		            AND    B.REASON_CODE = #{reasonCode}
@@ -480,10 +480,10 @@
 		            AND    A.RECALL_STAT  = #{recallStat}
 					</if>
 					<if test='stDate != null and stDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 					</if>
 					<if test='edDate != null and edDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+		            AND    A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY)
 					</if>
 					<if test='reasonCode != null and reasonCode != ""'>
 		            AND    B.REASON_CODE = #{reasonCode}
@@ -594,10 +594,10 @@
 		            AND    A.RECALL_STAT  = #{recallStat}
 					</if>
 					<if test='stDate != null and stDate != ""'>
-		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s') 
+		            AND    A.DATE_CREATED <![CDATA[>= ]]> STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d') 
 					</if>
 					<if test='edDate != null and edDate != ""'>
-		            AND   A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','')+ 1, '%Y%m%d%H%i%s'), INTERVAL 1 DAY)
+		            AND   A.DATE_CREATED <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d'), INTERVAL 1 DAY)
 					</if>
 					<if test='reasonCode != null and reasonCode != ""'>
 		            AND   B.REASON_CODE = #{reasonCode}

src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -505,11 +505,32 @@
 				}
 			}
 		},
-		{headerName: "가격변경일", field: "priceUpdDt", width: 150, cellClass: 'text-center',
+		{
+			headerName: "가격변경일", field: "priceUpdDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
+		{
+			headerName: "포인트적립율(PC)", field: "pntPrate", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { return params.value + '%'; }
+		},
+		{
+			headerName: "포인트적립율(MO)", field: "pntMrate", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { return params.value + '%'; }
+		},
+		{ headerName: "선포인트적용여부(PC)", field: "prePpntUsableYn", width: 150, cellClass: 'text-center' },
+		{ headerName: "선포인트적용여부(MO)", field: "preMpntUsableYn", width: 150, cellClass: 'text-center' },
+		{ headerName: "선물포장여부", field: "giftPackYn", width: 120, cellClass: 'text-center' },
+		{
+			headerName: "1인당최대구매수량", field: "dayMaxOrdQty" , width: 150, cellClass: 'text-center',
+			valueFormatter: function(params) { return params.value.addComma(); }
+		},
+		{
+			headerName: "최수주문수량", field: "minOrdQty" , width: 120, cellClass: 'text-center',
+			valueFormatter: function(params) { return params.value.addComma(); }
+		},
+		{ headerName: "신규고객주문가능일시", field: "newCustOrdDt", width: 280, cellClass: 'text-center' },
 		{headerName: "ERP재고연동여부", field: "erpStockLinkYn", width: 120, cellClass: 'text-center'},
 		{headerName: "이월구분", field: "formalGb", width: 100, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(formalGbList) },

src/main/webapp/WEB-INF/views/order/CnclCompleteView.html

@@ -152,53 +152,7 @@
 					</div>
 				</th:block>
 				
-				<!-- 
-				<h4>환불예정금액</h4>
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width:20%;"/>
-						<col style="width:30%;"/>
-						<col style="width:20%;"/>
-						<col style="width:30%;"/>
-					</colgroup>
-					<tbody>
-						<tr>
-							<th>상품 주문 금액</th>
-							<td><span id="spanOrdAmt"></span>원</td>
-							<th>상품 취소 금액</th>
-							<td><span id="spanCnclRtnAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>포인트 취소 금액</th>
-							<td colspan="3"><span id="spanTotPntDcAmt"></span>원 (고객 포인트 : <span id="spanPntDcAmt"></span>원 + 상품 선포인트 : <span id="spanPrePntDcAmt"></span>원) </td>
-						</tr>
-						<tr>
-							<th>쿠폰 취소 금액</th>
-							<td colspan="3"><span id="spanCpnDcAmt"></span>원 (즉시할인쿠폰 : <span id="spanCpn1DcAmt"></span>원 + 상품쿠폰 : <span id="spanGoodsCpnDcAmt"></span>원 + 장바구니쿠폰 : <span id="spanCartCpnDcAmt"></span>원 + 배송비쿠폰 : <span id="spanDelvCpnDcAmt"></span>원)</td>
-						</tr>
-						<tr>
-							<th>다다익선 취소 금액</th>
-							<td colspan="3"><span id="spanTmtbDcAmt"></span>원 (수량할인 : <span id="spanTmtb1DcAmt"></span>원 + 금액할인 : <span id="spanTmtb2DcAmt"></span>원)</td>
-						</tr>
-						<tr>
-							<th>상품권 취소 금액</th>
-							<td colspan="3"><span id="spanGfcdUseAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>상품 실결제 취소 금액</th>
-							<td><span id="spanRealCnclRtnAmt"></span>원</td>
-							<th>환불 배송비 금액</th>
-							<td><span id="spanRealDelvAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>환불 금액</th>
-							<td colspan="3"><span id="spanRefundAmt"></span>원</td>
-						</tr>
-					</tbody>
-				</table>
-				 -->
-				
-				<div id="refundAccount" style="width:100%">
+				<div class="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
 					<!-- TABLE -->
 					<table class="tableStyle">
@@ -262,9 +216,9 @@ var columnCnclRtnCompleteList = [
 	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'},
 	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'},
-	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
+	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
 	//{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center',
+	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100, cellClass: 'text-center',
 		cellRenderer: function (params) {
 			var option;
 			if (params.data.goodsType == 'G056_S') {
@@ -463,42 +417,6 @@ $(document).ready(function() {
 		raNo					= cnclRtnCompleteList[0].raNo;				// 환불계좌번호
 		raNm					= cnclRtnCompleteList[0].raNm;				// 환불계좌명
 		
-		// 5. 환불에정금액 
-		//var spanOrdAmt 			= 0;
-		//var spanCnclRtnAmt 		= 0;
-		//var spanTotPntDcAmt		= 0;
-		//var spanPntDcAmt		= 0;
-		//var spanPrePntDcAmt		= 0;
-		//var spanCpnDcAmt		= 0;
-		//var spanCpn1DcAmt		= 0;
-		//var spanGoodsCpnDcAmt	= 0;
-		//var spanCartCpnDcAmt	= 0;
-		//var spanTmtbDcAmt		= 0;
-		//var spanTmtb1DcAmt		= 0;
-		//var spanTmtb2DcAmt		= 0;
-		//var spanGfcdUseAmt		= 0;
-		//var spanRealCnclRtnAmt	= 0;
-		//var spanTotDeliveryFee	= addPayCost;
-		//var spanRefundAmt		= 0;
-		//var spanRealDelvAmt		= realDelvAmt;
-		//var spanSavePntAmt		= 0;
-		
-		// 2021.08.11 card007 환불금액 관련 계산 TB_REFUND 정보로 변경
-		//for (i=0 ; i<cnclRtnCompleteList.length ; i++) {
-		//	spanOrdAmt 				= spanOrdAmt 			+ cnclRtnCompleteList[i].ordAmt;
-		//	spanCnclRtnAmt 			= spanCnclRtnAmt 		+ cnclRtnCompleteList[i].cnclRtnAmt;
-		//	spanPntDcAmt			= spanPntDcAmt			+ cnclRtnCompleteList[i].pntDcAmt;
-		//	spanPrePntDcAmt			= spanPrePntDcAmt		+ cnclRtnCompleteList[i].prePntDcAmt;
-		//	spanCpn1DcAmt 			= spanCpn1DcAmt 		+ cnclRtnCompleteList[i].cpn1DcAmt;
-		//	spanGoodsCpnDcAmt 		= spanGoodsCpnDcAmt 	+ cnclRtnCompleteList[i].goodsCpnDcAmt;
-		//	spanCartCpnDcAmt 		= spanCartCpnDcAmt 		+ cnclRtnCompleteList[i].cartCpnDcAmt;
-		//	spanTmtb1DcAmt 			= spanTmtb1DcAmt 		+ cnclRtnCompleteList[i].tmtb1DcAmt;
-		//	spanTmtb2DcAmt 			= spanTmtb2DcAmt 		+ cnclRtnCompleteList[i].tmtb2DcAmt;
-		//	spanGfcdUseAmt 			= spanGfcdUseAmt 		+ cnclRtnCompleteList[i].gfcdUseAmt;
-		//	spanRealCnclRtnAmt 		= spanRealCnclRtnAmt 	+ cnclRtnCompleteList[i].realOrdAmt;
-		//	spanSavePntAmt			= spanSavePntAmt		+ cnclRtnCompleteList[i].savePntAmt;
-		//}
-		
 		var spanCnclRtnAmt 		= cnclRtnCompleteList[0].rfCnclAmt;			// 취소상품금액
 		var spanPntDcAmt		= cnclRtnCompleteList[0].rfPntAmt;			// 환불 포인트 사용 금액
 		var spanPrePntDcAmt		= cnclRtnCompleteList[0].rfPrePntAmt;		// 환불 선포인트 사용 금액
@@ -553,7 +471,11 @@ $(document).ready(function() {
 		
 		if (pgGb == 'KCP') {
 			pgGbNm	= payMeansNm;
-			cardGbNm	= "(" + cardNm + ")";
+			
+			// 2021.12.23 휴대전화일때 공백처리
+			if (payMeans !== "G014_60") {
+				cardGbNm	= "(" + cardNm + ")";
+			}
 		} else if (pgGb == 'NAVER') {
 			pgGbNm	= "네이버페이";
 		} else if (pgGb == 'NAVER_ORDER') {
@@ -571,28 +493,6 @@ $(document).ready(function() {
 		$(".pgGbNm").text(pgGbNm);
 		$(".cardNm").text(cardGbNm);
 		
-		/*
-		$("#spanOrdAmt").text(spanOrdAmt.addComma());
-		$("#spanCnclRtnAmt").text(spanCnclRtnAmt.addComma());
-		$("#spanTotPntDcAmt").text(spanTotPntDcAmt.addComma());
-		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
-		$("#spanPrePntDcAmt").text(spanPrePntDcAmt.addComma());
-		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
-		$("#spanCpn1DcAmt").text(spanCpn1DcAmt.addComma());
-		$("#spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma());
-		$("#spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma());
-		$("#spanDelvCpnDcAmt").text(delvCpnDcAmt.addComma());
-		$("#spanCpnDcAmt").text(spanCpnDcAmt.addComma());
-		$("#spanTmtb1DcAmt").text(spanTmtb1DcAmt.addComma());
-		$("#spanTmtb2DcAmt").text(spanTmtb2DcAmt.addComma());
-		$("#spanTmtbDcAmt").text(spanTmtbDcAmt.addComma());
-		$("#spanGfcdUseAmt").text(spanGfcdUseAmt.addComma());
-		$("#spanRealCnclRtnAmt").text(spanRealCnclRtnAmt.addComma());
-		$("#spanRealDelvAmt").text(realDelvAmt.addComma());
-		$("#spanTotDeliveryFee").text(addPayCost.addComma());
-		$("#spanRefundAmt").text(spanRefundAmt.addComma());
-		*/
-		
 		// 2021.05.13 높이자동조절
 		var cancelRequestTargetHeight = 50 + (40 * cnclRtnCompleteList.length);
 		$("#gridCnclRtnCompleteList").css("height" , cancelRequestTargetHeight+"px");
@@ -601,17 +501,34 @@ $(document).ready(function() {
 	}
 	
 	// 3. 무통장입금아닌경우 환불계좌 그리드 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
+	if (payMeans !== 'G014_20' && payMeans !== 'G014_60') {
+		$('#cancelRequestFrm .refundAccount').addClass("off");
 	} else {
 		// 2021.08.04 무통장입금전 취소이면 미노출
 		if (payStat == 'G016_10') {
-			$('#refundAccount').addClass("off");
-		} else {
-			$("#refundAccount .bankNm").text(raBankNm);
-			$("#refundAccount .bankCd").text(raBank);
-			$("#refundAccount .accountNo").text(raNo);
-			$("#refundAccount .accountNm").text(raNm);
+			$('#cancelRequestFrm .refundAccount').addClass("off");
+		}
+		else {
+			if (raBankNm == null) {
+				raBankNm = "";
+			}
+			
+			if (raBank == null) {
+				raBank = "";
+			}
+			
+			if (raNo == null) {
+				raNo = "";
+			}
+			
+			if (raNm == null) {
+				raNm = "";
+			}
+			
+			$("#cancelRequestFrm .refundAccount .bankNm").text(raBankNm);
+			$("#cancelRequestFrm .refundAccount .bankCd").text(raBank);
+			$("#cancelRequestFrm .refundAccount .accountNo").text(raNo);
+			$("#cancelRequestFrm .refundAccount .accountNm").text(raNm);
 		}
 	}
 	

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -235,9 +235,9 @@
 					</tbody>
 				</table>
 				
-				<div id="refundAccount" style="width:100%">
+				<div class="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
-					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
+					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">환불계좌체크</button>
 					
 					<!-- TABLE -->
 					<table class="tableStyle">
@@ -319,13 +319,13 @@ var columnCancelReqList = [
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품타입"		, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center',
+	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	,
 		cellRenderer: function (params) {
 			var option;
 			if (params.data.goodsType == 'G056_S') {
 				option = "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailItemForm('" + params.data.ordDtlNo + "');\">" + params.value + "</a>";
 			} else {
-				option = params.value
+				option = params.value;
 			}
 			return option;
 		},
@@ -1063,7 +1063,11 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			if (pgGb == 'KCP') {
 				pgGbNm	= payMeansNm;
-				cardGbNm	= "(" + cardNm + ")";
+				
+				// 2021.12.23 휴대전화일때 공백처리
+				if (payMeans !== "G014_60") {
+					cardGbNm	= "(" + cardNm + ")";
+				}
 			} else if (pgGb == 'NAVER') {
 				pgGbNm	= "네이버페이";
 			} else if (pgGb == 'NAVER_ORDER') {
@@ -1136,60 +1140,6 @@ var fnCalculateRefundAmt = function (obj) {
 			$(".spanGfcdUseAmt").text(spanTotGfcdUseAmt.addComma()+"원");					// 상품권환불
 			$(".spanPntDcAmt").text(spanPntDcAmt.addComma()+"원");							// 포인트환불
 			$(".spanSavePntAmt").text(spanSavePntAmt.addComma()+"P");						// 포인트환불 > 적립예정포인트환수
-
-			/*
-			// 2021.08.10 card007 상품권100% 결제 로직 수정 기존 소스 백업
-			// 2021.07.01 배송비 수정(마지막취소에만 배송비 환불)
-			let spanSumDeliveryFee 	= result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
-			let sumDeliveryFee 		= result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
-
-			// 2021.08.04 취소금액수정
-			var spanRealDelvAmt		= 0;
-			var addDelvFee			= 0;
-
-			if (result.spanRealCnclRtnAmt > 0) {
-				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
-				if (isCustomer) {
-					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee) - result.spanTotDeliveryFee;
-
-					// 2021.07.01 
-					// @ 마이너스금액이면 허들깨지면서 배송비 발생
-					// @ 플러스금액이면 마지막취소시 배송금액 환불
-					spanRealDelvAmt = sumDeliveryFee - result.spanTotDeliveryFee;
-					addDelvFee		= result.spanTotDeliveryFee;
-				} 
-				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
-				else {
-					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee);
-				}
-			}
-			
-			$(".spanCnclRtnAmt").text(result.spanCnclRtnAmt.addComma()+"원");
-			$(".spanCpn1DcAmt").text(result.spanCpn1DcAmt.addComma()+"원");
-			$(".spanGoodsCpnDcAmt").text(result.spanGoodsCpnDcAmt.addComma()+"원");
-			$(".spanCartCpnDcAmt").text(result.spanCartCpnDcAmt.addComma()+"원");
-
-			var spanCpnDcAmt = result.spanCpn1DcAmt + result.spanGoodsCpnDcAmt + result.spanGoodsCpnDcAmt;
-			$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");
-
-			$(".spanPrePntDcAmt").text(result.spanPrePntDcAmt.addComma()+"원");
-			$(".spanTmtbDcAmt").text(result.spanTmtbDcAmt.addComma()+"원");
-
-			var goodsDcSumAmt = result.spanPrePntDcAmt + result.spanTmtbDcAmt;
-			$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");
-
-			$(".delvCpnAmt").text(result.spanDelvCpnDcAmt.addComma()+"원");
-			$(".addDelvFee").text(addDelvFee.addComma()+"원");
-			$(".spanRealDelvAmt").text(spanSumDeliveryFee.addComma()+"원");
-
-			var totalRefundAmt = result.spanRefundAmt + result.spanGfcdUseAmt + result.spanPntDcAmt;
-
-			$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");
-			$(".spanRefundAmt").text(result.spanRefundAmt.addComma()+"원");
-			$(".spanGfcdUseAmt").text(result.spanGfcdUseAmt.addComma()+"원");
-			$(".spanPntDcAmt").text(result.spanPntDcAmt.addComma()+"원");
-			$(".spanSavePntAmt").text(result.spanSavePntAmt.addComma()+"P");
-			*/
 		}
 	);
 }
@@ -1284,16 +1234,16 @@ var fnCnclReq = function (reqGbn) {
 		
 		// 3. 환불계좌체크 (결제타입이 무통장 입금일때 사용)
 		if (payMeans == 'G014_20' && payStat == 'G016_30') {
-			if ($("#refundAccount .bankNm").eq(0).text() == null || $("#refundAccount .bankNm").eq(0).text() == '') {
+			if ($("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == null || $("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == '') {
 				mcxDialog.alert('환불계좌가 미등록 되어 있습니다.');
 				return false;
 			} else {
 				chk = true;
 			}
 
-			accountNo 	= $("#refundAccount .accountNo").eq(0).text();
-			accountNm 	= $("#refundAccount .accountNm").eq(0).text();
-			bankCd 		= $("#refundAccount .bankCd").eq(0).text();
+			accountNo 	= $("#cancelRequestFrm .refundAccount .accountNo").eq(0).text();
+			accountNm 	= $("#cancelRequestFrm .refundAccountt .accountNm").eq(0).text();
+			bankCd 		= $("#cancelRequestFrm .refundAccount .bankCd").eq(0).text();
 		}
 	}
 	
@@ -1452,14 +1402,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {	
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
 // 환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1469,11 +1420,11 @@ var fnBindOrderRfAccountInfo = function () {
 		, jsonData
 		, function (result) {
 			if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
-				$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
-				$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
-				$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
-				$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
-				$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+				$("#cancelRequestFrm .refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
+				$("#cancelRequestFrm .refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
+				$("#cancelRequestFrm .refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
+				$("#cancelRequestFrm .refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
+				$("#cancelRequestFrm .refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
 			}
 		}
 	);
@@ -1506,15 +1457,15 @@ $(document).ready(function() {
 	// 3. 환불예상금액계산
 	fnCalculateRefundAmt(null);
 	
-	// 4. 무통장입금아닌경우 환불계좌 그리드 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
+	// 4. 무통장입금아닌경우 환불계좌 그리드 숨김처리 (2021.12.23 휴대폰추가)
+	if (payMeans !== 'G014_20' && payMeans !== 'G014_60') {
+		$('#cancelRequestFrm .refundAccount').addClass("off");
 	} else {
 		fnBindOrderRfAccountInfo();
 	}
 
 	// 네이버페이 주문형일 경우 취소 접수, 완료 버튼 hide
-	if(pgGb == "NAVER_ORDER") {
+	if (pgGb == "NAVER_ORDER") {
 		$("#cnclReqBtn").css("display", "none");
 		$("#cnclCompleteBtn").css("display", "none");
 	}

src/main/webapp/WEB-INF/views/order/CnclReqFormBack.html

@@ -1448,14 +1448,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {	
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
 // 환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);

src/main/webapp/WEB-INF/views/order/RefundAccountRegistForm.html

@@ -63,6 +63,7 @@
 var orderInfoList 			= [[${orderInfoList}]];							// 주문기본정보
 var ordNo 					= orderInfoList[0].ordNo;
 var custNo 					= orderInfoList[0].custNo;
+var ordChgSq 				= [[${ordChgSq}]];								// 주문변경번호
 
 /* 환불계좌번호 저장 */
 var fnSaveAccount = function(){
@@ -101,29 +102,26 @@ var fnSaveAccount = function(){
 			data.bankCd 		= bankCd;
 			data.accountNo 		= accountNo;
 			data.accountNm 		= accountNm;
+			data.ordChgSq		= ordChgSq;
 
 			var jsonData = JSON.stringify(data);
 
 			gagajf.ajaxJsonSubmit('/orderChange/account/save', jsonData, function(result){
 				uifnPopupClose('popupCreateRefundAccount');
 				
-				if (custNo > 0) {
-					fnBindOrderRfAccountInfo();
-				} else {
-					$("#refundAccount .accountNo").eq(0).text(accountNo);
-					$("#refundAccount .accountNm").eq(0).text(accountNm);
-					$("#refundAccount .bankCd").eq(0).text(bankCd);
-					$("#refundAccount .bankNm").eq(0).text(bankNm);
-					$("#refundAccount .defaultYn").eq(0).text("N");
-				}
-				
+				// 2021.12.27 수정
+				$("#cancelRequestFrm .refundAccount .accountNo").eq(0).text(accountNo);
+				$("#cancelRequestFrm .refundAccount .accountNm").eq(0).text(accountNm);
+				$("#cancelRequestFrm .refundAccount .bankCd").eq(0).text(bankCd);
+				$("#cancelRequestFrm .refundAccount .bankNm").eq(0).text(bankNm);
+				$("#cancelRequestFrm .refundAccount .defaultYn").eq(0).text("N");
 			});
 		}
 	});
 };
 
 $(document).ready(function() {
-
+	
 });
 
 /*]]>*/

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -229,7 +229,7 @@
 				</div>
 				<!--  //회수지정보 -->
 				
-				<div id="refundAccount" style="width:100%">
+				<div class="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
 					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
 					
@@ -1103,7 +1103,11 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			if (pgGb == 'KCP') {
 				pgGbNm	= payMeansNm;
-				cardGbNm	= "(" + cardNm + ")";
+				
+				// 2021.12.23 휴대전화일때 공백처리
+				if (payMeans !== "G014_60") {
+					cardGbNm	= "(" + cardNm + ")";
+				}
 			} else if (pgGb == 'NAVER') {
 				pgGbNm	= "네이버페이";
 			} else if (pgGb == 'NAVER_ORDER') {
@@ -1414,16 +1418,16 @@ var fnCnclReq = function (reqGbn) {
 		
 		// 3. 환불계좌체크 (결제타입이 무통장 입금일때 사용)
 		if (payMeans == 'G014_20' && payStat == 'G016_30') {
-			if ($("#refundAccount .bankNm").eq(0).text() == null || $("#refundAccount .bankNm").eq(0).text() == '') {
+			if ($("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == null || $("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == '') {
 				mcxDialog.alert('환불계좌가 미등록 되어 있습니다.');
 				return false;
 			} else {
 				chk = true
 			}
 			
-			accountNo 	= $("#refundAccount .accountNo").eq(0).text();
-			accountNm 	= $("#refundAccount .accountNm").eq(0).text();
-			bankCd 		= $("#refundAccount .bankCd").eq(0).text();
+			accountNo 	= $("#cancelRequestFrm .refundAccount .accountNo").eq(0).text();
+			accountNm 	= $("#cancelRequestFrm .refundAccount .accountNm").eq(0).text();
+			bankCd 		= $("#cancelRequestFrm .refundAccount .bankCd").eq(0).text();
 		}
 		
 		// 4. 회수지정보설정 (회수요청일때실행)
@@ -1590,14 +1594,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
-//환불계좌 정보
+// 환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1607,11 +1612,11 @@ var fnBindOrderRfAccountInfo = function () {
 		, jsonData
 		, function (result) {
 			if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
-				$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
-				$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
-				$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
-				$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
-				$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+				$("#cancelRequestFrm .refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
+				$("#cancelRequestFrm .refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
+				$("#cancelRequestFrm .refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
+				$("#cancelRequestFrm .refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
+				$("#cancelRequestFrm .refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
 			}
 		}
 	);
@@ -1848,8 +1853,8 @@ $(document).ready(function() {
 	}
 	
 	// 3. 무통장입금아닐때 환불계좌 목록 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
+	if (payMeans !== 'G014_20'&& payMeans !== 'G014_60') {
+		$('#cancelRequestFrm .refundAccount').addClass("off");
 	} else {
 		fnBindOrderRfAccountInfo();
 	}

src/main/webapp/WEB-INF/views/order/ScmCnclCompleteView.html

@@ -513,7 +513,11 @@ $(document).ready(function() {
 		
 		if (pgGb == 'KCP') {
 			pgGbNm	= payMeansNm;
-			cardGbNm	= "(" + cardNm + ")";
+			
+			// 2021.12.23 휴대전화일때 공백처리
+			if (payMeans !== "G014_60") {
+				cardGbNm	= "(" + cardNm + ")";
+			}
 		} else if (pgGb == 'NAVER') {
 			pgGbNm	= "네이버페이";
 		} else if (pgGb == 'NAVER_ORDER') {

src/main/webapp/WEB-INF/views/order/ScmRtnReqForm.html

@@ -1137,7 +1137,11 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			if (pgGb == 'KCP') {
 				pgGbNm	= payMeansNm;
-				cardGbNm	= "(" + cardNm + ")";
+				
+				// 2021.12.23 휴대전화일때 공백처리
+				if (payMeans !== "G014_60") {
+					cardGbNm	= "(" + cardNm + ")";
+				}
 			} else if (pgGb == 'NAVER') {
 				pgGbNm	= "네이버페이";
 			} else if (pgGb == 'NAVER_ORDER') {
@@ -1469,14 +1473,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
 //환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1485,12 +1490,14 @@ var fnBindOrderRfAccountInfo = function () {
 		'/orderChange/refund/account/info/list'
 		, jsonData
 		, function (result) {
-			if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
-				$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
-				$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
-				$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
-				$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
-				$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+			if (result.orderRfAccountInf != null) {
+				if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
+					$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
+					$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
+					$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
+					$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
+					$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+				}
 			}
 		}
 	);

src/main/webapp/WEB-INF/views/statistics/CouponTradingForm.html

@@ -58,6 +58,7 @@
 				<input name="startDt">
 				<input name="endDt">
 				<input name="cpnId">
+				<input name="cpnType">
 			</form>
 		</div>
 		<!-- 검색조건 영역 -->
@@ -177,6 +178,9 @@
 			$("#detailSearchForm input[name=startDt]").val($("#searchForm input[name=startDt]").val());
 			$("#detailSearchForm input[name=endDt]").val($("#searchForm input[name=endDt]").val());
 			$("#detailSearchForm input[name=cpnId]").val(params.cpnId);
+			$("#detailSearchForm input[name=cpnType]").val(params.cpnType);
+			console.log(params.cpnId);
+			console.log(params.cpnType);
 			$("#couponNmTxt").text(params.cpnNm);
 			gagaAgGrid.fetch($('#detailSearchForm').prop('action'), detailGridOptions, '#detailSearchForm', fnDetailCreateTotal);
 		}

src/main/webapp/WEB-INF/views/statistics/DailyOrderForm.html

@@ -91,7 +91,7 @@
 							<input type="text" class="w100" name="itemkindCdSearchTxt" id="itemkindCdSearchTxt" maxlength="20" />
 							<button type="button" class="btn icn" onclick="cfnOpenItemkindListPopup('fnSetItemkindInfo', 'M');"><i class="fa fa-search"></i></button>
 							<span id="itemkindCdTxt"></span>
-							<input type="hidden" name="itemkindList"/>
+							<input type="hidden" name="itemkindCdList"/>
 						</td>
 					</tr>
 				</table>