Browse Source

코디상품 삭제처리

eskim 5 năm trước cách đây
mục cha
commit
3f20a7ba8a

+ 0 - 27
style24.admin/src/main/java/com/style24/admin/biz/dao/TsaGoodsDao.java

@@ -3,7 +3,6 @@ package com.style24.admin.biz.dao;
 import java.util.Collection;
 
 import com.style24.core.support.annotation.ShopDs;
-import com.style24.persistence.domain.CodiGoods;
 import com.style24.persistence.domain.Color;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.GoodsCompose;
@@ -272,16 +271,6 @@ public interface TsaGoodsDao {
 	 */
 	void saveGoodsNotiInfo(GoodsNotiInfo goodsNotiInfo);
 
-	/**
-	 * 코디 상품 목록 조회
-	 *
-	 * @param codiGoods
-	 * @return
-	 * @author eskim
-	 * @since 2020. 10. 26
-	 */
-	Collection<CodiGoods> getCodiGoodsList(CodiGoods codiGoods);
-
 	/**
 	 * 상품 기본 정보 수정
 	 *
@@ -336,22 +325,6 @@ public interface TsaGoodsDao {
 	 */
 	void saveStock(Option option);
 
-	/**
-	 * 코디상품 저장
-	 * @param codiGoods
-	 * @author eskim
-	 * @since 2020. 10. 28
-	 */
-	void saveCodiGoods(CodiGoods codiGoods);
-
-	/**
-	 * 코디상품 삭제
-	 * @param codiGoods
-	 * @author eskim
-	 * @since 2020. 10. 28
-	 */
-	void deleteCodiGoods(CodiGoods codiGoods);
-
 	/**
 	 * 상품 기본 정보 등록
 	 *

+ 0 - 41
style24.admin/src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -16,7 +16,6 @@ import com.style24.admin.support.env.TsaConstants;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Brand;
-import com.style24.persistence.domain.CodiGoods;
 import com.style24.persistence.domain.Color;
 import com.style24.persistence.domain.CommonCode;
 import com.style24.persistence.domain.Goods;
@@ -724,18 +723,6 @@ public class TsaGoodsService {
 //		}
 	}
 
-	/**
-	 * 코디 상품 목록 조회
-	 *
-	 * @param goods
-	 * @return
-	 * @author eskim
-	 * @since 2020. 10. 26
-	 */
-	public Collection<CodiGoods> getCodiGoodsList(CodiGoods codiGoods) {
-		return goodsDao.getCodiGoodsList(codiGoods);
-	}
-
 	/**
 	 * 상품 저장
 	 *
@@ -847,18 +834,6 @@ public class TsaGoodsService {
 		// 상품 정보고시 변경
 		this.saveGoodsNotiInfo(goods);
 
-		// 코디상품 변경
-		idx = 1;
-		Collection<CodiGoods> codiGoodsList = goods.getCodiGoodsListNew();
-		for (CodiGoods codiGoods : codiGoodsList) {
-			codiGoods.setDispOrd(idx);
-			codiGoods.setDelYn("N");
-			codiGoods.setRegNo(TsaSession.getInfo().getUserNo());
-			codiGoods.setUpdNo(TsaSession.getInfo().getUserNo());
-			goodsDao.saveCodiGoods(codiGoods); // 구성상품기본 저장
-
-			idx++;
-		}
 	}
 
 	/**
@@ -1059,22 +1034,6 @@ public class TsaGoodsService {
 		}
 	}
 
-	/**
-	 * 코드상품 삭제
-	 *
-	 * @param codiGoodsList
-	 * @author eskim
-	 * @since 2020. 10. 28
-	 */
-	@Transactional("shopTxnManager")
-	public void deleteCodiGoods(Collection<CodiGoods> codiGoodsList) {
-		for (CodiGoods codiGoods : codiGoodsList) {
-			codiGoods.setDelYn("Y");
-			codiGoods.setUpdNo(TsaSession.getInfo().getUserNo());
-			goodsDao.deleteCodiGoods(codiGoods);
-		}
-	}
-
 	/**
 	 * 딜상품 저장
 	 *

+ 0 - 45
style24.admin/src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -26,7 +26,6 @@ import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
-import com.style24.persistence.domain.CodiGoods;
 import com.style24.persistence.domain.Color;
 import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.GoodsCompose;
@@ -687,25 +686,6 @@ public class TsaGoodsController extends TsaBaseController {
 		return goodsService.getGoodsDetailComposeList(goods);
 	}
 
-	/**
-	 * 코디 상품 목록 조회
-	 *
-	 * @param goods
-	 * @return
-	 * @author eskim
-	 * @since 2020. 10. 23
-	 */
-	@GetMapping("/detail/codi/list")
-	@ResponseBody
-	public Collection<CodiGoods> getGoodsDetailCodiList(Goods goods) {
-
-		CodiGoods codiGoods = new CodiGoods();
-		codiGoods.setGoodsCd(goods.getGoodsCd());
-
-		return goodsService.getCodiGoodsList(codiGoods);
-	}
-
-
 	/**
 	 * 상품 상세 저장
 	 *
@@ -732,7 +712,6 @@ public class TsaGoodsController extends TsaBaseController {
 
 		Collection<GoodsNotiInfo> notiList = null;
 		Collection<GoodsCompose> goodComposeList = null;
-		Collection<CodiGoods> codiGoodList = null;
 		ObjectMapper mapper = new ObjectMapper();
 		try {
 			if (goods.getNotiList() != null) {
@@ -742,14 +721,6 @@ public class TsaGoodsController extends TsaBaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		try {
-			if (goods.getCodiGoodsList() != null) {
-				codiGoodList = mapper.readValue(goods.getCodiGoodsList(), new TypeReference<Collection<CodiGoods>>() {
-				});
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		try {
 			if (goods.getGoodsComposeList() != null) {
 				goodComposeList = mapper.readValue(goods.getGoodsComposeList(), new TypeReference<Collection<GoodsCompose>>() {
@@ -761,27 +732,11 @@ public class TsaGoodsController extends TsaBaseController {
 
 		goods.setNotiListNew(notiList);
 		goods.setGoodsComposeListNew(goodComposeList);
-		goods.setCodiGoodsListNew(codiGoodList);
 
 		goodsService.saveGoodsDetail(goods);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
-	/**
-	 * 코디상품 삭제
-	 *
-	 * @param codiGoodsList
-	 * @author eskim
-	 * @since 2020. 10. 28
-	 */
-	@PostMapping("/codi/delete")
-	@ResponseBody
-	public GagaResponse deleteCodiGoods(@RequestBody Collection<CodiGoods> codiGoodsList) {
-
-		goodsService.deleteCodiGoods(codiGoodsList);
-		return super.ok(message.getMessage("SUCC_0003"));
-	}
-
 	/**
 	 * 세트상품구성 화면
 	 *

+ 0 - 31
style24.admin/src/main/java/com/style24/persistence/domain/CodiGoods.java

@@ -1,31 +0,0 @@
-package com.style24.persistence.domain;
-
-import com.style24.persistence.TscBaseDomain;
-
-import lombok.Data;
-
-/**
- * 코드 상품 Domain
- * @author eskim
- * @since 2020. 10. 26
- */
-@SuppressWarnings("serial")
-@Data
-public class CodiGoods extends TscBaseDomain {
-
-	private String goodsCd;
-	private String codiGoodsCd;
-	private int dispOrd;
-	private String delYn;
-
-	private String goodsNm;
-	private int currPrice;
-	private String goodsStat;
-	private String formalGb;
-	private String imgType;
-	private String imgPath1;
-	private String imgPath6;
-	private String crud;
-
-}
-

+ 0 - 3
style24.admin/src/main/java/com/style24/persistence/domain/Goods.java

@@ -158,9 +158,6 @@ public class Goods extends TscBaseDomain {
 	private Collection<GoodsCompose> goodsComposeListNew; // 상품 구성상품
 	private String goodsComposeList; // 상품 구성상품
 
-	private Collection<CodiGoods> codiGoodsListNew; // 코디 상품
-	private String codiGoodsList; // 코디 상품
-
 	// Pagination
 	private TsaPageRequest pageable;
 	private int pageNo = 1;

+ 0 - 65
style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -1140,31 +1140,6 @@
 		     , UPD_DT = NOW()
 	</update>
 	
-	<!-- 코디 상품 목록 조회  -->
-	<select id="getCodiGoodsList" parameterType="CodiGoods" resultType="CodiGoods">
-		/* TsaGoods.getCodiGoodsList */
-		SELECT A.GOODS_CD
-		     , A.CODI_GOODS_CD
-		     , A.DISP_ORD
-		     , A.DEL_YN
-		     , G.GOODS_NM
-		     , G.CURR_PRICE
-		     , G.GOODS_STAT
-		     , G.FORMAL_GB
-		     , GI.IMG_TYPE
-		     , GI.IMG_PATH1
-		     , GI.IMG_PATH6
-		     , FN_GET_USER_NM(A.UPD_NO) AS UPD_NM
-		     , A.UPD_NO
-		     , DATE_FORMAT(A.UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
-		FROM TB_CODI_GOODS A
-		INNER JOIN TB_GOODS G ON A.CODI_GOODS_CD = G.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_IMG GI ON A.CODI_GOODS_CD = GI.GOODS_CD
-		WHERE DEL_YN = 'N'
-		AND A.GOODS_CD = #{goodsCd}
-		ORDER BY A.DISP_ORD
-	</select>
-	
 	<!-- 상품 사이즈 조회 -->
 	<select id="getGoodsSizeList" parameterType="Goods" resultType="Option">
 		/* TsaGoods.getGoodsSizeList */
@@ -1551,46 +1526,6 @@
 		      </if>
 	</update>
 	
-	<!-- 코디상품 저장 -->
-	<insert id="saveCodiGoods" parameterType="CodiGoods">
-		/* TsaGoods.saveCodiGoods */
-		INSERT INTO TB_CODI_GOODS (
-		    GOODS_CD
-		  , CODI_GOODS_CD
-		  , DISP_ORD
-		  , DEL_YN
-		  , REG_NO
-		  , REG_DT
-		  , UPD_NO
-		  , UPD_DT
-		) VALUES(
-		    #{goodsCd}
-		  , #{codiGoodsCd}
-		  , #{dispOrd}
-		  , #{delYn}
-		  , #{regNo}
-		  , NOW()
-		  , #{updNo}
-		  , NOW()
-		)
-		ON DUPLICATE KEY UPDATE 
-		      DISP_ORD = #{dispOrd}
-		    , DEL_YN = #{delYn} 
-		    , UPD_NO = #{updNo}
-		    , UPD_DT = NOW()
-	</insert>
-	
-	<!-- 코디상품 삭제 -->
-	<delete id="deleteCodiGoods" parameterType="CodiGoods">
-		/* TsaGoods.deleteCodiGoods */
-		UPDATE TB_CODI_GOODS SET
-		      DEL_YN = #{delYn} 
-		    , UPD_NO = #{updNo}
-		    , UPD_DT = NOW()
-		WHERE GOODS_CD = #{goodsCd}
-		AND CODI_GOODS_CD = #{codiGoodsCd}
-	</delete>
-
 	<!-- 상품코드 생성 -->
 	<insert id="createGoodsSequence" parameterType="Goods">
 		/* TsaGoods.createGoodsSequence */

+ 4 - 146
style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -33,7 +33,6 @@
 				<input type="hidden" id="niClsfNm" name="niClsfNm" />
 				<input type="hidden" id="uploadGoodsUrl" name="uploadGoodsUrl" th:value="${@environment.getProperty('upload.goods.view')}"/>
 				<input type="hidden" id="goodsType" name="goodsType" />
-				<input type="hidden" id="codiGoodsList" name="codiGoodsList" />
 				<input type="hidden" id="GoodsComposeList" name="GoodsComposeList" />
 				<table class="frmStyle">
 					<colgroup>
@@ -76,7 +75,7 @@
 							<li><a href="#goodstab2">옵션/재고정보</a></li>
 							<li><a href="#goodstab3">상품상세정보</a></li>
 							<li id="goodsNotiTab"><a href="#goodstab4">고시정보</a></li>
-							<li id="goodsCodiTab"><a href="#goodstab5">코디상품</a></li>
+							<li id="goodsCodiTab"><a href="#goodstab5">대표색상</a></li>
 							<li id="GoodsComposeTab" style="display:none;"><a href="#goodstab6">구성상품</a></li>
 							<li><a href="#goodstab7">변경이력</a></li>
 						</ul>
@@ -437,7 +436,7 @@
 						</li>
 						<!-- //TAB7 : 추가정보 -->
 						<!-- TAB5 : 이력정보 -->
-						<li class="tab" id="goodstab5">
+						<li class="tab" id="goodstab7">
 							<!-- TAB8 CONTENTS AREA -->
 							<div class="panelStyle">
 								<!-- 내용 삽입 -->
@@ -594,54 +593,11 @@
 		{headerName: "수정자", field: "updNm", width: 100, cellClass: 'text-center'}
 	];
 	
-	// specify the columns - 코디상품
-	var columnCodiGoodsDefs = [
-		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-		{headerName: "정렬", field: "dispOrd", width: 70 ,hide: false, cellClass: 'text-center',  rowDrag: true },
-		{headerName: "CRUD", field: "crud", width: 75, minWidth: 75, hide: true},
-		//{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-		{headerName: "이미지", field: "imgPath1", width: 100, height: 60, cellClass: 'text-center'
-			,cellRenderer: function(params) {
-				if (params.data.imgType == "G030_A"){
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ params.data.imgPath6 + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ params.value + '" alt="" onerror="this.src=\'/image/no.gif\';"/>';
-					}
-						
-				}else{
-					if(!gagajf.isNull(params.data.imgPath6)){
-						return '<img width="60" src="'+ uploadGoodsUrl+params.data.imgPath6 + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}else{
-						return '<img width="60" src="'+ uploadGoodsUrl+params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-					}
-				}
-			}
-		},
-		{headerName: "상품코드", field: "codiGoodsCd" , width: 130, cellClass: 'text-center'},
-		{headerName: "상품명", field: "goodsNm" , width: 300, cellClass: 'text-left'},
-		{headerName: "판매가", field: "currPrice" , width: 100, cellClass: 'text-right'
-			,valueFormatter: function(params) { return Number(params.value).addComma();}
-		},
-		{headerName: "상품상태", field: "goodsStat" , width: 100, cellClass: 'text-center',
-			cellEditorParams: { values: gagaAgGrid.extractValues(goodsStatList) },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsStatList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(goodsStatList, params.newValue); }
-		},
-		{headerName: "정상이월구분", field: "formalGb" , width: 100, cellClass: 'text-center',
-			cellEditorParams: { values: gagaAgGrid.extractValues(formalGbList) },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(formalGbList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(formalGbList, params.newValue); }
-		},
-		{headerName: "Master상품코드", field: "goodsCd", width: 150, cellClass: 'text-center', hide: true}
-		
-	];
+	
 
 	// Get GridOptions
 	var gridGoodsHstoryOptions = gagaAgGrid.getGridOptions(columnGoodsHstoryDefs);
 	gridGoodsHstoryOptions.enableBrowserTooltips = true;
