Merge branch 'develop' into card007

src/main/java/com/style24/admin/biz/dao/TsaPlanDao.java

@@ -624,4 +624,14 @@ public interface TsaPlanDao {
 	 * @since 2021. 06. 09
 	 */
 	Collection<Plan> getPlanAttendCoupon(Plan param);
+	
+	/**
+	 * 총알배송 자사브랜드 조회
+	 *
+	 * @param plan
+	 * @return
+	 * @author sowon
+	 * @since 2021. 06. 25
+	 */
+	Collection<Plan> getShotSelfBrandList();
 }

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

@@ -197,8 +197,7 @@ public class TsaOcmService {
 					orderDetail.setDelvAddrSq(order.getDelvAddrSq());
 
 					// TODO 총알배송, 구매대행상품여부 체크
-                    ocmDao.createOrderDetail(orderDetail); // 주문상세정보등록
-
+					ocmDao.createOrderDetail(orderDetail); // 주문상세정보등록
                     ocmDao.createOrderDetailHst(orderDetail); // 주문상세이력정보등록
 
                     Collection<ExtmallOrder> orderDetailItemList = ocmDao.getOrderDetailItem(orderDetail); // 주문상세단품정보조회
@@ -268,14 +267,15 @@ public class TsaOcmService {
                         // 2021.05.06 옵션금액 단품 추가
                         orderDetailItem.setOptAddPrice(optAddPrice);
                         orderDetailItem.setCustNo(order.getCustNo());
-
+                        
                         ocmDao.createOrderDetailItem(orderDetailItem); // 주문상세단품정보등록
-
+                        
+                        // 2021.06.25 샵링커 주문수집 결제완료 (정산구분값추가)
+                        orderDetailItem.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_PAYMENT_COMPLETE.value());
                         ocmDao.createOrderDetailItemHst(orderDetailItem); // 주문상세단품이력정보등록
 
                         index++;
 
-
                         // 5. 재고등록(샵링커 주문목록을 보면 동일한 몰 주문번호에 동일한 상품(sku)이 수량이 아닌 개별로 있는 데이터가 존재하므로 > 주문번호로 한번에 처리가 아닌 개별로 처리 함)
         				orderDetail.setSellGb(TscConstants.SellGb.ORDER.value());			// 판매구분(10:주문(-),
         				ocmDao.createSellQty(orderDetail);

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

@@ -90,26 +90,7 @@ public class TsaPlanService {
 			param.setMainPimg("/planning/" + yearMonth + "/" + newFilename);
 			param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
 		}
-//		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
-//			String imgInd = String.valueOf(ind);
-//			if (ind < 10) {
-//				imgInd = "0" + imgInd;
-//			}
-//			String planUploadPath = env.getProperty("upload.default.target.path");
-//			String yearMonth = GagaDateUtil.getToday().substring(0, 6);
-//			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
-//			File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
-//			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
-//			String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
-//			File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
-//			// Rename a file
-//			File path = new File(planUploadPath);
-//			if (!path.exists()) {
-//				path.mkdir();
-//			}
-//			newFile.renameTo(uniqueFile);
-//			param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
-//		}
+
 		planDao.createPlanInfo(param);
 		
 		String[] brand = param.getMultiBrand();
@@ -168,24 +149,28 @@ public class TsaPlanService {
 			planDao.savePlanAttendBenefit(attendInfo);
 		}
 		
-
-		log.debug("planSq : {}", param.getPlanSq());
-
-		//기획전 응모이벤트
-//		if (StringUtils.isNotBlank(param.getPrivacyPolicy())) {
-//			int i = 0;
-//			for (String planQtitle : param.getPlanQtitle()) {
-//				PlanQuestAnswer planQuestAnswer = new PlanQuestAnswer();
-//				planQuestAnswer.setPlanSq(param.getPlanSq());
-//				planQuestAnswer.setPlanQtitle(planQtitle);
-//				planQuestAnswer.setAttachYn(param.getAttachYn()[i]);
-//				planQuestAnswer.setQuestNo(i);
-//				planQuestAnswer.setRegNo(param.getRegNo());
-//				planQuestAnswer.setUpdNo(param.getUpdNo());
-//				planDao.savePlanQuestion(planQuestAnswer);
-//				i++;
-//			}
-//		}
+		// 총알배송일떼 -- 코너에 자동으로 자사브랜드 insert
+		String planGb = param.getPlanGb();
+		if ("S".equals(planGb)) {
+			
+			Collection<Plan> brandList = planDao.getShotSelfBrandList();
+			int idx = 1;
+			for (Plan corner : brandList) {
+				// 5열 전시 default
+				corner.setRegNo(TsaSession.getInfo().getUserNo());
+				corner.setUpdNo(TsaSession.getInfo().getUserNo());
+				corner.setPlanSq(param.getPlanSq());
+				corner.setDispStdt(param.getDispStdt());
+				corner.setDispEddt(param.getDispEddt());
+				corner.setCornerDispType("G045_5");
+				corner.setDispOrd(idx);
+				corner.setCornerNm(corner.getBrandNm());
+				
+				planDao.savePlanCornerInfo(corner);
+				idx++;
+			}
+			
+		}
 
 	}
 
