09.07 LMS 추가

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

@@ -527,6 +527,38 @@ public class TsaCustomerController extends TsaBaseController {
 
 		return mav;
 	}
+	
+	/**
+	 * 메시지 발송 팝업 화면
+	 *
+	 * @param elementCellPhnno - 휴대폰
+	 * @param elementCustNo - 고객일련번호
+	 * @param maskingCellPhnno - 마스킹된 휴대폰
+	 * @return ModelAndView
+	 * @author moon
+	 * @since 2021. 09. 07
+	 */
+	@GetMapping("/lms/popup/form2")
+	public ModelAndView lmsPopupForm2(@RequestParam(value = "elementCellPhnno", required = false) String elementCellPhnno, @RequestParam(value = "elementCustNo") String elementCustNo, @RequestParam(value = "elementMaskingCellPhnno", required = false) String maskingCellPhnno, @RequestParam(value = "pageGb", required = false) String pageGb) {
+		ModelAndView mav = new ModelAndView();
+		// 휴대폰 번호
+		mav.addObject("elementCellPhnno", elementCellPhnno);
+
+		// 휴대폰 번호
+		mav.addObject("maskingCellPhnno", StringUtils.defaultString(maskingCellPhnno, ""));
+
+		// 고객 아이디
+		mav.addObject("elementCustNo", elementCustNo);
+
+		mav.addObject("callBack", TscConstants.CALLCENTER_TEL_NO);
+
+		mav.addObject("pageGb", StringUtils.defaultString(pageGb, ""));
+
+		mav.setViewName("customer/LmsPopupForm2");
+
+		return mav;
+	}
+	
 
 	/**
 	 * 메시지 발송
@@ -573,6 +605,29 @@ public class TsaCustomerController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0005"));
 	}
+	
+	/**
+	 * 메시지 발송
+	 *
+	 * @param customer -고객정보
+	 * @return GagaResponse
+	 * @author moon
+	 * @since 2021. 09. 07
+	 */
+	@PostMapping("/message/send3")
+	@ResponseBody
+	public GagaResponse sendLms3(@RequestBody Customer customer) {
+		//Customer custInfo = customerService.getCustomerInfo(customer.getCustNo());
+		//customer.setCustNm(custInfo.getCustNm());
+		//customer.setCustNo(custInfo.getCustNo());
+		log.info("sendLms3 {}"+customer);
+		if (StringUtils.isNotBlank(customer.getCellPhnno())) {
+			Integer userNo = TsaSession.getInfo().getUserNo();
+			kakaotalkService.sendBasicLms3(customer, userNo);
+		}
+
+		return super.ok(message.getMessage("SUCC_0005"));
+	}	
 
 	/**
 	 * 메시지 발송 팝업 화면

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

@@ -507,7 +507,7 @@
 		     , CASE WHEN WD_SHIP_STATE = '12' THEN   FN_GET_CODE_NM('G321', Z.WD_REASON_CD)
 		            WHEN WD_SHIP_STATE = '84' THEN   FN_GET_CODE_NM('G322', Z.WD_REASON_CD) ELSE '' END AS WD_REASON_CD_NM
 		     , FN_GET_CODE_NM('G685', Z.CHG_STAT) AS CHG_STAT_NM
-		     , CASE WHEN Z.WD_GB = 'W' THEN '회수요청' ELSE '직접배송' END AS WD_GB_NM 
+		     , CASE WHEN Z.WD_GB = 'W' THEN '방문회수' ELSE '직접배송' END AS WD_GB_NM 
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORD_CHG_SQ, A.ORD_NO DESC, A.ORD_DTL_NO )  RNUM 
 		    FROM ( 

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -284,6 +284,11 @@
 		{headerName: "휴대번호", 		field: "maskingOrdPhnno", 		width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return params.data.maskingOrdPhnno; }
 		},
+		{headerName: "LMS", 			field: "maskingOrdPhnno", 	width: 80, cellClass: "text-center",
+			cellRenderer: function(params) {
+				return '<button type="button" class="btn btn-base btn-sm" onclick="fnLms(\'' + params.data.ordPhnno + '\',\'' + params.data.custNo + '\');">&nbsp;LMS&nbsp;</button>';
+			}			
+		},
 		{headerName: "수령인", 		field: "maskingRecipNm", 		width: 100, cellClass: 'text-center'},
 		{headerName: "공급업체", 		field: "supplyCompNm", 	width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드", 		field: "brandNm", 	width: 150, cellClass: 'text-center'},
@@ -481,6 +486,17 @@
 		cfnOpenModalPopup(actionUrl, 'popupDeliveryDetailItemForm');
 	}
 	
+	/*************************************************************************
+	*  LMS
+	**************************************************************************/	
+	var fnLms = function(chgerPhnno, custNo){
+		let param = {};
+		param.elementCellPhnno = chgerPhnno; 
+		param.elementCustNo =    custNo; 
+		param.pageGb = 'delv';
+		cfnOpenLmsPopup2(param);
+	}
+
 	
 	/*************************************************************************
 	* 엑셀다운로드 

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

@@ -81,7 +81,9 @@
 							</td>
 							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].ordEmail}"></td>
-							<td th:text="${orderInfo[0].ordPhnno}"></td>
+							<td>
+							<a href="script:void(0)" class="lmsPop" th:attr="orderPhnno=${orderInfo[0].ordPhnno}"><th:block th:text="${orderInfo[0].ordPhnno}"></th:block></a>
+							</td>
 							<td th:text="${orderInfo[0].custGbNm}"></td>
 							<td th:text="${orderInfo[0].managedRsnNm}"></td>
 							<td th:text="${orderInfo[0].custGradeNm}"></td>
@@ -1139,6 +1141,18 @@ $(document).ready(function () {
 			cfnOpenCustDetailPopup(custNo);
 		}
 	});
+	
+	// LMS
+	$(".lmsPop").on("click", function(){
+		//var custNo = $(this).attr("custNo");
+		var orderPhnno = $(this).attr("orderPhnno");
+		let param = {};
+		param.elementCellPhnno = orderPhnno; 
+		param.elementCustNo =    ""; 
+		param.pageGb = 'delv';
+		cfnOpenLmsPopup2(param);
+		
+	});	
 });
 
 //0원이하이면 '-' 처리 삭제 함수

src/main/webapp/WEB-INF/views/withdraw/WithdrawDirectiveListForm.html

@@ -65,8 +65,8 @@
 							<td>
 								<select name="chgGb"class="w100">
 									<option value="">&nbsp;전체&nbsp;</option>
-									<option value="G680_30"> 반품 </option>
-									<option value="G680_40"> 교환 </option>
+									<option value="G680_30"> 반품요청 </option>
+									<option value="G680_40"> 교환요청 </option>
 								</select>
 							</td>
 							<th>진행상태</th>
@@ -96,7 +96,7 @@
 									
 								</select>
 							</td>
-							<th>회수상태</th>
+							<th>CJ회수상태</th>
 							<td colspan="3">
 								<select name="wdShipState" class="w100">
 									<option value="">전체</option>
@@ -210,7 +210,7 @@
 				return retStr;
 			}			
 		},
-		{headerName: "회수상태", 		field: "wdShipStateNm", width: 120, cellClass: "text-center"},
+		{headerName: "CJ회수상태", 		field: "wdShipStateNm", width: 120, cellClass: "text-center"},
 		{headerName: "회수상태수신일시", field: "wdStateDt", 		width: 120, cellClass: "text-center"},
 		{headerName: "미회수사유", 		field: "wdReasonCdNm", 	width: 100, cellClass: "text-center"},
 		{headerName: "재회수지시", 		field: "wdShipState", 	width: 100,	cellClass: 'text-center',
@@ -425,10 +425,10 @@
 	**************************************************************************/	
 	var fnLms = function(chgerPhnno, custNo){
 		let param = {};
-		param.elementCellPhnno = chgerPhnno; //'010-4016-1558'; //'#custInfoForm input[name=cellPhnno]';
-		param.elementCustNo =    custNo; //'100025';// '#custInfoForm input[name=custNo]';
+		param.elementCellPhnno = chgerPhnno; 
+		param.elementCustNo =    custNo; 
 		param.pageGb = 'delv';
-		cfnOpenLmsPopup(param);
+		cfnOpenLmsPopup2(param);
 	}
 
 	/*************************************************************************

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

@@ -666,10 +666,10 @@
 	**************************************************************************/	
 	var fnLms = function(chgerPhnno, custNo){
 		let param = {};
-		param.elementCellPhnno = chgerPhnno; //'010-4016-1558'; //'#custInfoForm input[name=cellPhnno]';
-		param.elementCustNo =    custNo; //'100025';// '#custInfoForm input[name=custNo]';
+		param.elementCellPhnno = chgerPhnno; 
+		param.elementCustNo =    custNo; 
 		param.pageGb = 'delv';
-		cfnOpenLmsPopup(param);
+		cfnOpenLmsPopup2(param);
 	};
 	
 	/*************************************************************************

src/main/webapp/ux/js/admin.popup.js

@@ -468,6 +468,34 @@ var cfnOpenLmsPopup = function(param) {
 	cfnOpenModalPopup(actionUrl, 'popupLmsForm');
 }
 
+/**
+ * @type   : function
+ * @access : public
+ * @desc   : LMS 팝업
+ * <pre>
+ *     var param = {};
+ *     param.elementCellPhnno = 'input[name=cellPhnno]';
+ *     param.elementCustNo = 'input[name=custNo]';
+ *     param.elementMaskingCellPhnno = 'textarea[name=elementMaskingCellPhnno]'; //선택
+ *     paras.pageGb = 'delv'; // 선택
+ *     cfnOpenLmsPopup(param);
+ * </pre>
+ * @since  : 2020/02/13
+ * @author : jsshin
+ */
+var cfnOpenLmsPopup2 = function(param) {
+	var actionUrl = '/customer/lms/popup/form2?elementCellPhnno=' + encodeURIComponent(param.elementCellPhnno)
+			+ '&elementCustNo=' + encodeURIComponent(param.elementCustNo);
+	if (!gagajf.isNull(param.elementMaskingCellPhnno)) {
+		actionUrl +='&elementMaskingCellPhnno=' + encodeURIComponent(param.elementMaskingCellPhnno);
+	}
+	if (!gagajf.isNull(param.pageGb)) {
+		actionUrl +='&pageGb=' + param.pageGb;
+	}
+	cfnOpenModalPopup(actionUrl, 'popupLmsForm2');
+}
+
+
 /**
  * @type   : function
  * @access : public