tsit05 4 éve
szülő
commit
930e3814d0

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

@@ -225,11 +225,11 @@
 							, O.CUST_NO 
 							, CASE WHEN A.PAY_GB = 'NAVER' THEN 'Y' ELSE 'N' END AS PAY_GB  
 							, A.ORDER_EXCEPTION_NO 
-							, ''   AS CHG_STAT
-							, NULL AS ORD_CHG_SQ 
-							, ''   AS WD_GB 
-							, NULL AS CHG_REASON
-							, NULL AS CHG_GB 
+							, NULL   AS CHG_STAT
+							, NULL   AS ORD_CHG_SQ 
+							, NULL   AS WD_GB 
+							, NULL   AS CHG_REASON
+							, NULL   AS CHG_GB 
 						  FROM TB_ORDER_RECALL_EXCEPTION A 
 						  JOIN TB_ORDER_RECALL_EXCEPTION_ITEM B ON A.RECALL_EXCEPTION_NO = B.RECALL_EXCEPTION_NO
 						  LEFT JOIN TB_ORDER O ON O.ORD_NO = A.ORDER_NO 

+ 10 - 1
src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -232,7 +232,16 @@
 				cellRenderer: function(params) {
 					var btnText = '';
 					if(params.data.recallStat === 'P' && params.data.chgStat != null) {
-						btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';
+						if(params.data.reasonCode == '02'){ // 미착 
+							if(params.data.chgGb == 'G680_30'){
+								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">반품변경</a>';
+							}else if(params.data.chgGb == 'G680_40'){
+								btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">교환변경</a>';
+							}
+						} else {
+							btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">사유변경</a>';	
+						}
+						
 					} else if(params.data.recallStat === 'P' && params.data.chgStat == null){
 						btnText= '<a href="javascript:void(0);"  class="btn btn-success btn-ssm">반품요청</a>';
 					} else { btnText = '' }