Merge branch 'develop' into order

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

@@ -253,6 +253,7 @@ public class TsaMorebetterService {
         moreBetterGoods.setMultiBrand(moreBetter.getMultiBrand());
         moreBetterGoods.setMultiApplyGoods(moreBetter.getMultiApplyGoods());
         moreBetterGoods.setMultiExceptGoods(moreBetter.getMultiExceptGoods());
+        moreBetterGoods.setSectionGb(moreBetter.getSectionGb());
         morebetterDao.insertMorebetterApplyGoods(moreBetterGoods);
 
         log.info("newBurdenSq = {}, newTmtbSq = {}, newSupplyCd = {}, newBurdenRate = {} , newUseYn = {}");

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

@@ -403,9 +403,9 @@
 	<select id="getGoodsList" parameterType="GoodsSearch" resultType="Goods">
 		/* TsaGoods.getGoodsList */
 		SELECT Q.*
-		    , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
-		            ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
-		            END) AS STOCK_QTY_SUM
+		  --  , (CASE WHEN Q.GOODS_TYPE = 'G056_N' THEN (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK WHERE GOODS_CD = Q.GOODS_CD) 
+		  --          ELSE (SELECT IFNULL(SUM(CURR_STOCK_QTY - BASE_STOCK_QTY),0) FROM VW_STOCK_COMPOSE WHERE GOODS_CD = Q.GOODS_CD) 
+		  --          END) AS STOCK_QTY_SUM
 		    , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = Q.ITEMKIND_CD ) AS ITEMKIND_NM
 		    , FN_GET_USER_NM(REG_NO) AS REG_NM
 		    , FN_GET_USER_NM(UPD_NO) AS UPD_NM
@@ -413,7 +413,7 @@
 		    , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = Q.GOODS_CD AND COLOR_CD = Q.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
 		            WHEN 0 THEN 'N'
 		            ELSE 'Y' END AS GOODS_IMAGE_YN
