샵링커

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

@@ -374,43 +374,53 @@ public class TsaOcmService {
 				orderDetail.setUploadFailReason(vdMap.getString("message"));
 				ocmDao.updateExtmallOrder(orderDetail);
 			}
-
 		}
 
 		// 8. 알림톡발송 (임시 히스토리 쌓음. 로컬,개발인경우만)
-		if( "locd".equals(env.getProperty("spring.profiles.active").toLowerCase()) || "tsit".equals(env.getProperty("spring.profiles.active").toLowerCase())){
-			// Y:제휴몰에서발송, N:자사몰에서발송
-			if( "N".equals(order.getCnclsmsSendYn())) {
-
-				ExtmallOrder testNoti = new ExtmallOrder();
-	    		testNoti.setExtmallId(order.getExtmallId());
-	    		testNoti.setExtmallOrderId(order.getExtmallOrderId());
-	    		if( "ALL_FAIL".equals(result.getString("sendNotiType"))) {
-	    			// 알림톡발송-전체실패
-	    			testNoti.setCnclAllSoldoutYn("Y");
-	    			testNoti.setSku("미할당 전체품절 > 실패 총 "+result.getString("failCnt")+"건 / 재고실패 "+result.getString("stockFailCnt")+"건 ("+result.getString("failGoods")+")");
-
-	    		}else if( "ALL_SUCCESS".equals(result.getString("sendNotiType"))) {
-	    			// 전체성공
-	    			testNoti.setSku("전체성공");
-	    		}else if( "PART_SUCCESS".equals(result.getString("sendNotiType"))) {
-
-	    			if( !"".equals(result.getString("failGoods"))) {
-	    				// 부분성공 알림톡발송
-	    				testNoti.setCnclAllSoldoutYn("N");
-		    			testNoti.setSku("부분결품 품절 > 실패 총 "+result.getString("failCnt")+"건 / 재고실패 "+result.getString("stockFailCnt")+"건 ("+result.getString("failGoods")+")");
-	    			}else {
-	    				// 전체성공
-		    			testNoti.setSku("성공 > 실패한건이 있지만, 재고로인한건이 아님.");
-	    			}
-
-	    		}else {
-	    			// "NOT" 알림톡 발송안함. 이미 발송한건
-	    			testNoti.setSku("알림톡 발송안함. 동일수집건 ");
-	    		}
-	    		ocmDao.insertTestNotiInfo(testNoti);
+		if( "N".equals(order.getCnclsmsSendYn())) {		// Y:제휴몰에서발송, N:자사몰에서발송
+
+			ExtmallOrder testNoti = new ExtmallOrder();
+			testNoti.setUploadGb(order.getUploadGb());
+			testNoti.setExtmallId(order.getExtmallId());
+    		testNoti.setExtmallNm(order.getExtmallNm());
+    		testNoti.setExtmallOrderId(order.getExtmallOrderId());
+    		String soldoutGoodsNm = "";
+
+    		if( "ALL_FAIL".equals(result.getString("sendNotiType"))) {
+    			// 알림톡발송-전체실패
+    			soldoutGoodsNm = result.getString("failGoods") + " (총 "+result.getString("stockFailCnt")+" 건)";
+    			testNoti.setCnclAllSoldoutYn("Y");
+    			testNoti.setSoldoutGoodsNm(soldoutGoodsNm);
+    			if("E".equals(order.getUploadGb())){
+    				//	kakaotalkService.sendShoplinkerOrder(testNoti, 0);
+    			}
+    			testNoti.setSku("미할당 전체품절 > 실패 총 "+result.getString("failCnt")+"건 / 재고실패 "+result.getString("stockFailCnt")+"건 ("+result.getString("failGoods")+")");
+
+    		}else if( "ALL_SUCCESS".equals(result.getString("sendNotiType"))) {
+    			// 전체성공
+    			testNoti.setSku("전체성공");
+    		}else if( "PART_SUCCESS".equals(result.getString("sendNotiType"))) {
+
+    			if( !"".equals(result.getString("failGoods"))) {
+    				// 부분성공 알림톡발송
+    				soldoutGoodsNm = result.getString("failGoods") + " (총 "+result.getString("stockFailCnt")+" 건)";
+    				testNoti.setCnclAllSoldoutYn("N");
+    				testNoti.setSoldoutGoodsNm(soldoutGoodsNm);
+    				if("E".equals(order.getUploadGb())){
+    					//	kakaotalkService.sendShoplinkerOrder(testNoti, 0);
+    				}
+	    			testNoti.setSku("부분결품 품절 > 실패 총 "+result.getString("failCnt")+"건 / 재고실패 "+result.getString("stockFailCnt")+"건 ("+result.getString("failGoods")+")");
+    			}else {
+    				// 전체성공
+	    			testNoti.setSku("성공 > 실패한건이 있지만, 재고로인한건이 아님.");
+    			}
+
+    		}else {
+    			// "NOT" 알림톡 발송안함. 이미 발송한건
+    			testNoti.setSku("알림톡 발송안함. 동일수집건 ");
+    		}
+    		// ocmDao.insertTestNotiInfo(testNoti);
 
-			}
 		}
     }
 