@@ -389,29 +374,7 @@ public class TsaPlanService {
 			}
 			
 		}
-//		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
-//			String imgInd = String.valueOf(ind);
-//			if (ind < 10) {
-//				imgInd = "0" + imgInd;
-//			}
-//			if(!param.getMainMimg().contains("planning")) {
-//				String planUploadPath = env.getProperty("upload.default.target.path");
-//				String yearMonth = GagaDateUtil.getToday().substring(0, 6);
-//				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
-//				File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
-//				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
-//				String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
-//				File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
-//				// Rename a file
-//				File path = new File(planUploadPath);
-//				if (!path.exists()) {
-//					path.mkdir();
-//				}
-//				newFile.renameTo(uniqueFile);
-//				param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
-//			}
-//			
-//		}
+
 		// 이벤트 출석체크
 		planDao.deletePlanAttendBenefitList(param);
 		
@@ -426,21 +389,6 @@ public class TsaPlanService {
 		// 최종업데이트 
 		planDao.updatePlanInfo(param);
 
-		//기획전 응모이벤트
-//		if (StringUtils.isNotBlank(param.getPrivacyPolicy())) {
-//			int i = 0;
-//			for (String planQtitle : param.getPlanQtitle()) {
-//				PlanQuestAnswer planQuestAnswer = new TsaPlanQuestAnswer();
-//				planQuestAnswer.setPlanSq(param.getPlanSq());
-//				planQuestAnswer.setPlanQtitle(planQtitle);
-//				planQuestAnswer.setAttachYn(param.getAttachYn()[i]);
-//				planQuestAnswer.setQuestNo(i);
-//				planQuestAnswer.setRegNo(param.getRegNo());
-//				planQuestAnswer.setUpdNo(param.getUpdNo());
-//				planDao.savePlanQuestion(planQuestAnswer);
-//				i++;
-//			}
-//		}
 	}
 	
 	/**
@@ -1568,10 +1516,6 @@ public class TsaPlanService {
 	@Transactional("shopTxnManager")
 	public Plan createPlanFsrcPcTop(Plan param) {
 		Plan fsrcTop = new Plan();
-		int fsrcPcTotalCnt = param.getFsrcPcTop().toCharArray().length;
-		int fsrcMobileTotalCnt = param.getFsrcMobileTop().toCharArray().length;
-		int byteCnt = 1500;
-		
 		
 		fsrcTop.setFrontGb("T");                 
 		fsrcTop.setRegNo(param.getRegNo());      
@@ -1582,54 +1526,6 @@ public class TsaPlanService {
 		fsrcTop.setFsrcMob(param.getFsrcMobileTop());
 		planDao.savePlanFsrcInfo(fsrcTop);
 		
-//		if (fsrcPcTotalCnt > byteCnt || fsrcMobileTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
-//			StringBuilder sbStr = new StringBuilder(4000);
-//
-//			int cnt = 0;
-//			int getCnt = 0;
-//			int tempCnt = 1500;
-//
-//			for (char ch : param.getFsrcPcTop().toCharArray()) {
-//				getCnt++;
-//				sbStr.append(ch);
-//
-//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-//					fsrcTop.setSeq(cnt + 1);
-//					fsrcTop.setFsrcPc(sbStr.toString());
-//
-//					// 초기화
-//					sbStr.delete(0, tempCnt);
-//					cnt++;
-//					tempCnt += byteCnt;
-//
-//					//planDao.savePlanFsrcInfo(fsrcTop);
-//				}
-//			}
-//		
-//			for (char ch : param.getFsrcMobileTop().toCharArray()) {
-//				getCnt++;
-//				sbStr.append(ch);
-//
-//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-//					fsrcTop.setSeq(cnt + 1);
-//					fsrcTop.setFsrcMob(sbStr.toString());
-//
-//					// 초기화
-//					sbStr.delete(0, tempCnt);
-//					cnt++;
-//					tempCnt += byteCnt;
-//					
-//				}
-//			}		
-//			planDao.savePlanFsrcInfo(fsrcTop);
-//		} 
-//		else {
-//			fsrcTop.setSeq(1);
-//			fsrcTop.setFsrcPc(param.getFsrcPcTop());
-//			fsrcTop.setFsrcMob(param.getFsrcMobileTop());
-//
-//			planDao.savePlanFsrcInfo(fsrcTop);
-//		}
 		return param;
 	}
 
@@ -1640,10 +1536,6 @@ public class TsaPlanService {
 	@Transactional("shopTxnManager")
 	public Plan createPlanFsrcPcBtm(Plan param) {
 		Plan fsrcBtm = new Plan();
-		int fsrcPcTotalCnt = param.getFsrcPcBtm().toCharArray().length;
-		int fsrcMobileTotalCnt = param.getFsrcMobileBtm().toCharArray().length;
-		int byteCnt = 1500;
-		
 		
 		fsrcBtm.setFrontGb("B");                 
 		fsrcBtm.setRegNo(param.getRegNo());      
@@ -1652,55 +1544,7 @@ public class TsaPlanService {
 		fsrcBtm.setFsrcPc(param.getFsrcPcBtm());
 		fsrcBtm.setFsrcMob(param.getFsrcMobileBtm());
 		planDao.savePlanFsrcInfo(fsrcBtm);
-		
-//		if (fsrcPcTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
-//			StringBuilder sbStr = new StringBuilder(4000);
-//
-//			int cnt = 0;
-//			int getCnt = 0;
-//			int tempCnt = 1500;
-//
-//			for (char ch : param.getFsrcPcBtm().toCharArray()) {
-//				getCnt++;
-//				sbStr.append(ch);
-//
-//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-//					fsrcBtm.setSeq(cnt + 1);
-//					fsrcBtm.setFsrcPc(sbStr.toString());
-//
-//					// 초기화
-//					sbStr.delete(0, tempCnt);
-//					cnt++;
-//					tempCnt += byteCnt;
-//
-//				}
-//
-//			}
-//			
-//			for (char ch : param.getFsrcMobileBtm().toCharArray()) {
-//				getCnt++;
-//				sbStr.append(ch);
-//
-//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-//					fsrcBtm.setSeq(cnt + 1);
-//					fsrcBtm.setFsrcMob(sbStr.toString());
-//
-//					// 초기화
-//					sbStr.delete(0, tempCnt);
-//					cnt++;
-//					tempCnt += byteCnt;
-//					
-//				}
-//			}		
-//			
-//			planDao.savePlanFsrcInfo(fsrcBtm);
-//		} else {
-//			fsrcBtm.setSeq(1);
-//			fsrcBtm.setFsrcPc(param.getFsrcPcBtm());
-//			fsrcBtm.setFsrcMob(param.getFsrcMobileBtm());
-//
-//			planDao.savePlanFsrcInfo(fsrcBtm);
-//		}
+
 		return param;
 	}
 

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

@@ -81,6 +81,7 @@ public class TsaPollService {
 	 * @author sowon
 	 * @since 2021. 5. 2
 	 */
