Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -2700,9 +2700,8 @@ public class TsaGoodsService {
 			FreeGoods freeGoods = new FreeGoods();
 			freeGoods.setProductNo(wmsGoods.getProductNo());
 			freeGoods.setProductCode(wmsGoods.getProductCode());
-			freeGoods.setGoodsNum(wmsGoods.getModelNo());
+			freeGoods.setGoodsNm(wmsGoods.getModelNo());
 			freeGoods.setBrandCd(wmsGoods.getBrandCd());
-			freeGoods.setGoodsNm(wmsGoods.getProductName());
 			freeGoods.setUseYn("Y");
 			freeGoods.setUpdNo(TsaSession.getInfo().getUserNo());
 			freeGoods.setRegNo(TsaSession.getInfo().getUserNo());

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

@@ -16,7 +16,7 @@ public class FreeGoods extends TscBaseDomain {
 
 	private Integer productNo;		//사은품 상품 번호 - ProductNo(WMS)
 	private String productCode;		//ProductCode(WMS)
-	private String goodsNum;		//품번
+	//private String goodsNum;		//품번
 	private String brandCd;			//브랜드코드
 	private String goodsNm;			//상품명
 	private String useYn;			//사용여부

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

@@ -388,20 +388,20 @@
 		               SELECT SUM(RM_PNT_AMT)
 		               FROM   TB_CUST_POINT
 		               WHERE  CUST_NO = C.CUST_NO
-		               AND    EXP_BE_DT <![CDATA[<]]> NOW()
-		               AND    EXP_CMP_DT IS NOT NULL
+		               AND    (EXP_BE_DT <![CDATA[<]]> NOW() OR EXP_CMP_DT IS NOT NULL)
 		               ), 0)                           AS EXPIRE_PNT_AMT -- 소멸포인트
 		     , IFNULL((
 		               SELECT SUM(CPH.PNT_AMT) AS PNT_AMT
 		               FROM   TB_CUST_POINT_HST CPH
-		               WHERE  CPH.OCCUR_GB IN ('G069_12', 'G069_13')             -- 적립예정, 적립취소
+		               WHERE  CPH.CUST_NO = C.CUST_NO
 		               AND    CPH.PNT_UPLOAD_STAT IN ('G070_10')                 -- 반영예정
-		               AND    CPH.CUST_NO = #{custNo}
-		               ), 0)                           AS EXPECTED_PNT_AMT -- 적립예정포인트
+		               AND    CPH.OCCUR_GB IN ('G069_12', 'G069_13')             -- 적립예정, 적립취소
+		               ), 0)                           AS EXPECTED_PNT_AMT       -- 적립예정포인트
 		     , IFNULL((
 		               SELECT SUM(RM_PNT_AMT) AS RM_PNT_AMT
 		               FROM  TB_CUST_POINT
-		               WHERE EXP_BE_DT > NOW()
+		               WHERE CUST_NO = C.CUST_NO
+		               AND   EXP_BE_DT > NOW()
 		               AND   EXP_BE_DT <![CDATA[<]]> DATE_ADD(NOW(),INTERVAL 31 DAY)
 		                ), 0)                          AS EXPECTED_EXPIRE_PNT_AMT -- 소멸예정포인트(30일)
 		FROM   TB_CUSTOMER C

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

@@ -3635,7 +3635,6 @@
 		/* TsaGoods.getFreeGoodsList */
 		SELECT G.PRODUCT_NO 
 		     , G.PRODUCT_CODE 
-		     , G.GOODS_NUM 
 		     , G.GOODS_NM 
 		     , G.USE_YN 
 		     , G.SYS_IMG_NM 
@@ -3792,7 +3791,6 @@
 		INSERT INTO TB_FREE_GOODS (
 		       PRODUCT_NO
 		     , PRODUCT_CODE
-		     , GOODS_NUM
 		     , BRAND_CD
 		     , GOODS_NM
 		     , USE_YN
@@ -3805,7 +3803,6 @@
 		VALUES (
 		       #{productNo}
 		     , #{productCode}
-		     , #{goodsNum}
 		     , #{brandCd}
 		     , #{goodsNm}
 		     , #{useYn}

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

@@ -453,7 +453,7 @@
 		/* TsaPlan.deletePlanBrand */
 		DELETE 
 		FROM TB_PLAN_BRAND
-		WHERE PLAN_SQ = ${planSq}
+		WHERE PLAN_SQ = #{planSq}
 	</delete>
 	
 	<insert id="createPlanAfChannel" parameterType="Plan">
@@ -564,7 +564,7 @@
 		/* TsaPlan.deletePlanCate */
 		DELETE 
 		FROM TB_PLAN_CATE
-		WHERE PLAN_SQ = ${planSq}
+		WHERE PLAN_SQ = #{planSq}
 	</delete>
 	
 	<select id="getPlanCateList" parameterType="Plan" resultType="Plan">

src/main/webapp/WEB-INF/views/business/SupplyCompanyForm.html

@@ -661,7 +661,7 @@
 					params.delvFeeCrite = $(this).find('select[name=delvFeeCrite]').val();
 					params.minOrdAmt = $(this).find('input[name=minOrdAmt]').val();
 					params.delvFee = $(this).find('input[name=delvFee]').val();
-					params.rtnDelvFee = $(this).find('select[name=rtnDelvFee]').val();
+					params.rtnDelvFee = $(this).find('input[name=rtnDelvFee]').val();
 					params.useYn = $(this).find('select[name=useYn]').val();
 					params.distributionGb = $('#detailForm select[name=distributionGb]').val();
 					arrData.push(params);

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

@@ -66,6 +66,7 @@
 									<option value="">ALL</option>
 									<option value="P">웹</option>
 									<option value="M">모바일</option>
+									<option value="A">앱</option>
 							</select></td>
 
 							<th>기획전구분</th>
@@ -73,6 +74,8 @@
 									<option value="">전체</option>
 									<option value="P">기획전</option>
 									<option value="E">이벤트</option>
+									<option value="C">출석체크</option>
+									<option value="S">총알배송</option>
 							</select></td>
 							
 							<th>오픈여부</th>