Merge branch 'develop' into bin2107

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

@@ -5,6 +5,7 @@ import com.style24.admin.biz.dao.TsaCustomerDao;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.support.env.TscConstants;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.domain.Counsel;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustContactHst;
@@ -88,7 +89,7 @@ public class TsaCustomerService {
 		Integer userNo = TsaSession.getInfo().getUserNo();
 		customer.setRegNo(userNo);
 		customer.setUpdNo(userNo);
-
+		customer.encryptData();  // 암호화 처리
 		// 고객 이력 생성
 		coreCustomerService.createCustomerHistory(customer);
 

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

@@ -870,7 +870,7 @@ public class TsaGoodsService {
 			String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
 			Goods tmpGoods = goodsDao.getGoods(goods);
 			if (tmpGoods != null && !StringUtils.isBlank(tmpGoods.getGoodsSnm1())) {
-				String[] arrGoodsSnm = tmpGoods.getGoodsSnm1().split(";");
+				String[] arrGoodsSnm = tmpGoods.getGoodsSnm1().split("\\;");
 				StringBuilder tempGoodsSnm = new StringBuilder();
 				for (String loopGoodsSnm : arrGoodsSnm) {
 					if (goodsSnm.toUpperCase().indexOf(loopGoodsSnm.toUpperCase()) <= -1) {
@@ -977,7 +977,7 @@ public class TsaGoodsService {
 		String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
 		if (!StringUtils.isBlank(goods.getGoodsSnm1())) {
 			goods.setGoodsSnm1(GagaStringUtil.replace(goods.getGoodsSnm1(), " ", "")); // 빈값 삭제
-			String[] arrGoodsSnm = goods.getGoodsSnm1().split(";");
+			String[] arrGoodsSnm = goods.getGoodsSnm1().split("\\;");
 			StringBuilder tempGoodsSnm = new StringBuilder();
 			for (String loopGoodsSnm : arrGoodsSnm) {
 				if (goodsSnm.toUpperCase().indexOf(loopGoodsSnm.toUpperCase()) <= -1) {
@@ -2740,7 +2740,7 @@ public class TsaGoodsService {
 		GoodsMass goodsMass = mapper.convertValue(gagaMap, GoodsMass.class);
 
 		if (StringUtils.isBlank(goodsMass.getGoodsCd())) {
-			throw new IllegalStateException("상품코드가 없습니다.");
+			throw new IllegalStateException("상품코드는 필수입니다.");
 		}
 
 		// 상품기본정보
@@ -2760,6 +2760,14 @@ public class TsaGoodsService {
 			return goods.getGoodsStat();
 		}
 
+		// 옵션
+		if (!UPDATE_NO_PATTERN.equals(goodsMass.getOptStr().trim())) {
+			goods.setGoodsRegMsg("옵션은 변경할 수 없습니다.");
+			goods.setGoodsStat("10");
+			this.setGoodsRegResult(goods, goodsMass, procJob);
+			return goods.getGoodsStat();
+		}
+
 		// 상품 고시
 		Collection<GoodsNotiInfo> newGoodsNotiList = new ArrayList<>(); //적용할 고시 정보
 		goods = this.getUpdateMassGoodsNotiCheck(goods, gagaMap, goodsOrigin, newGoodsNotiList);
@@ -2796,7 +2804,7 @@ public class TsaGoodsService {
 				// 사용자 검색어를 검색어에 적용
 				String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
 
-				String[] arrGoodsSnm = goods.getGoodsSnm1().split(";");
+				String[] arrGoodsSnm = goods.getGoodsSnm1().split("\\;");
 				StringBuilder tempGoodsSnm = new StringBuilder();
 				for (String loopGoodsSnm : arrGoodsSnm) {
 					if (goodsSnm.toUpperCase().indexOf(loopGoodsSnm.toUpperCase()) <= -1) {

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

@@ -313,7 +313,6 @@ public class TsaCustomerController extends TsaBaseController {
 	public GagaMap getCustomerActiveList(@RequestBody CustomerSearch customerSearch) {
 		GagaMap result = new GagaMap();
 		customerSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
-		log.info("customerSearch.toString() {}", customerSearch.toString());
 		customerSearch.setPageable(new TscPageRequest(customerSearch.getPageNo()-1, customerSearch.getPageSize()));
 		customerSearch.getPageable().setTotalCount(customerService.getCustomerActiveListCount(customerSearch));
 		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
@@ -412,7 +411,6 @@ public class TsaCustomerController extends TsaBaseController {
 	@ResponseBody
 	public Customer getCustomerInfo(@PathVariable Integer custNo) {
 		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
-
 		return customerService.getCustomerInfo(custNo);
 	}
 
@@ -730,11 +728,6 @@ public class TsaCustomerController extends TsaBaseController {
 	@PostMapping("/delivery/addr/save")
 	@ResponseBody
 	public GagaResponse saveCustomerDeliveryAddr(@RequestBody Delivery delivery) {
-		delivery.setRecipNm(CryptoUtils.encryptAES(delivery.getRecipNm()));
-		delivery.setRecipTelno(CryptoUtils.encryptAES(delivery.getRecipTelno()));
-		delivery.setRecipPhnno(CryptoUtils.encryptAES(delivery.getRecipPhnno()));
-		delivery.setRecipDtlAddr(CryptoUtils.encryptAES(delivery.getRecipDtlAddr()));
-		delivery.setRecipBaseAddr(CryptoUtils.encryptAES(delivery.getRecipBaseAddr()));
 		customerService.saveCustomerDeliveryAddr(delivery);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}

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

@@ -2566,7 +2566,7 @@ public class TsaGoodsController extends TsaBaseController {
 		String[] goodsNames = {"goodsCd", "goodsNm", "goodsTnm", "goodsSnm1", "itemkindCd", "seasonCd",
 			"sexGb", "currPrice", "sellFeeRate", "goodsGb", "formalGb", "minOrdQty", "maxOrdQty", "dayMaxOrdQty",
 			"giftPackYn", "newCustOrdYn","pntPrate","prePpntUsableYn", "pntMrate","preMpntUsableYn",
-			"returnableYn", "changeableYn","taxGb", "ageGrpCd", "adultYn", "delvFeeCd", "goodsContent",
+			"returnableYn", "changeableYn","taxGb", "ageGrpCd", "adultYn", "delvFeeCd", "optStr", "goodsContent",
 			"niClsfCd", "niContent1", "niContent2",
 			"niContent3", "niContent4", "niContent5", "niContent6", "niContent7", "niContent8", "niContent9",
 			"niContent10", "niContent11", "niContent12", "niContent13", "niContent14", "niContent15", "niContent16",

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

@@ -219,17 +219,17 @@
 		    <if test="homeZipcode != null and homeZipcode != ''">
 		    , HOME_ZIPCODE = #{homeZipcode}
 		    </if>
-		    <if test="homeBaseAddr != null and homeBaseAddr != ''">
-		    , HOME_BASE_ADDR = #{homeBaseAddr}
+		    <if test="encodedHomeBaseAddr != null and encodedHomeBaseAddr != ''">
+		    , HOME_BASE_ADDR = #{encodedHomeBaseAddr}
 		    </if>
-		    <if test="homeDtlAddr != null and homeDtlAddr != ''">
-		    , HOME_DTL_ADDR = #{homeDtlAddr}
+		    <if test="encodedHomeDtlAddr != null and encodedHomeDtlAddr != ''">
+		    , HOME_DTL_ADDR = #{encodedHomeDtlAddr}
 		    </if>
-		    <if test="birthYmd != null and birthYmd != ''">
-		    , BIRTH_YMD = REPLACE(#{birthYmd}, '-', '')
+		    <if test="encodedBirthYmd != null and encodedBirthYmd != ''">
+		    , BIRTH_YMD = REPLACE(#{encodedBirthYmd}, '-', '')
 		    </if>
-		    <if test="email != null and email != ''">
-		    , EMAIL = #{email}
+		    <if test="encodedEmail != null and encodedEmail != ''">
+		    , EMAIL = #{encodedEmail}
 		    </if>
 		    <if test="managedRsn != null and managedRsn != ''">
 		    , MANAGED_DT = CASE WHEN MANAGED_RSN = #{managedRsn}

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -14,7 +14,7 @@
  * 1.0  2021.01.18   jsshin     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1600">
+<div class="modalPopup" data-width="1820" data-height="750">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -1000,6 +1000,7 @@
 			return;
 		}
 
+		// 마케팅 수신여부가 기존하고 바꼈는지 확인
 		// 데이터 변경 없으면 공배처리
 		if (customer.emailAgreeYn === orgData.emailAgreeYn) {
 			customer.emailAgreeYn = '';
@@ -1009,8 +1010,6 @@
 			customer.smsAgreeYn = '';
 		}
 
-		// 마케팅 수신여부가 기존하고 바꼈는지 확인
-
 
 		mcxDialog.confirm("기본정보를 수정 하시겠습니까?", {
 			cancelBtnText: "취소",

src/main/webapp/WEB-INF/views/goods/NotiinfoForm.html

@@ -42,7 +42,7 @@
 				<li class="boxContentTop">
 					<table class="w100p">
 						<colgroup>
-							<col style="width:39%;"/>
+							<col style="width:45%;"/>
 							<col style="width:2%;"/>
 							<col/>
 							<col style="width:10%;"/>
@@ -103,18 +103,6 @@
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 500, required: true }
 		},
-		{headerName: "필수여부", field: "reqYn" , width: 110, cellClass: 'text-center',editable: false,
-			cellEditor: 'agRichSelectCellEditor',
-			cellEditorParams: { values: gagaAgGrid.extractValues(useYnList), required: true },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(useYnList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(useYnList, params.newValue); }
-		},
-		{headerName: "노출여부", field: "dispYn" , width: 110, cellClass: 'text-center',editable: true,
-			cellEditor: 'agRichSelectCellEditor',
-			cellEditorParams: { values: gagaAgGrid.extractValues(useYnList), required: true },
-			valueFormatter: function (params) { return gagaAgGrid.lookupValue(useYnList, params.value); },
-			valueParser: function (params) { return gagaAgGrid.lookupKey(useYnList, params.newValue); }
-		},
 		{headerName: "노출순서", field: "dispOrd" , width: 110, cellClass: 'text-center',editable: true,
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 3, validType: 'integer', required: true }