+	@Transactional("shopTxnManager")
 	public void removeQuestion(Poll poll) {
 		pollDao.removeQuestion(poll);
 	}

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

@@ -1,5 +1,6 @@
 package com.style24.admin.biz.service;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -878,7 +879,11 @@ public class TsaShoplinkerService {
 			// response 결과
 			shoplinkerResult = (com.gagaframework.shoplinker.domain.goods.result.Shoplinker)shoplinkerUtil.unmarshal(com.gagaframework.shoplinker.domain.goods.result.Shoplinker.class, responseXmlData);
 			resultMsg = shoplinkerResult.getResultMessage();
-			map.setXmlTxt(sbRequest.toString());
+
+			String slFolder = GagaFileUtil.getConcatenationPath(env.getProperty("shoplinker.xml.path"));
+			File slPath = new File(slFolder);
+
+			map.setXmlTxt(slPath.exists()+"\n"+xmlPath+"\n"+xmlUrl+"\n\n"+sbRequest.toString());
 			map.setApiProductId(resultMsg.getProductId());
 			map.setApiResult(resultMsg.getResult());
 			map.setApiMessage(resultMsg.getMessage());
@@ -893,11 +898,19 @@ public class TsaShoplinkerService {
 			}
 
 			// 생성 파일삭제
-			GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString()));
+			// GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString()));
 
 		} catch (Exception e) {
 			log.error("error", e);
-			map.setXmlTxt(sbRequest.toString());
+			// 임시
+			StringBuilder xmlFileName = new StringBuilder();
+			xmlFileName.append(fileNm+"_"+fileAddNm).append(".xml");
+			String xmlPath = GagaFileUtil.getConcatenationPath(map.getXmlPath(), xmlFileName.toString());
+			String xmlUrl = GagaFileUtil.getConcatenationPath(map.getDomainUrl(), xmlFileName.toString());
+			String slFolder = GagaFileUtil.getConcatenationPath(env.getProperty("shoplinker.xml.path"));
+			File slPath = new File(slFolder);
+			map.setXmlTxt(slPath.exists()+"\n"+xmlPath+"\n"+xmlUrl+"\n\n"+sbRequest.toString());
+			//map.setXmlTxt(sbRequest.toString());
 			map.setApiResult("error");
 			map.setApiMessage("API 통신오류");
 		}

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

