Merge branch 'develop' into jmh_pub

src/main/java/com/style24/front/biz/service/TsfDeliveryService.java

@@ -83,7 +83,7 @@ public class TsfDeliveryService {
 				try {
 					// 배송완료(상품평등록안내)알림톡
 					SweetTracker info = deliveryDao.getOrdNoInfo(sweetTracker);
-					if(MallGb.SELFMALL.value().equals(info.getMallGb())) {
+					if(MallGb.SELFMALL.value().equals(info.getMallGb()) && "O".equals(info.getOrdExchGb())) {
 						Order order = new Order();
 						order.setOrdNo(info.getOrdNo());
 						order.setCustNo(info.getCustNo());

src/main/java/com/style24/front/biz/thirdparty/EigeneaiApi.java

@@ -521,9 +521,18 @@ public class EigeneaiApi {
 	 */
 	public Collection<Result> getRecommendItemList(int size, String keyword) {
 		String requestUrl = "";
-		requestUrl = apiUrl + "/s003?size="+size+"&cuid=" + cuid + "&st=" + keyword + "&cps=true&cpt=m004";
-
+		
+		// 2021.09.02 공백처리
+		try {
+			keyword = URLEncoder.encode(keyword, "UTF-8");
+			requestUrl = apiUrl + "/s003?size="+size+"&cuid=" + cuid + "&st=" + keyword + "&cps=true&cpt=m004";
+		} catch (UnsupportedEncodingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
 		Eigeneai eigeneai = this.getEigeneaiInfo(requestUrl);
+		
 		if (eigeneai.getResults() != null && !eigeneai.getResults().isEmpty()) {
 			return eigeneai.getResults();
 		}

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -120,7 +120,7 @@ public class SearchEngineDiquest {
 			result = gson.fromJson(jsonObj.toJSONString(), AutoCompleteResponse.class);
 			log.info("///[getAutoComplete] result: {}", result);
 		} catch (Exception e) {
-			e.printStackTrace();
+			//e.printStackTrace();
 		}
 
 		return result;

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

@@ -49,6 +49,7 @@ public class SweetTracker extends TscBaseDomain {
 	private String recvAddr;
 	private String recvName;
 	private String sendName;
+	private String ordExchGb;
 
 	private Integer ordNo;
 	private Integer custNo;

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

@@ -63,6 +63,7 @@
 			, UPD_NO       = #{regNo}
 			, UPD_DT       = NOW()
 		WHERE ORD_DTL_NO   = #{ordDtlNo}
+		  AND ORD_DTL_NO   = 'G013_50'
 	</update>	
 	
 	
@@ -108,7 +109,7 @@
 	<!-- 주문상세번호 조회 -->	
 	<select id="getOrdNoInfo" resultType="SweetTracker">
 		/*TssDelivery.getOrdNoInfo*/
-		SELECT A.ORD_NO, A.CUST_NO, A.ORD_PHNNO , A.ORD_NM, A.MALL_GB  
+		SELECT A.ORD_NO, A.CUST_NO, A.ORD_PHNNO , A.ORD_NM, A.MALL_GB, min(B.ORD_EXCH_GB) AS ORD_EXCH_GB  
 		FROM TB_ORDER A
 		JOIN TB_ORDER_DETAIL B ON A.ORD_NO = B.ORD_NO 
 		WHERE B.INVOICE_NO = #{invoice_no}

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

@@ -323,7 +323,7 @@
 		WHERE  (SELECT COUNT(*) FROM TAB_PLAN_GOODS) = 0
 		AND PG.NUMB <![CDATA[<=]]> #{maxRow}
 		UNION ALL 
-		   SELECT PG.PLAN_SQ																																	
+		   SELECT distinct PG.PLAN_SQ																																	
 		        , PG.DISP_ORD                                                                                                                                  
 		        , PG.BRAND_GROUP_NM                                                                                                                            
 		        , PG.GOODS_CD                                                                                                                                  

src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -647,6 +647,7 @@
 	var bestItemSwiper = new Swiper('.best_item .area_slider .swiper-container', {
 		slidesPerView: 2.22,
 		speed: 1000,
+		freeMode: true, // 0902
 		spaceBetween: 8,
 		a11y: {
 			enabled: true,
@@ -663,6 +664,7 @@
 	var mdItemSwiper = new Swiper('.md_item .area_slider .swiper-container', {
 		slidesPerView: 2.22,
 		speed: 1000,
+		freeMode: true, // 0902
 		spaceBetween: 8,
 		a11y: {
 			enabled: true,