فهرست منبع

취소,반품,교환,환불컨펌 알림톡 메세지 미발송 체크박스 개발

jsh77b 4 سال پیش
والد
کامیت
2509510b82

+ 23 - 1
src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -347,9 +347,14 @@ public class TsaOrderChangeController extends TsaBaseController {
 			coreOrderChangeService.addPayCostCncl(cnclReq);
 		}
 		
+		// 2021.10.13 알림톡 메세지 알림톡, 메일 송부 X
+		if ("Y".equals(cnclReq.getMsgStat())) {
+			return super.ok("성공");
+		}
+		
 		// 5. 취소 알림톡 및 메일 발송
 		int ordChgSq = result.getInt("ordChgSq");
-
+		
 		if (ordChgSq > 0) {
 			Payment payment = new Payment();
 			payment.setOrdNo(cnclReq.getOrdNo());
@@ -612,6 +617,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 4. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
 		GagaMap result = coreOrderChangeService.returnRequest(map);
 		int ordChgSq = result.getInt("ordChgSq");
+		
+		// 2021.10.13 알림톡 메세지 알림톡, 메일 송부 X
+		if ("Y".equals(rtnReq.getMsgStat())) {
+			return super.ok(message.getMessage("RETURN_0001"));
+		}
 
 		if (ordChgSq > 0) {
 			String pgGb = refundPreInfo.getString("pgGb");
@@ -930,6 +940,18 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		// 교환처리
 		result = coreOrderChangeService.exchReq(excReq);
+		
+		// 2021.10.13 알림톡 메세지 알림톡, 메일 송부 X
+		if ("Y".equals(excReq.getMsgStat())) {
+			// 처리 결과 코드에 따른 메세지 설정
+			if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
+				result.set("message", message.getMessage("EXCHANGE_0001"));
+			} else {
+				result.set("message", message.getMessage("FAIL_0004"));
+			}
+			return result;
+		}
+		
 		int ordChgSq = result.getInt("ordChgSq");
 
 		if (ordChgSq > 0) {

+ 5 - 0
src/main/java/com/style24/admin/biz/web/TsaWithdrawController.java

@@ -218,6 +218,11 @@ public class TsaWithdrawController extends TsaBaseController {
 		order.setRefundAmt(refundInfo.getRefundAmt());
 		order.setGoodsCnt(refundInfo.getGoodsCnt()+"");
 		order.setGoodsNm(refundInfo.getGoodsNm());
+		
+		// 2021.10.13 알림톡 메세지 알림톡, 메일 송부 X
+		if ("Y".equals(orderChange.getString("msgStat"))) {
+			return super.ok(message.getMessage("SUCC_0004"));
+		}
 
 		try {
 			kakaotalkService.sendRefundComplete(order, userNo);

+ 1 - 2
src/main/webapp/WEB-INF/views/delivery/ExchangeDelvFailListForm.html

@@ -195,8 +195,7 @@ var fnCancelRequest = function (paramData, ordChgSq) {
 	param += "&chgStat="		+ 'NOT';
 	
 	var actionUrl = "/orderChange/cncl/req/form?" + param;
-	
-	alert(paramArr[4]);
+
 	// 2021.08.31 품절취소 완료 일때 
 	if (paramArr[4] == "Y") {
 		actionUrl = "/orderChange/cnclRtn/complete/view?" + param;	

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

@@ -128,7 +128,9 @@
 								</select>
 							</td>
 							<th>귀책사유</th>
-							<td><span id="imputeReason"></span></td>
+							<td colspan="5"><span id="imputeReason"></span></td>
+						</tr>
+						<tr>
 							<th>PG점프</th>
 							<td>
 								<label class="chkBox">
@@ -139,6 +141,12 @@
 							<td>
 								<input type="text" name="depositAmt" id="depositAmt" value="0" readonly="readonly"/>
 							</td>
+							<th>알림톡미전송여부</th>
+							<td colspan="3">
+								<label class="chkBox">
+									<input type="checkbox" name="msgStat" id="msgStat" checked/>
+								</label>
+							</td>
 						</tr>
 						<tr>
 							<th>요청메모<br/><span id="dpLocAnsContent">0</span>/1,000Byte</th>
@@ -356,7 +364,7 @@ var columnCancelReqList = [
 	{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
@@ -1357,6 +1365,7 @@ var fnCnclReq = function (reqGbn) {
 		,"wdGb"						: wdGb
 		,"addPayCost"				: addPayCost
 		,"pgStat"					: $('#pgStat').is(':checked') ? 'Y' : 'N'
+		,"msgStat"					: $('#msgStat').is(':checked') ? 'Y' : 'N'
 		,"depositAmt"				: depositAmt
 	}
 

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

@@ -89,7 +89,13 @@
 								<label class="rdoBtn"><input type="radio" name="wdGb" th:id="wdGb" value="D" onclick="fnChangeWdGb(this)"/>직접발송<span></span></label>
 							</td>
 							<th>추가배송비</th>
-							<td id="addDelvFee" colspan="3"></td>
+							<td id="addDelvFee"></td>
+							<th>알림톡미전송여부</th>
+							<td>
+								<label class="chkBox">
+									<input type="checkbox" name="msgStat" id="msgStat" checked/>
+								</label>
+							</td>
 						</tr>
 						<tr>
 							<th>요청메모<br/><span id="chgMemoCount">0</span>/1,000Byte</th>
@@ -878,6 +884,7 @@ var fnExchange = function () {
 		,"ordChgSq"			: ordChgSq
 		,"wdBfSendYn"		: wdBfSendYn
 		,"ordChgGb"			: ordChgGb
+		,"msgStat"			: $('#msgStat').is(':checked') ? 'Y' : 'N'
 	}
 
 	// 주문번호, 교환사유, 교환메모, (취소, 반품, 교환 신청 정보 목록)

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

@@ -76,6 +76,14 @@
 							<th>귀책사유</th>
 							<td><span id="imputeReason"></span></td>
 						</tr>
+						<tr>
+							<th>알림톡미전송여부</th>
+							<td colspan="5">
+								<label class="chkBox">
+									<input type="checkbox" name="msgStat" id="msgStat" checked/>
+								</label>
+							</td>
+						</tr>
 						<tr>
 							<th>요청메모<br/><span id="chgMemoCount">0</span>/1,000Byte</th>
 							<td colspan="5">
@@ -1508,6 +1516,7 @@ var fnCnclReq = function (reqGbn) {
 		,"custNo"					: custNo
 		,"ordNm"					: ordNm
 		,"ordPhnno"					: ordPhnno
+		,"msgStat"					: $('#msgStat').is(':checked') ? 'Y' : 'N'
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌

+ 17 - 5
src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -72,9 +72,23 @@
 						<td>
 							<input type="text" name="addPayCost" data-valid-type="integer" readonly="readonly" onChange="fnChangeAmt()" class="w100 aR"/>원
 						</td>
-						<th>입금액<br/>* 별도 고객 임금처리 했을 시 입력</th>
+						<th>알림톡미전송여부</th>
 						<td>
-							<input type="text" name="depositAmt" data-valid-type="integer" readonly="readonly" class="w100 aR" />원
+							<label class="chkBox">
+								<input type="checkbox" name="msgStat" id="msgStat" checked/>
+							</label>
+						</td>
+					</tr>
+					<tr>
+						<th>PG점프</th>
+						<td>
+							<label class="chkBox" onclick="fnChangePgStat();">
+								<input type="checkbox" name="pgStats" id="pgStats"/>
+							</label>
+						</td>
+						<th>입금액</th>
+						<td>
+							<input type="text" name="depositAmt" id="depositAmt" data-valid-type="integer" readonly="readonly" class="w100 aR" />원
 						</td>
 					</tr>
 					<tr>
@@ -245,9 +259,6 @@
 				
 				<div>
 					<h4 style="width:85%;">회수대상 상품 정보</h4>	
-					<span class="btnRight" id="pgBtn" onclick="fnChangePgStat()">
-						<label ><input type="checkbox" name="pgStats" value="N" th:if="${sessionInfo.roleCd == 'G001_0000' or sessionInfo.roleCd == 'G001_A300'}">&nbsp;&nbsp;PG 전문 미전송</label>
-					</span>
 					<div id="refundGridList" style="width: 100%; height: 200px; padding-top:10PX;" class="ag-theme-balham"></div>
 				</div>
 			</form>
@@ -784,6 +795,7 @@
 		reFundInfo.enCloseFeeYn		= enCloseFeeYn;
 		reFundInfo.enCloseFee		= enCloseFeeAmt;
 		reFundInfo.depositAmt		= depositAmt;
+		reFundInfo.msgStat			= $('#msgStat').is(':checked') ? 'Y' : 'N';
 		
 		var jsonData = JSON.stringify(reFundInfo);