-	var gridCodiGoodsOptions = gagaAgGrid.getGridOptions(columnCodiGoodsDefs);
-	gridCodiGoodsOptions.enableBrowserTooltips = true;
 	var gridGoodsComposeOptions = gagaAgGrid.getGridOptions(columnGoodsComposeDefs);
 	gridGoodsComposeOptions.enableBrowserTooltips = true;
 	// 드래그
@@ -650,11 +606,8 @@
 	//gridGoodsComposeOptions.rowDeselection = true;
 	//gridGoodsComposeOptions.enableMultiRowDragging = true;
 	//gridGoodsComposeOptions.rowSelection = 'multiple';
-	gridCodiGoodsOptions.suppressRowClickSelection = true;
-	gridCodiGoodsOptions.rowDragManaged = true;
 	
 	gridGoodsComposeOptions.rowHeight = 60; //이미지가 있을경우 높이 지정해야함.
-	gridCodiGoodsOptions.rowHeight = 60; //이미지가 있을경우 높이 지정해야함.
 	
 	//기준여부 표시
 	gridGoodsComposeOptions.getRowStyle = function(params) {
@@ -897,8 +850,7 @@
 			fnGoodsDetailSizeStockSearch(params);
 			//정보고시
 			fnGoodsDetailNotiInfoSearch(params);
-			//코디상품
-			fnGoodsDetailCodiSearch();
+			
 			
 			//구성상품
 			if ("G056_S" == result.goodsType || "G056_D" == result.goodsType){
@@ -945,11 +897,6 @@
 		gagaAgGrid.fetch("/goods/detail/hst/list?goodsCd=" + $('#goodsDetailForm input[name=goodsCd]').val() , gridGoodsHstoryOptions);
 	}
 	
-	//코디상품
-	var fnGoodsDetailCodiSearch = function() {
-		gagaAgGrid.fetch("/goods/detail/codi/list?goodsCd=" + $('#goodsDetailForm input[name=goodsCd]').val() , gridCodiGoodsOptions);
-	}
-	
 	//정보고시 콜백
 	var fnGoodsDetailNotiInfoSearchCallback = function(result) {
 		if (result == null) return;
@@ -1628,11 +1575,6 @@
 					$("#goodsDetailForm input[name=chDataYn]").val('N');
 				}
 				
-				// 코디 상품
-				var codiGoodsData = gagaAgGrid.getAllRowData(gridCodiGoodsOptions);
-				var jsonDataCodiGoods = JSON.stringify(codiGoodsData);
-				$('#goodsDetailForm input[name=codiGoodsList]').val(jsonDataCodiGoods);
-				
 				//구성상품
 				var allData = gagaAgGrid.getAllRowData(gridGoodsComposeOptions);
 				var jsonData = JSON.stringify(allData);
@@ -1898,89 +1840,6 @@
 		gridGoodsComposeOptions.api.refreshCells();
 	}
 	