@@ -6,10 +6,10 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.admin.biz.service.TsaCustomerService;
 import com.style24.core.biz.service.TscKakaotalkService;
+import com.style24.core.biz.service.TscMailService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.session.TscSession;
 import com.style24.core.support.util.CryptoUtils;
-import com.style24.core.support.util.MaskingUtils;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustContactHst;
@@ -76,6 +76,9 @@ public class TsaCustomerController extends TsaBaseController {
 	@Autowired
 	private TscKakaotalkService kakaotalkService;
 
+	@Autowired
+	private TscMailService mailService;
+
 	/**
 	 * 1:1문의관리 화면
 	 * @return
@@ -658,7 +661,7 @@ public class TsaCustomerController extends TsaBaseController {
 
 		// 메일 발송
 		if (StringUtils.isNotBlank(customer.getEmail())) {
-			//mailService.sendBasicMail(customer);
+			mailService.sendBasicMail(customer, TsaSession.getInfo().getUserNo());
 		}
 
 		return super.ok(message.getMessage("SUCC_0005"));

src/main/java/com/style24/admin/support/env/TsaConstants.java

@@ -146,4 +146,25 @@ public class TsaConstants {
 			return value;
 		}
 	}
+	
+	// 정산구분상태
+	public enum OrdDtlItemStat {
+		
+		SALE_PAYMENT_COMPLETE("G720_10"), 			// 판매-결제완료
+		SALE_SHIPPING("G720_20"),					// 판매-배송완료
+		SALE_RETURN_CANCEL("G720_30"), 				// 환입-취소완료
+		SALE_RETURN_SOLDOUT_CANCEL("G720_40"),		// 환입-품절취소
+		SALE_RETURN_RETURN_COMPLETE("G720_50"),		// 환입-반품완료
+		SALE_RETURN_EXCHANGE_COMPLETE("G720_60");	// 환입-교환완료
+
+		private String value;
+
+		private OrdDtlItemStat(String value) {
+			this.value = value;
+		}
+
+		public String value() {
+			return value;
+		}
+	}
 }

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

@@ -80,6 +80,7 @@ public class Plan extends TscBaseDomain{
 		private String custJoinStdt;		//회원가입시작일시
 		private String custJoinEddt;		//회원가입종료일시
 		private String sysImgNm;			//이미지
+		private String brandNm;
 
 		// 기획전 소스
 		private Integer seq;					//일련번호

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

@@ -179,10 +179,14 @@
 		)
 		VALUES (
 		       #{noticeSq}
-		     , IFNULL((SELECT MAX(SEQ)
-		               FROM   TB_NOTICE_FILE
-		               WHERE  NOTICE_SQ = #{noticeSq}
-		              ),0) + 1
+		     , (
+		        SELECT IFNULL(SEQ,0)+1 
+		        FROM (
+		               SELECT MAX(SEQ) AS SEQ 
+		                FROM   TB_NOTICE_FILE
+		                WHERE  NOTICE_SQ =  #{noticeSq}
+		             )A
+		       )
 		     , #{orgFileNm}
 		     , #{sysFileNm}
 		     , #{regNo}

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

@@ -968,7 +968,9 @@
 		    , OPT_ADD_PRICE
 		    , DISP_ORD
 		    , ORD_AMT
+		    , ORD_QTY
 		    , CNCL_RTN_AMT
+		    , CNCL_RTN_QTY
 		    , CPN1_DC_AMT
 		    , TMTB1_DC_AMT
 		    , TMTB2_DC_AMT
@@ -984,38 +986,42 @@
 		    , UPD_NO
 		    , UPD_DT
 		)
-		SELECT ORD_DTL_ITEM_SQ
-		     , ORD_DTL_NO
-		     , ORD_NO
-		     , ORD_DTL_STAT
-		     , ITEM_CD
-		     , OPT_CD
-		     , OPT_CD1
-		     , OPT_CD2
-		     , SKU_MODEL_NO
-		     , PRODUCT_NO
-		     , PRODUCT_CODE
-		     , ITEM_QTY
-		     , ITEM_PRICE
-		     , OPT_ADD_PRICE
-		     , DISP_ORD
-		     , ORD_AMT
-		     , CNCL_RTN_AMT
-		     , CPN1_DC_AMT
-		     , TMTB1_DC_AMT
-		     , TMTB2_DC_AMT
-		     , GOODS_CPN_DC_AMT
-		     , CART_CPN_DC_AMT
-		     , PNT_DC_AMT
-		     , PRE_PNT_DC_AMT
-		     , SAVE_PNT_AMT
-		     , REAL_ORD_AMT
-		     , GFCD_USE_AMT
-		     , REG_NO
+		SELECT ODI.ORD_DTL_ITEM_SQ
+		     , ODI.ORD_DTL_NO
+		     , ODI.ORD_NO
+		     , #{ordDtlItemStat}
+		     , ODI.ITEM_CD
+		     , ODI.OPT_CD
+		     , ODI.OPT_CD1
+		     , ODI.OPT_CD2
+		     , ODI.SKU_MODEL_NO
+		     , ODI.PRODUCT_NO
+		     , ODI.PRODUCT_CODE
+		     , ODI.ITEM_QTY
+		     , ODI.ITEM_PRICE
+		     , ODI.OPT_ADD_PRICE
+		     , ODI.DISP_ORD
+		     , ODI.ORD_AMT
+		     , OD.ORD_QTY
+		     , ODI.CNCL_RTN_AMT
+		     , OD.CNCL_RTN_QTY
+		     , ODI.CPN1_DC_AMT
+		     , ODI.TMTB1_DC_AMT
+		     , ODI.TMTB2_DC_AMT
+		     , ODI.GOODS_CPN_DC_AMT
+		     , ODI.CART_CPN_DC_AMT
+		     , ODI.PNT_DC_AMT
+		     , ODI.PRE_PNT_DC_AMT
+		     , ODI.SAVE_PNT_AMT
+		     , ODI.REAL_ORD_AMT
+		     , ODI.GFCD_USE_AMT
+		     , ODI.REG_NO
 		     , NOW()
-		     , UPD_NO
+		     , ODI.UPD_NO
 		     , NOW()
-		  FROM TB_ORDER_DETAIL_ITEM
+		  FROM TB_ORDER_DETAIL_ITEM ODI
+		 INNER JOIN TB_ORDER_DETAIL OD
+		    ON ODI.ORD_DTL_NO = OD.ORD_DTL_NO
 		 WHERE 1=1
 		   AND ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
 	</insert>

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

@@ -1511,6 +1511,22 @@
 		AND C.CPN_STAT = 'G232_11'
 		AND NOW() <![CDATA[<=]]> IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
 	</select>
+	
+	<select id="getShotSelfBrandList" parameterType="Plan" resultType="Plan">
+		/* TsaPlan.getShotSelfBrandList */
+		SELECT  B.BRAND_CD 
+		      , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
+		                  ELSE BG.BRAND_GROUP_KNM
+		        END                                                    AS BRAND_NM
+		FROM TB_BRAND B INNER JOIN TB_BRAND_GROUP BG 
+		  ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		WHERE 1 = 1
+		  AND B.USE_YN  = 'Y'
+		  AND B.SELF_YN = 'Y'
+		  AND BG.USE_YN = 'Y'
+		ORDER  BY B.SUPPLY_COMP_CD
+		         ,BG.DISP_ORD
+	</select>
 </mapper>
 
 

src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -166,7 +166,8 @@
 							<textarea class="textareaR4" name="noticeContent" id="noticeContent"></textarea>
 						</td>
 					</tr>
-					<tr>
+					<!-- 2021.06.25 주석처리 -->
+					<!-- <tr>
 						<th>파일첨부</th>
 						<td colspan="5">
 							<div id="registeredFile"></div>
@@ -189,7 +190,7 @@
 								</div>
 							</th:block>
 						</td>
-					</tr>
+					</tr> -->
 				</table>
 			</form>
 			
@@ -205,8 +206,8 @@
 		<!-- 등록/수정 -->
 	</div>
 
-<!-- <script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script> -->
+<script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020103001"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2021053101"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 공지사항유형(10:사이트공지, 20:내부공지)
@@ -343,8 +344,8 @@
 		}
 
 		// 공지내용. Summernote에 값 세팅
