소스 검색

1. 주문 임시 커밋

card007 5 년 전
부모
커밋
72e393a9ac

+ 7 - 2
src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -490,9 +490,14 @@ public class TsaOrderChangeController extends TsaBaseController {
 			return result;
 		}
 
+		// 세션 회원번호 설정
+		int userNo = TsaSession.getInfo().getUserNo();
+		excReq.setUpdNo(userNo);
+		excReq.setRegNo(userNo);
+
 		log.info("excReq >>> {}", excReq);
-		// orderChangeService.changeRequest()
-		// result.set("status", GagaResponseStatus.SUCCESS.getCode());
+
+		result = coreOrderChangeService.exchReq(excReq);
 
 		return result;
 	}

+ 7 - 7
src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -613,7 +613,7 @@
 		     , Z.RECIP_NM
 		     , Z.RECIP_PHNNO
 		     , Z.RECIP_TELNO
-		     , Z.RECIP_ZIP_NO
+		     , Z.RECIP_ZIPCODE
 		     , Z.RECIP_BASE_ADDR
 		     , Z.RECIP_DTL_ADDR
 		     , Z.ORD_EMAIL
@@ -632,7 +632,7 @@
 			     , DA.RECIP_NM 
 			     , DA.RECIP_PHNNO 
 			     , DA.RECIP_TELNO 
-			     , DA.RECIP_ZIP_NO 
+			     , DA.RECIP_ZIPCODE 
 			     , DA.RECIP_BASE_ADDR
 			     , DA.RECIP_DTL_ADDR
 			     , O.ORD_EMAIL
@@ -720,7 +720,7 @@
 		     , OC.CHG_MEMO
 		     , OC.CHGER_NM
 		     , OC.CHGER_PHNNO 
-		     , OC.CHGER_ZIP_NO
+		     , OC.CHGER_ZIPCODE
 		     , OC.CHGER_BASE_ADDR
 		     , OC.CHGER_DTL_ADDR
 		     , OC.WD_INVOICE_SEND_YN
@@ -831,7 +831,7 @@
 		     , O.ORD_PHNNO 
 		     , DA.RECIP_NM 
 		     , DA.RECIP_PHNNO 
-		     , DA.RECIP_ZIP_NO 
+		     , DA.RECIP_ZIPCODE 
 		     , DA.RECIP_BASE_ADDR 
 		     , DA.RECIP_DTL_ADDR 
 		     , G2.SUPPLY_GOODS_CD
@@ -1115,7 +1115,7 @@
 		     , O.ORD_PHNNO 
 		     , DA.RECIP_NM 
 		     , DA.RECIP_PHNNO 
-		     , DA.RECIP_ZIP_NO 
+		     , DA.RECIP_ZIPCODE 
 		     , DA.RECIP_BASE_ADDR 
 		     , DA.RECIP_DTL_ADDR 
 		     , G2.SUPPLY_GOODS_CD
@@ -1545,7 +1545,7 @@
 		SET    RECIP_NM        	= #{recipNm}
 		     , RECIP_PHNNO     	= #{recipPhnno}
 		     , RECIP_TELNO     	= #{recipTelno}
-		     , RECIP_ZIP_NO    	= #{recipZipNo}
+		     , RECIP_ZIPCODE	= #{recipZipNo}
 		     , RECIP_BASE_ADDR 	= #{recipBaseAddr}
 		     , RECIP_DTL_ADDR  	= #{recipDtlAddr}
 		     , DELV_MEMO       	= #{delvMemo}
@@ -1558,7 +1558,7 @@
 	<update id="updateOrderChange" parameterType="Order">
 		/* order.updateOrderChange : 반품/교환 > 회수지 정보 수정 */
 		UPDATE TB_ORDER_CHANGE
-		SET    CHGER_ZIP_NO    	= #{chgerZipNo}
+		SET    CHGER_ZIPCODE	= #{chgerZipNo}
 		     , CHGER_BASE_ADDR 	= #{chgerBaseAddr}
 		     , CHGER_DTL_ADDR  	= #{chgerDtlAddr}
 		     , UPD_NO          	= #{updNo}

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsaOrderChange.xml

@@ -152,7 +152,7 @@
 			, CHGER_PHNNO
 			, CHGER_TELNO
 			, CHGER_EMAIL
-			, CHGER_ZIP_NO
+			, CHGER_ZIPCODE
 			, CHGER_BASE_ADDR
 			, CHGER_DTL_ADDR
 			, CHGER_RTN_MEMO

+ 2 - 2
src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -288,7 +288,7 @@ var columnExchangeReqList = [
 			{headerName: "재고수량"	, field: "currStockQty"			, width: 100			, cellClass: 'text-center', hide: temp2},
 			{
 				headerName		: "교환신청수량"
-				, field			: "ordCanChgQty"
+				, field			: "chgQty"
 				, width			: 100
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {
@@ -298,7 +298,7 @@ var columnExchangeReqList = [
 					var ordCanChgQty 	= ordQty - (cnclRtnQty +  ordReqChgQty);
 					
 					var strVal 			= "";
-					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="ordCanChgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
+					strVal += '<select class="ordCanChgQty ' + params.data.ordDtlNo + '" name="chgQty" ordDtlNo="'+params.data.ordDtlNo+'" onchange="fnChangeQty(this)">';
 					
 					for (i=0 ; i<=ordCanChgQty ; i++) {
 						if (i == params.data.ordCanChgQty) {