-		    , FN_GET_BENEFIT_PRICE('P',Q.GOODS_CD, Q.CURR_PRICE,'') AS BENEFIT_PRICE
+		    , IFNULL(GB.PC_CURR_PRICE, Q.CURR_PRICE)  AS BENEFIT_PRICE
 		FROM (     
 		SELECT Z.*
 		FROM (

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

@@ -665,10 +665,12 @@
 		) Z
 		WHERE	1=1
 		AND 	Z.GOODS_CD NOT IN (
-									SELECT	b.TARGET_VAL
+									SELECT	B.GOODS_CD
 									FROM 	TB_TMTB A
-									LEFT OUTER JOIN TB_TMTB_GOODS B
-									ON A.TMTB_SQ = B.TMTB_SQ
+									INNER   JOIN TB_TMTB_SECTION TS
+									ON      A.TMTB_SQ = TS.TMTB_SQ
+									INNER   JOIN TB_TMTB_APPLY_GOODS B
+									ON      A.TMTB_SQ = B.TMTB_SQ
 									WHERE	A.TMTB_ST_DT <![CDATA[<=]]> NOW()
 									AND 	A.TMTB_ED_DT <![CDATA[>=]]> NOW()
 									AND 	A.TMTB_STAT = 'G232_11'
@@ -676,6 +678,7 @@
 									AND     A.TMTB_SQ <![CDATA[<>]]> #{tmtbSq}
 									</if>
 									AND 	B.GOODS_GB <![CDATA[<>]]> 'G800_30'
+		                            AND     TS.SECTION_GB = #{sectionGb}
 								)
 	</insert>
 

src/main/resources/config/application-style.yml

@@ -8,10 +8,23 @@ spring:
                 max-active: 10
                 max-idle: 10
                 min-idle: 2
-        host: 172.30.87.5
+#        host: 172.30.87.5
+#        port: 6379
+#        password: MdxpyGtipZSci6VhTpFdklXxb4Qv7zxEq3Jqg3ULekg=
+        host: 172.30.90.111
         port: 6379
-        password: MdxpyGtipZSci6VhTpFdklXxb4Qv7zxEq3Jqg3ULekg=
-
+        password:
+        cluster:
+            nodes:
+                172.30.90.111:6379
+                172.30.90.112:6379
+                172.30.90.113:6379
+                172.30.90.111:6380
+                172.30.90.112:6380
+                172.30.90.113:6380
+                172.30.90.111:6381
+                172.30.90.112:6381
+                172.30.90.113:6381
 logging:
     config: classpath:log/logback-run.xml
 

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -791,7 +791,7 @@
 		$("#mcTable"+tableDataId).find("tr[name=titlePopRow]").find("input[name=title]").val(result[0].planNm);
 		$("#mcTable"+tableDataId).find("tr[name=subTextPopRow]").find("input[name=subText]").val(result[0].dtlTitle1);
 		$("#mcTable"+tableDataId).find("tr[name=linkPopRow]").find("input[name=link]").val('/planning/detail/form?planSq='+result[0].planSq);
-		$("#mcTable"+tableDataId).find("tr[name=imgPopRow]").find("input[name=newImgFile]").val(result[0].mainPimg);
+		$("#mcTable"+tableDataId).find("tr[name=imgPopRow]").find("input[name=imgPath]").val(result[0].mainPimg);
 		$("#mcTable"+tableDataId).find("#bannerPreViewUrlPop_"+tableDataId).attr('src',$("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
 		$("#mcTable"+tableDataId).find("#imgViewPop_"+tableDataId).removeClass("off").addClass("on");
 

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

@@ -471,7 +471,7 @@
 			}
 		},
 		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-center'},
-		{headerName: "판매가능재고", field: "stockQtySum", width: 120, cellClass: 'text-right',
+		/* {headerName: "판매가능재고", field: "stockQtySum", width: 120, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();},
 			cellStyle : function(params){
 				if ("00" == params.data.goodsStat  || "10" == params.data.goodsStat || "20" == params.data.goodsStat || "30" == params.data.goodsStat) {
@@ -483,7 +483,7 @@
 				}
 				return { 'background-color': color};
 			} 
-		},
+		}, */
 		{headerName: "상품상태", field: "goodsStat" , width: 100, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(goodsStatList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsStatList, params.value); },

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

@@ -1749,7 +1749,14 @@
 			$('#CouponForm .dcCdCheck2').hide();
 			$('#CouponForm .maxDcAmtArea').hide();
 			$('#CouponForm .availDateTr').show();
+			$("#CouponForm input:radio[name='rdoApplyScope']:radio[value=I]").prop('checked', true);
+			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('disabled', true);
+			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('readonly', true);
 		}else{
+			$("#CouponForm input:radio[name='rdoApplyScope']:radio[value=A]").prop('checked', true);
+			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('disabled', false);
+			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('readonly', false);
+
 			if(radioValue == 'G230_11'){ // 상품쿠폰일때 선착순쿠폰 등록 가능
 				$('#CouponForm .limitedTimeCpnArea').show();
 			}else{
@@ -1801,11 +1808,11 @@
 			}
 		}
 
-		// 즉시할인쿠폰만 전체/개별, 나머진 개별
+		// 즉시할인쿠폰만 개별, 나머진 전체/개별
 		if(radioValue == 'G230_10') {
-			$("input:radio[name='rdoApplyScope']:radio[value='A']").prop('checked', true);
-		} else {
 			$("input:radio[name='rdoApplyScope']:radio[value='I']").prop('checked', true);
+		} else {
+			$("input:radio[name='rdoApplyScope']:radio[value='A']").prop('checked', true);
 		}
 
 		// 주문서 쿠폰 선택시 결제수단 노출
@@ -2455,6 +2462,9 @@
 				$('#CouponForm .dcCdCheck2').hide();
 				$('#CouponForm .maxDcAmtArea').hide();
 				// $("#CouponForm #afLinkCd").attr('disabled', true);
+				$("#CouponForm input:radio[name='rdoApplyScope']:radio[value=I]").prop('checked', true);
+				$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('disabled', true);
+				$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('readonly', true);
 			}
 			$("#btnCouponSave").show();	// 저장버튼
 			$("#CouponForm .buttonSpan").show();
@@ -2476,6 +2486,10 @@
 				$("#CouponForm .buttonSpan").hide();	//행추가,삭제버튼
 			}
 
+			if($("#CouponForm input[name=rdoDcWay]:checked").val() == 'G240_10'){
+				$("#CouponForm .maxDcAmtArea").hide();
+			}
+
 			// 사용가능고객구분 체크박스 체크 제거
 			$('#CouponForm input:checkbox[name=usableCustGbArr]').prop('checked', false);
 			if(cpnCustGbList.length > 0){