-	// 코디상품 조회 팝업
-	var fnOpenCodiGoodsPopup = function() {
-		cfnOpenGoodsPopup('fnGoodsDetailCodiGoods');
-	}
-
-	// 코디상품 조회 팝업 - 상품추가
-	var fnGoodsDetailCodiGoods = function(goodsData) {
-		if (goodsData.length < 1) return;
-		
-		// 기존상품
-		var oldCodiGoodsList = gagaAgGrid.getAllRowData(gridCodiGoodsOptions);
-		var idx = oldCodiGoodsList.length+1; 
-		var goodsCd = $('#goodsDetailForm input[name=goodsCd]').val();
-		var isExist = false;
-		goodsData.forEach(function(goods){
-			isExist = false;
-
-			gridCodiGoodsOptions.api.forEachNode(function(rowNode, index) {
-
-				if (goods.goodsCd == rowNode.data.codiGoodsCd){
-					isExist = true;
-				}
-			});
-			
-			if (goods.goodsCd == goodsCd) {
-				isExist = true;
-			}
-			
-			if(!isExist){
-				
-				var data = { 
-						  goodsCd : goodsCd
-						, codiGoodsCd: goods.goodsCd
-						, dispOrd: idx
-						, delYn: 'N'
-						, goodsStat : goods.goodsStat
-						, goodsNm : goods.goodsNm
-						, currPrice : goods.currPrice
-						, formalGb : goods.formalGb
-						, imgType : goods.imgType
-						, imgPath1 : goods.imgPath1
-						, imgPath6 : goods.imgPath6
-						};
-				gridCodiGoodsOptions.api.updateRowData({add: [data], addIndex: idx});
-				
-				idx++;
-				$('#goodsDetailForm').find('.tabs .tabsNav li:eq(4) a').attr("style", "color:red;");
-			
-			}
-		});
-		gridGoodsComposeOptions.api.refreshCells();
-	}
-
-	// 코디 상품 삭제
-	$('#btnCodiGoodsDelete').on('click', function() {
-		var selectedData = gridCodiGoodsOptions.api.getSelectedRows();
-		if (selectedData.length == 0) {
-			mcxDialog.alert('선택된 행이 없습니다.');
-			return;
-		}
-
-		//화면에서 삭제
-		var removedData = gagaAgGrid.removeRowData(gridCodiGoodsOptions, false);
-		
-		if (removedData.length > 0) {
-
-			mcxDialog.confirm('삭제하시겠습니까?', {
-				cancelBtnText: "취소",
-				sureBtnText: "확인",
-				sureBtnClick: function(){
-					var deleteData = [];
-
-					$.each(removedData, function(idx, item) {
-						deleteData.push(item);
-					});
-
-					var jsonData = JSON.stringify(deleteData);
-					gagajf.ajaxJsonSubmit('/goods/codi/delete', jsonData);
-				}
-			});
-		}
-	});
-	
 	//엑셀 상품 조회
 	$('#btnGoodsDealSearchExcel').on('click', function() {
 		cfnExcelUploadPopup('goodsDetailExcelUpload', 'goodsDetailExcelUpload');
@@ -2009,7 +1868,6 @@
 	$(document).ready(function() {
 
 		gagaAgGrid.createGrid('gridGoodsHstoryList', gridGoodsHstoryOptions);
-		gagaAgGrid.createGrid('gridGoodsCodiList', gridCodiGoodsOptions);
 		gagaAgGrid.createGrid('gridGoodsComposeList', gridGoodsComposeOptions);
 
 		fnGoodsDeailSearch();