-		//gagaSn.setContents('#noticeContent', event.data.noticeContent);
-		$('#detailForm textarea[name=noticeContent]').val(event.data.noticeContent);
+		gagaSn.setContents('#noticeContent', event.data.noticeContent);
+		//$('#detailForm textarea[name=noticeContent]').val(event.data.noticeContent);
 
 		// 수신자 목록
 		fnGetNoticeReceiverList(event.data.noticeSq);
@@ -482,8 +483,8 @@
 		$('#detailForm input[name=noticeSq]').val('');
 		$('#detailForm input[name=noticeStdt]').val(_today);
 		$('#detailForm input[name=noticeEddt]').val(_today);
-		$('#detailForm input[name=noticeContent]').val('');
-		//gagaSn.setContents('#noticeContent', ''); 
+		//$('#detailForm input[name=noticeContent]').val('');
+		gagaSn.setContents('#noticeContent', ''); 
 	});
 	
 	// 저장
@@ -619,8 +620,8 @@
 		gagaAgGrid.createGrid('gridList', gridOptions);
 		
 		// Create a summernote
-		//let snOptions = gagaSn.getToolbarOptions();
-		//gagaSn.createSummernote(snOptions, '#noticeContent');
+		let snOptions = gagaSn.getToolbarOptions('media');
+		gagaSn.createSummernote(snOptions, '#noticeContent');
 		
 		$("#fileCnt").trigger('change');
 	});

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

@@ -38,7 +38,7 @@
 						<td colspan="7">
 							<input name="apiStDate" id="apiStDate" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="주문수집일" />
 							&nbsp;&nbsp;&nbsp;&nbsp;
-							<button th:if="${sessionInfo.userId == 'jmh'}" type="button" class="btn btn-primary btn-lg" id="btnCollection">주문수집</button>
+							<button th:if="${sessionInfo.userId == 'jsh77b'}" type="button" class="btn btn-primary btn-lg" id="btnCollection">주문수집</button>
 							&nbsp;<span class="runable_info"></span>
 						</td>
 					</tr>