@@ -480,6 +490,8 @@ public class TsaOcmService {
                     if (ordDtl.getSupplyCompCd() != null && !ordDtl.getSupplyCompCd().isEmpty()) {
                     	ordGroup.setSupplyCompCd(ordDtl.getSupplyCompCd());					// 공급업체코드
                     }
+                    ordGroup.setExtmallNm(ordDtl.getExtmallNm());							// 제휴몰명
+                    ordGroup.setUploadGb(ordDtl.getUploadGb());								// 업로드타입
 
             		tmpList.add(ordDtl);
             		ordGroup.setOrderDetailList(tmpList);

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

@@ -1105,6 +1105,12 @@ public class TsaShoplinkerService {
 
 							//1. 샵링커 주문등록
 							try {
+								//*****  테스트 기간동안은 연락처 모두 가공   ************************//
+								slOrder.setOrderTel("011-0000-0000");
+								slOrder.setOrderCel("011-0000-0000");
+								slOrder.setReceiveTel("011-0000-0000");
+								slOrder.setReceiveCel("011-0000-0000");
+								//*****  테스트 기간동안은 연락처 모두 가공   ************************//
 
 								shoplinkerDao.insertShoplinkerOrder(slOrder);
 							}catch(Exception e) {
@@ -1184,6 +1190,12 @@ public class TsaShoplinkerService {
 
 							//1. 샵링커 주문등록
 							try {
+								//*****  테스트 기간동안은 연락처 모두 가공   ************************//
+								slOrder.setOrderTel("011-0000-0000");
+								slOrder.setOrderCel("011-0000-0000");
+								slOrder.setReceiveTel("011-0000-0000");
+								slOrder.setReceiveCel("011-0000-0000");
+								//*****  테스트 기간동안은 연락처 모두 가공   ************************//
 
 								shoplinkerDao.insertShoplinkerOrder(slOrder);
 							}catch(Exception e) {
@@ -1690,7 +1702,10 @@ public class TsaShoplinkerService {
 
 	// 테스트데이터
 	private String testOrderStr() {
-
+		// 성공 "<partner_product_id>NNW13QPM69</partner_product_id>\r\n"
+		//     "<sku_match_code><![CDATA[12112927-3]]></sku_match_code>\r\n"
+		// 실패 "<partner_product_id>MNM0NZNN40</partner_product_id>\r\n"
+		//    "<sku_match_code><![CDATA[10727258-2]]></sku_match_code>\r\n"
 		String bbb = "<?xml version=\"1.0\" encoding=\"euc-kr\"?>"
 				+ "<Shoplinker>\r\n"
 				+ "<header>\r\n"
@@ -1701,8 +1716,8 @@ public class TsaShoplinkerService {
 				+ "</header>\r\n"
 
 				+ "<order>\r\n"
-				+ "<shoplinker_order_id>1234-7</shoplinker_order_id>\r\n"
-				+ "<mall_order_id><![CDATA[1234-7]]></mall_order_id>\r\n"
+				+ "<shoplinker_order_id>1234-9</shoplinker_order_id>\r\n"
+				+ "<mall_order_id><![CDATA[1234-9]]></mall_order_id>\r\n"
 				+ "<mall_name><![CDATA[(주)현대홈쇼핑]]></mall_name>\r\n"
 				+ "<baesong_status><![CDATA[송장전송완료]]></baesong_status>\r\n"
 				+ "<order_name><![CDATA[조민혜]]></order_name>\r\n"
@@ -1719,7 +1734,7 @@ public class TsaShoplinkerService {
 				+ "<delivery_msg><![CDATA[조심조심]]></delivery_msg>\r\n"
 				+ "<order_product_id>2118602667</order_product_id>\r\n"
 				+ "<shoplinker_product_id>prd143809490</shoplinker_product_id>\r\n"
-				+ "<partner_product_id>NNW13QPM69</partner_product_id>\r\n"
+				+ "<partner_product_id>MNM0NZNN40</partner_product_id>\r\n"
 				+ "<product_name><![CDATA[[나이키 조던 키즈] 윙스MA-1 재킷B NNW13QPM69 (주니어)]]></product_name>\r\n"
 				+ "<quantity>1</quantity>\r\n"
 				+ "<order_price>47600</order_price>\r\n"
@@ -1739,7 +1754,7 @@ public class TsaShoplinkerService {
 				+ "<dis_price_coupon><![CDATA[]]></dis_price_coupon>\r\n"
 				+ "<dis_price_point><![CDATA[]]></dis_price_point>\r\n"
 				+ "<distribution_delivery><![CDATA[001]]></distribution_delivery>\r\n"
-				+ "<sku_match_code><![CDATA[12112927-3]]></sku_match_code>\r\n"
+				+ "<sku_match_code><![CDATA[10727258-2]]></sku_match_code>\r\n"
 				+ "<sku_barcode><![CDATA[]]></sku_barcode>\r\n"
 				+ "<order_main_key><![CDATA[]]></order_main_key>\r\n"
 				+ "<order_customs_number><![CDATA[]]></order_customs_number>\r\n"

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

@@ -69,8 +69,9 @@ public class ExtmallOrder extends TscBaseDomain {
 	private String supplyCompCd;		// 공급업체코드
 	private Integer totalOrdAmt;		// 총 주문금액
 	private Integer stockFailHstCnt;	// 주문업로드시 재고실패이력 cnt
-	private String cnclsmsSendYn; 		// 취소문자발송여부(Y:제휴몰에서발송, N:자사몰에서발송)
-	private String cnclAllSoldoutYn; 	// 전체품절취소여부
+	private String cnclsmsSendYn; 		// 알림톡-취소문자발송여부(Y:제휴몰에서발송, N:자사몰에서발송)
+	private String cnclAllSoldoutYn; 	// 알림톡-전체품절취소여부
+	private String soldoutGoodsNm;		// 알림톡-품절상품내용
 
 	private String stDate;
 	private String edDate;

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

@@ -214,7 +214,7 @@
 			, B.DELV_FEE_CD -- 배송비정책코드
 			, A.VENDOR_ID
 			, A.EXTMALL_ID
-			, A.EXTMALL_NM
+			, (SELECT S.EXTMALL_NM FROM TB_EXTMALL S WHERE S.USE_YN = 'Y' AND S.EXTMALL_ID = A.EXTMALL_ID) AS EXTMALL_NM
 			, A.AGENT_ORDER_ID
 			, A.EXTMALL_ORDER_ID
 			, A.EXTMALL_PROD_ID

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -87,7 +87,7 @@
 
 				<ul class="panelBar">
 					<li class="center">
-						<button type="button" class="btn btn-base btn-lg" id="btnSearch">결과조회</button>
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
 						<!-- <button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button> -->
 						<button type="button" class="btn btn-primary btn-lg" id="btnSendInvoice">송장전송</button>
 						<!-- <button type="button" class="btn btn-primary btn-lg" id="btnInvoiceUpload">엑셀업로드</button> -->

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -120,7 +120,7 @@
 
 				<ul class="panelBar">
 					<li class="center">
-						<button type="button" class="btn btn-base btn-lg" id="btnSearch">결과조회</button>
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
 						<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnTest();">테스트</button> -->
 						<!-- <button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset();">초기화</button> -->
 					</li>

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerStockForm.html

@@ -77,7 +77,7 @@
 
 				<ul class="panelBar">
 					<li class="center">
-						<button type="button" class="btn btn-base btn-lg" id="btnSearch">결과조회</button>
+						<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
 					</li>
 				</ul>