Merge branch 'style' into card007

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

@@ -144,10 +144,11 @@ public class TsaMorebetterService {
         // <,> replace 처리
         moreBetter.setRegNo(TsaSession.getInfo().getUserNo());
         moreBetter.setUpdNo(TsaSession.getInfo().getUserNo());
+        
         Gson gson = new Gson();
         String jsonData = gson.toJson(moreBetter);
 
-        if("U".equals(moreBetter.getMode())){
+        if ("U".equals(moreBetter.getMode())){
             morebetterDao.deleteTmtbGoods(moreBetter);      // TB_TMTB_GOODS DEL_YN 'Y' UPDATE
             morebetterDao.deleteTmtbBurden(moreBetter);     // TB_TMTB_BURDEN DEL_YN 'Y' UPDATE
             morebetterDao.deleteTmtbSection(moreBetter);    // TB_TMTB_SECTION DEL_YN 'Y' UPDATE
@@ -159,7 +160,7 @@ public class TsaMorebetterService {
         morebetterDao.saveMorebetterMst(moreBetter);
 
         // 공급업체
-        for(MoreBetterGoods regSupplyComp : moreBetter.getSupplyCompList()){
+        for (MoreBetterGoods regSupplyComp : moreBetter.getSupplyCompList()) {
             regSupplyComp.setTmtbSq(moreBetter.getTmtbSq());
             regSupplyComp.setGoodsGb("G800_20");
             regSupplyComp.setTargetVal(regSupplyComp.getSupplyCompCd());
@@ -190,30 +191,30 @@ public class TsaMorebetterService {
             morebetterDao.saveMorebetterGoods(regDefaultGoods);
         }
 
-        // 기준상품+적용상품 중복제거
-        List<MoreBetterGoods> dgList = moreBetter.getDefaultGoodsList();
-        List<MoreBetterGoods> agList = moreBetter.getGridApplyGoodsList();
+        // 기준상품 + 적용상품 중복제거
+        List<MoreBetterGoods> dgList = moreBetter.getDefaultGoodsList();		// 기준상품
+        List<MoreBetterGoods> agList = moreBetter.getGridApplyGoodsList();		// 적용상품
         List<MoreBetterGoods> applyList = new ArrayList<>();
+        
         int dupCnt = 0;
-        if(agList.size() > 0){
+        
+        if (agList.size() > 0){
             applyList = dgList;
-            for(int i=0; i<agList.size(); i++){
-                for(int j=0; j<dgList.size(); j++){
-                    if(agList.get(i).getGoodsCd().equals(dgList.get(j).getGoodsCd())){
-                        //applyList.add(agList.get(i));
+            
+            for (int i=0 ; i<agList.size() ; i++) {
+                for (int j=0; j<dgList.size(); j++) {
+                    if (agList.get(i).getGoodsCd().equals(dgList.get(j).getGoodsCd())) {
                         dupCnt++;
                     }
                 }
-                if(dupCnt==0){
+                if (dupCnt == 0) {                	
                     applyList.add(agList.get(i));
                 }
             }
-        }else{
+        } else {
             applyList = dgList;
         }
 
-        log.info("applyList ::::{}",applyList);
-
         for(MoreBetterGoods regApplyGoods : applyList){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             regApplyGoods.setTmtbSq(moreBetter.getTmtbSq());
@@ -262,16 +263,20 @@ public class TsaMorebetterService {
         StringBuilder sb = new StringBuilder();
         StringBuilder sb3 = new StringBuilder();
         //int i = 1;
-        log.info("applyList2 ::::{}",applyList);
 
-        if(applyList.size()>0){
-            for(int i=0; i<applyList.size(); i++){
+        if (applyList.size() > 0) {
+            for (int i=0; i<applyList.size(); i++) {
+            	log.info("goodCd >>> {}", applyList.get(i).getGoodsCd());
+            	log.info("goodGb >>> {}", applyList.get(i).getGoodsGb());
+            	
                 sb.append("SELECT   '").append(applyList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
-                if(i<applyList.size()-1){
+                
+                if (i < applyList.size()-1) {
                     sb.append("\n UNION ALL \n");
                 }
 
-                sb3.append("SELECT   '").append(applyList.get(i).getGoodsCd()).append("' AS GOODS_CD ").append(" , '").append(applyList.get(i).getGoodsGb()).append("' AS GOODS_GB ");
+                sb3.append("SELECT   '").append(applyList.get(i).getGoodsCd()).append("' AS GOODS_CD ");
+                sb3.append(" , '").append(applyList.get(i).getGoodsGb()).append("' AS GOODS_GB ");
                 if(i<applyList.size()-1){
                     sb3.append("\n UNION ALL \n");
                 }

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

@@ -363,7 +363,13 @@ public class TsaWithdrawService {
 	 * @since 2020. 11. 16
 	 */
 	public Collection<Withdraw> getRefundDetailList(Withdraw withdraw) {
-		return withdrawDao.getRefundDetailList(withdraw);
+		// 2021.10.12 메모내용 이모티콘 제거
+		Collection<Withdraw> refundDetailList = withdrawDao.getRefundDetailList(withdraw);
+		for (Withdraw data : refundDetailList) {
+			data.setChgMemo(EmojiParser.removeAllEmojis(data.getChgMemo()));
+		}
+		
+		return refundDetailList;
 	}
 
 

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

@@ -1302,14 +1302,17 @@ public class TsaMarketingController extends TsaBaseController {
 
 		try {
 			MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
+			
 			// 적용상품 으로 tb_goods 조회해서 temp 테이블 insert
 			morebetterService.insertMorebetterApplyGoodsTemp(moreBetter);
 			morebetterService.saveMoreBetterDetail(moreBetter);
 
 			moreBetterGoods.setTmtbSq(moreBetter.getTmtbSq());
 			moreBetterGoods.setRegNo(TsaSession.getInfo().getUserNo());
+			
 			// 다른 다다에서 사용중인 상품 조회
 			Collection<MoreBetterGoods> duplicateGoodsList = morebetterService.getMorebetterDuplicateList(moreBetterGoods);
+			
 			// SELECT -> 지금 내가 선택한 업체&브랜드 + 적용상품에 해당하는 상품 조회 MINUS TMTB_GOODS_TEMP 상품
 			// 조회 건수 있으면 -> 해당 상품코드 엑셀로 던져주기
 			if (duplicateGoodsList.size() > 0) {

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

@@ -647,22 +647,24 @@
 				<if test="multiSupplyCompCd!= null and multiSupplyCompCd.length>0">
 					SELECT GOODS_CD
 					     , 'G800_10' AS GOODS_GB
-					FROM   TB_GOODS
-					WHERE  SUPPLY_COMP_CD IN
+					FROM TB_GOODS
+					WHERE SUPPLY_COMP_CD IN
 					<foreach collection="multiSupplyCompCd" item="item" open="(" separator="," close=")">
-					       #{item}
+						#{item}
 					</foreach>
-					AND    BRAND_CD IN
+					AND   BRAND_CD IN
 					<foreach collection="multiBrand" item="item" open="(" separator="," close=")">
-						   #{item}
+						#{item}
 					</foreach>
 					<if test="multiDefaultGoods != null and multiDefaultGoods.length>0">
-					AND    GOODS_CD NOT IN ( ${applySql} )
+						AND GOODS_CD NOT IN ( ${applySql} )
 					</if>
+					UNION ALL
 				</if>
+				${applyGbSql}
 			) T
 			WHERE	1=1
-			<if test="multiExceptGoods!= null and multiExceptGoods.length>0">
+			<if test="multiExceptGoods != null and multiExceptGoods.length >0">
 			AND 	T.GOODS_CD NOT IN ( ${exceptSql} )
 			</if>
 		) Z

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -878,7 +878,7 @@
 	}
 
 	// 공급업체 설정 / 업체 추가 콜백함수
-	var fnSetPopupComapnyInfo = function(result) {
+	var fnSetPopupComapnyInfoM = function(result) {
 		
 		var supplyCompCdArr = [];
 		
@@ -946,7 +946,7 @@
 	};
 
 	// 브랜드 설정 / 브랜드 추가 콜백함수 (단수로 가져오므로 복수일 경우에 수정 확인 필요)
-	var fnSetPopupBrandInfo = function(result) {
+	var fnSetPopupBrandInfoM = function(result) {
 		
 		var brandCdArr = [];
 		
@@ -1016,7 +1016,7 @@
 	};
 
 	// 분담업체율 설정 / 업체 추가 콜백함수
-	var fnSetPopupApplyBurdenInfo = function(result) {
+	var fnSetPopupApplyBurdenInfoB = function(result) {
 		// 기존 리스트 데이터 for
 		for(let i = 0 ; i < result.length ; i++) {
 			//console.log('old i::'+i+"::"+result[i].supplyCompCd);
@@ -1096,13 +1096,14 @@
 
 	// 공급업체 설정 업체 추가 버튼 클릭시
 	$('#moreBetterForm #btnAddCompany').on('click', function() {
-		cfnOpenCompanyListPopup("fnSetPopupComapnyInfo", "M");
+		cfnOpenCompanyListPopup("fnSetPopupComapnyInfoM", "M");
 	});
 
 	// 브랜드 추가 버튼 클릭시 (복수 브랜드때 수정 필요)
 	$('#moreBetterForm #btnAddBrand').on('click', function() {
-		cfnOpenBrandListPopup("fnSetPopupBrandInfo", "M");
+		cfnOpenBrandListPopup("fnSetPopupBrandInfoM", "M");
 	});
+	
 	// 기준 상품 추가 버튼 클릭시
 	$('#moreBetterForm #btnAddDefaultGoods').on('click', function() {
 		cfnOpenGoodsPopup("fnSetPopupDefaultGoodsInfo");
@@ -1118,7 +1119,7 @@
 	// 업체분담율 추가 버튼 클릭시
 	$('#moreBetterForm #btnAddApplyBurden').on('click', function() {
 		//cfnOpenApplyBurdenPopup("fnSetPopupApplyBurdenInfo");
-		cfnOpenCompanyListPopup("fnSetPopupApplyBurdenInfo", "M");
+		cfnOpenCompanyListPopup("fnSetPopupApplyBurdenInfoB", "M");
 	});
 
 	// 할인구간 선택삭제 버튼 클릭시