총알배송,포인트 수정

src/main/java/com/style24/front/biz/dao/TsfPlanningDao.java

@@ -223,14 +223,24 @@ public interface TsfPlanningDao {
 	Collection<Plan> getPlanEventList(Plan plan);
 
 	/**
-	 * 총알배송 html 소스 
+	 * 총알배송 상단 html 소스 
 	 *
 	 * @param plan
 	 * @return plan
 	 * @author sowon
 	 * @date 2021. 3. 30
 	 */
-	Plan getShotDeliveryHtml(Plan plan);
+	Plan getShotDeliveryHtmlTop(Plan plan);
+	
+	/**
+	 * 총알배송 하단 html 소스 
+	 *
+	 * @param plan
+	 * @return plan
+	 * @author sowon
+	 * @date 2021. 3. 30
+	 */
+	Plan getShotDeliveryHtmlBtm(Plan plan);
 	
 	/**
 	 * 설문조사 정보

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -319,17 +319,30 @@ public class TsfPlanningService {
 	}
 	
 	/**
-	 * 총알배송 html 소스 
+	 * 총알배송 상단 html 소스 
 	 *
 	 * @param plan
-	 * @return plan
+	 * @return Collection<Plan>
 	 * @author sowon
 	 * @date 2021. 3. 30
 	 */
-	public Plan getShotDeliveryHtml(Plan plan) {
-		return planningDao.getShotDeliveryHtml(plan);
+	public Plan getShotDeliveryHtmlTop(Plan plan) {
+		return planningDao.getShotDeliveryHtmlTop(plan);
 	}
 	
+	/**
+	 * 총알배송 하단 html 소스 
+	 *
+	 * @param plan
+	 * @return Collection<Plan>
+	 * @author sowon
+	 * @date 2021. 3. 30
+	 */
+	public Plan getShotDeliveryHtmlBtm(Plan plan) {
+		return planningDao.getShotDeliveryHtmlBtm(plan);
+	}
+	
+	
 	/**
 	 * 설문조사 정보
 	 *
@@ -573,11 +586,11 @@ public class TsfPlanningService {
 		
 		//이미지등록
 		Plan filePlan = new Plan();
-		if(!StringUtils.isAllEmpty(plan.getMultiReplyOrgFile())) {
+		if(!StringUtils.isAllEmpty(plan.getMultiReplySysFile())) {
 			filePlan.setRegNo(custNo);
 			filePlan.setPlanEntrySq(plan.getPlanEntrySq());
 			//파일아이템 등록
-			String[] fileItemVal1 = plan.getMultiReplyOrgFile();
+			String[] fileItemVal1 = plan.getMultiReplySysFile();
 			int ind = 1;
 			for (int j = 0; j < fileItemVal1.length; j++) {
 				String imgInd = String.valueOf(ind);

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -528,7 +528,8 @@ public class TsfPlanningController extends TsfBaseController {
 		
 		
 		mav.addObject("custAddr", planningService.getCustAddrInfo(addr));
-		mav.addObject("shotHtml", planningService.getShotDeliveryHtml(plan));
+		mav.addObject("shotHtmlTop", planningService.getShotDeliveryHtmlTop(plan));
+		mav.addObject("shotHtmlBtm", planningService.getShotDeliveryHtmlBtm(plan));
 		mav.setViewName(super.getDeviceViewName("planning/PlanningShotGuideForm"));
 		return mav;
 	}

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

@@ -1215,12 +1215,11 @@
 		                                     FROM TB_CUST_COUPON
 		                                    GROUP BY CPN_ID) CC2
 		                    ON C.CPN_ID = CC2.CPN_ID
-		               WHERE C.DOWN_ABL_YN = 'N'
-		                  AND C.CPN_ID IN (
+		               WHERE C.CPN_ID IN (
 		                                    SELECT PCI.ITEM_VAL 
 		                                    FROM TB_PLAN_CONTENTS_ITEM PCI 
 		                                    WHERE PCI.ITEM_VAL = #{cpnId}
-		                                  )
+		                                  ) 
 		                 AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
 		                 AND C.CPN_STAT = 'G232_11'  -- 진행
 		                 AND CASE WHEN C.TOT_PUB_LIMIT_QTY = 0 THEN 1
@@ -1318,7 +1317,7 @@
 		</if>
 		AND C.SITE_CD = #{siteCd}
 		AND C.CPN_TYPE IN ('G230_20','G230_30')
-		AND C.DOWN_ABL_YN = 'N'
+		AND C.DOWN_ABL_YN = 'Y'
 		AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
 		AND NOW()  <![CDATA[<=]]> IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
 		AND (CASE WHEN 'P' = 'P' THEN C.DC_PVAL

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

@@ -1049,7 +1049,8 @@
 		                         , CASE WHEN GB.BENEFIT_GB = '10' THEN '쿠폰할인'
 		                                WHEN GB.BENEFIT_GB = '20' THEN '무료배송'
 		                                WHEN GB.BENEFIT_GB = '30' THEN '사은품'
-		                                ELSE '신상'
+		                                WHEN GB.BENEFIT_GB = '40' THEN '신상'
+		                                ELSE '총알배송'
 		                           END                               AS BENEFIT_NM
 		                         , RANK() OVER(PARTITION BY PG.GOODS_CD
 		                                       ORDER BY GB.BENEFIT_GB
@@ -1097,13 +1098,14 @@
 		       ) Z
 	</select>
 	
-	<!-- 총알배송 html 소스  -->
-	<select id="getShotDeliveryHtml" parameterType="Plan" resultType="Plan">
+	<!-- 총알배송 상단 html 소스  -->
+	<select id="getShotDeliveryHtmlTop" parameterType="Plan" resultType="Plan">
 		/* TsfPlanning.getShotDeliveryHtml */
 		SELECT P.PLAN_SQ 
 		      ,P.PLAN_NM 
 		      ,PC.PLAN_CONT_SQ 
 		      ,PF.DISP_YN
+		      ,PF.FRONT_GB 
 		      ,PF.FSRC_PC 
 		      ,PF.FSRC_MOB 
 		FROM TB_PLAN P INNER JOIN TB_PLAN_CONTENTS PC ON P.PLAN_SQ = PC.PLAN_SQ 
@@ -1122,6 +1124,38 @@
 		            </if>
 		        </if>
 		  AND P.OPEN_YN ='Y'
+		  AND PF.FRONT_GB = 'T'
+		  AND PF.DISP_YN ='Y'
+		  AND P.SITE_CD = #{siteCd}
+	</select>
+	
+	<!-- 총알배송 하단 html 소스  -->
+	<select id="getShotDeliveryHtmlBtm" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getShotDeliveryHtml */
+		SELECT P.PLAN_SQ 
+		      ,P.PLAN_NM 
+		      ,PC.PLAN_CONT_SQ 
+		      ,PF.DISP_YN
+		      ,PF.FRONT_GB 
+		      ,PF.FSRC_PC 
+		      ,PF.FSRC_MOB 
+		FROM TB_PLAN P INNER JOIN TB_PLAN_CONTENTS PC ON P.PLAN_SQ = PC.PLAN_SQ 
+		                                              AND P.PLAN_SQ = PC.PLAN_SQ
+		               INNER JOIN TB_PLAN_FSRC PF ON P.PLAN_SQ = PF.PLAN_SQ 
+		                                              AND P.PLAN_SQ = PF.PLAN_SQ
+		WHERE 1=1
+		  AND P.PLAN_GB = 'S'
+		  AND P.DEL_YN = 'N'
+		        <if test="frontGb != null and frontGb != ''">
+		            <if test='frontGb == "P"'> <!-- PC웹 -->
+		        AND    P.FRONT_GB IN ('A','P')
+		            </if>
+		            <if test='frontGb == "A" or frontGb == "M"'> <!-- 모바일 -->
+		        AND    P.FRONT_GB IN ('A','M')
+		            </if>
+		        </if>
+		  AND P.OPEN_YN ='Y'
+		  AND PF.FRONT_GB = 'B'
 		  AND PF.DISP_YN ='Y'
 		  AND P.SITE_CD = #{siteCd}
 	</select>

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

@@ -47,173 +47,285 @@
 	<!-- 적립내역 조회-->
 	<select id="getAccumulatePointList" parameterType="Point" resultType="Point">
 	/* TsfPoint.getAccumulatePointList */
-		SELECT  CASE CPH.OCCUR_GB
-					WHEN 'G069_11' THEN '구매 취소'
-		            WHEN 'G069_12' THEN '상품 구매'
-		            WHEN 'G069_20' THEN '리뷰'
-		            WHEN 'G069_30' THEN '이벤트'
-		            WHEN 'G069_31' THEN '회원가입'
-		            WHEN 'G069_32' THEN '생일'
-		            WHEN 'G069_35' THEN 'APP'
-		            WHEN 'G069_37' THEN '이벤트'
-		            WHEN 'G069_41' THEN '구매 취소'
-		            WHEN 'G069_43' THEN '구매 취소'
-		            WHEN 'G069_44' THEN '관리자'
-		            WHEN 'G069_90' THEN '관리자'
-		       END                                          AS OCCUR_GB
-		    , CASE CPH.OCCUR_GB
-					WHEN 'G069_11' THEN G.GOODS_NM
-		            WHEN 'G069_12' THEN G.GOODS_NM
-		            WHEN 'G069_20' THEN G.GOODS_NM
-		            WHEN 'G069_30' THEN '이벤트'
-		            WHEN 'G069_31' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_32' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_35' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_37' THEN '출석체크'
-		            WHEN 'G069_41' THEN G.GOODS_NM
-		            WHEN 'G069_43' THEN FR.GOODS_NM
-		            WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
-		       END                                          AS  OCCUR_DTL_DESC
-		     , CPH.PNT_AMT
-		     , CPH.REG_DT AS PNT_UPLOAD_DT
-		FROM TB_CUST_POINT_HST CPH
-		LEFT JOIN TB_ORDER_DETAIL OD
-		ON  CPH.ORD_NO = OD.ORD_NO
-		AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
-		LEFT JOIN TB_GOODS G
-		ON  OD.GOODS_CD = G.GOODS_CD
-		LEFT JOIN (SELECT FG.GOODS_NM
-		                 ,OFV.ORD_NO 
-		           FROM TB_ORD_FREEGIFT_VAL OFV
-		           INNER JOIN TB_FREE_GOODS FG
-		           ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
-		           AND OFV.PRODUCT_NO = FG.PRODUCT_NO
-		           )FR ON CPH.ORD_NO = FR.ORD_NO
-
-		WHERE CPH.CUST_NO = #{custNo}
-		AND CPH.PNT_AMT > 0
-		AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
-		GROUP BY CPH.REG_DT
-		ORDER BY CPH.REG_DT DESC
+		SELECT Z.*
+		FROM (
+		       SELECT  CASE CPH.OCCUR_GB
+		                    WHEN 'G069_20' THEN '리뷰'
+		                    WHEN 'G069_30' THEN '이벤트'
+		                    WHEN 'G069_31' THEN '회원가입'
+		                    WHEN 'G069_32' THEN '생일'
+		                    WHEN 'G069_35' THEN 'APP'
+		                    WHEN 'G069_36' THEN '상품 구매'
+		                    WHEN 'G069_37' THEN '이벤트'
+		                    WHEN 'G069_40' THEN '상품 구매'
+		                    WHEN 'G069_41' THEN '구매 취소'
+		                    WHEN 'G069_42' THEN '사은품'
+		                    WHEN 'G069_43' THEN '사은품'
+		                    WHEN 'G069_44' THEN '관리자'
+		                    WHEN 'G069_45' THEN '관리자'
+		                    WHEN 'G069_46' THEN '적립취소'
+		                    WHEN 'G069_90' THEN '기타'
+		                    WHEN 'G069_99' THEN '소멸'
+		                    END                                          AS OCCUR_GB
+		               ,CASE CPH.OCCUR_GB
+		                   WHEN 'G069_20' THEN G.GOODS_NM
+		                   WHEN 'G069_30' THEN '이벤트'
+		                   WHEN 'G069_31' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_32' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_35' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_36' THEN G.GOODS_NM
+		                   WHEN 'G069_37' THEN '출석체크'
+		                   WHEN 'G069_40' THEN G.GOODS_NM
+		                   WHEN 'G069_41' THEN G.GOODS_NM
+		                   WHEN 'G069_42' THEN FR.GOODS_NM
+		                   WHEN 'G069_43' THEN FR.GOODS_NM
+		                   WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_45' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_99' THEN '유효기간 경과 소멸'
+		                   END                                          AS  OCCUR_DTL_DESC
+		            , CPH.PNT_AMT
+		            , CPH.UPD_DT AS PNT_UPLOAD_DT
+		       FROM TB_CUST_POINT_HST CPH
+		       LEFT JOIN TB_ORDER_DETAIL OD
+		       ON  CPH.ORD_NO = OD.ORD_NO
+		       AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
+		       LEFT JOIN TB_GOODS G
+		       ON  OD.GOODS_CD = G.GOODS_CD
+		       LEFT JOIN (SELECT FG.GOODS_NM
+		                        ,OFV.ORD_NO
+		                  FROM TB_ORD_FREEGIFT_VAL OFV
+		                  INNER JOIN TB_FREE_GOODS FG
+		                  ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		                  AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		                  )FR ON CPH.ORD_NO = FR.ORD_NO
+		       WHERE CPH.CUST_NO = #{custNo}
+		       AND CPH.OCCUR_GB NOT IN ('G069_12','G069_13')
+		       AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
+		       AND CPH.PNT_AMT <![CDATA[>]]> 0
+		UNION ALL
+		      SELECT  CASE CPH.OCCUR_GB
+		                  WHEN 'G069_12' THEN '상품 구매'
+		                  WHEN 'G069_13' THEN '구매 취소'
+		                 END                                          AS OCCUR_GB
+		            , CASE CPH.OCCUR_GB
+		                  WHEN 'G069_12' THEN G.GOODS_NM
+		                  WHEN 'G069_13' THEN G.GOODS_NM
+		                 END                                          AS  OCCUR_DTL_DESC
+		           , SUM(CPH.PNT_AMT)
+		           , CPH.UPD_DT AS PNT_UPLOAD_DT
+		      FROM TB_CUST_POINT_HST CPH
+		      LEFT JOIN TB_ORDER_DETAIL OD
+		      ON  CPH.ORD_NO = OD.ORD_NO
+		      AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
+		      LEFT JOIN TB_GOODS G
+		      ON  OD.GOODS_CD = G.GOODS_CD
+		      LEFT JOIN (SELECT FG.GOODS_NM
+		                       ,OFV.ORD_NO
+		                 FROM TB_ORD_FREEGIFT_VAL OFV
+		                 INNER JOIN TB_FREE_GOODS FG
+		                 ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		                 AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		                 )FR ON CPH.ORD_NO = FR.ORD_NO
+		      WHERE CPH.CUST_NO = #{custNo}
+		        AND CPH.SWITCH_DUE_DT IS NOT NULL
+		        AND CPH.OCCUR_GB IN ('G069_12','G069_13')
+		        AND CPH.PNT_UPLOAD_STAT = 'G070_30'
+		        AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
+		        AND CPH.PNT_AMT <![CDATA[>]]> 0
+		) Z
+		WHERE Z.PNT_UPLOAD_DT IS NOT NULL
+		ORDER BY Z.PNT_UPLOAD_DT DESC	
 	</select>
 	
 	<!-- 사용내역 조회-->
 	<select id="getUsePointList" parameterType="Point" resultType="Point">
 	/* TsfPoint.getUsePointList */
-		SELECT  CASE CPH.OCCUR_GB
-		            WHEN 'G069_10' THEN '상품 구매'
-		            WHEN 'G069_13' THEN '구매 취소'
-		            WHEN 'G069_21' THEN '리뷰'
-		            WHEN 'G069_36' THEN '상품 구매'
-		            WHEN 'G069_40' THEN '상품 구매'
-		            WHEN 'G069_42' THEN '사은품'
-		            WHEN 'G069_46' THEN '적립취소'
-		            WHEN 'G069_90' THEN '관리자'
-		            WHEN 'G069_99' THEN '소멸'
-		       END                                          AS OCCUR_GB
-		     , CASE CPH.OCCUR_GB
-		            WHEN 'G069_10' THEN G.GOODS_NM
-		            WHEN 'G069_13' THEN G.GOODS_NM
-		            WHEN 'G069_21' THEN G.GOODS_NM
-		            WHEN 'G069_36' THEN G.GOODS_NM
-		            WHEN 'G069_40' THEN G.GOODS_NM
-		            WHEN 'G069_42' THEN FR.GOODS_NM
-		            WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_99' THEN '유효기간 경과 소멸'
-		       END                                          AS  OCCUR_DTL_DESC
-		     , CPH.PNT_AMT
-		     , CPH.REG_DT AS PNT_UPLOAD_DT
-		FROM TB_CUST_POINT_HST CPH
-		LEFT JOIN TB_ORDER_DETAIL OD
-		ON  CPH.ORD_NO = OD.ORD_NO
-		AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
-		LEFT JOIN TB_GOODS G
-		ON  OD.GOODS_CD = G.GOODS_CD
-		LEFT JOIN (SELECT FG.GOODS_NM
-		                 ,OFV.ORD_NO 
-		           FROM TB_ORD_FREEGIFT_VAL OFV
-		           INNER JOIN TB_FREE_GOODS FG
-		           ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
-		           AND OFV.PRODUCT_NO = FG.PRODUCT_NO
-		           )FR ON CPH.ORD_NO = FR.ORD_NO
-		WHERE CPH.CUST_NO = #{custNo}
-		AND CPH.PNT_AMT <![CDATA[<]]> 0
-		AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
-		GROUP BY CPH.ORD_NO, CPH.REG_DT
-		ORDER BY CPH.REG_DT DESC
+		SELECT Z.*
+		FROM (
+		       SELECT  CASE CPH.OCCUR_GB
+		                    WHEN 'G069_20' THEN '리뷰'
+		                    WHEN 'G069_30' THEN '이벤트'
+		                    WHEN 'G069_31' THEN '회원가입'
+		                    WHEN 'G069_32' THEN '생일'
+		                    WHEN 'G069_35' THEN 'APP'
+		                    WHEN 'G069_36' THEN '상품 구매'
+		                    WHEN 'G069_37' THEN '이벤트'
+		                    WHEN 'G069_40' THEN '상품 구매'
+		                    WHEN 'G069_41' THEN '구매 취소'
+		                    WHEN 'G069_42' THEN '사은품'
+		                    WHEN 'G069_43' THEN '사은품'
+		                    WHEN 'G069_44' THEN '관리자'
+		                    WHEN 'G069_45' THEN '관리자'
+		                    WHEN 'G069_46' THEN '적립취소'
+		                    WHEN 'G069_90' THEN '기타'
+		                    WHEN 'G069_99' THEN '소멸'
+		                    END                                          AS OCCUR_GB
+		               ,CASE CPH.OCCUR_GB
+		                   WHEN 'G069_20' THEN G.GOODS_NM
+		                   WHEN 'G069_30' THEN '이벤트'
+		                   WHEN 'G069_31' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_32' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_35' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_36' THEN G.GOODS_NM
+		                   WHEN 'G069_37' THEN '출석체크'
+		                   WHEN 'G069_40' THEN G.GOODS_NM
+		                   WHEN 'G069_41' THEN G.GOODS_NM
+		                   WHEN 'G069_42' THEN FR.GOODS_NM
+		                   WHEN 'G069_43' THEN FR.GOODS_NM
+		                   WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_45' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_99' THEN '유효기간 경과 소멸'
+		                   END                                          AS  OCCUR_DTL_DESC
+		            , CPH.PNT_AMT
+		            , CPH.UPD_DT AS PNT_UPLOAD_DT
+		       FROM TB_CUST_POINT_HST CPH
+		       LEFT JOIN TB_ORDER_DETAIL OD
+		       ON  CPH.ORD_NO = OD.ORD_NO
+		       AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
+		       LEFT JOIN TB_GOODS G
+		       ON  OD.GOODS_CD = G.GOODS_CD
+		       LEFT JOIN (SELECT FG.GOODS_NM
+		                        ,OFV.ORD_NO
+		                  FROM TB_ORD_FREEGIFT_VAL OFV
+		                  INNER JOIN TB_FREE_GOODS FG
+		                  ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		                  AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		                  )FR ON CPH.ORD_NO = FR.ORD_NO
+		       WHERE CPH.CUST_NO = #{custNo}
+		       AND CPH.OCCUR_GB NOT IN ('G069_12','G069_13')
+		       AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
+		       AND CPH.PNT_AMT <![CDATA[<]]> 0
+		UNION ALL
+		      SELECT  CASE CPH.OCCUR_GB
+		                  WHEN 'G069_12' THEN '상품 구매'
+		                  WHEN 'G069_13' THEN '구매 취소'
+		                 END                                          AS OCCUR_GB
+		            , CASE CPH.OCCUR_GB
+		                  WHEN 'G069_12' THEN G.GOODS_NM
+		                  WHEN 'G069_13' THEN G.GOODS_NM
+		                 END                                          AS  OCCUR_DTL_DESC
+		           , SUM(CPH.PNT_AMT)
+		           , CPH.UPD_DT AS PNT_UPLOAD_DT
+		      FROM TB_CUST_POINT_HST CPH
+		      LEFT JOIN TB_ORDER_DETAIL OD
+		      ON  CPH.ORD_NO = OD.ORD_NO
+		      AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
+		      LEFT JOIN TB_GOODS G
+		      ON  OD.GOODS_CD = G.GOODS_CD
+		      LEFT JOIN (SELECT FG.GOODS_NM
+		                       ,OFV.ORD_NO
+		                 FROM TB_ORD_FREEGIFT_VAL OFV
+		                 INNER JOIN TB_FREE_GOODS FG
+		                 ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		                 AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		                 )FR ON CPH.ORD_NO = FR.ORD_NO
+		      WHERE CPH.CUST_NO = #{custNo}
+		        AND CPH.SWITCH_DUE_DT IS NOT NULL
+		        AND CPH.OCCUR_GB IN ('G069_12','G069_13')
+		        AND CPH.PNT_UPLOAD_STAT = 'G070_30'
+		        AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
+		        AND CPH.PNT_AMT <![CDATA[<]]> 0
+		) Z
+		WHERE Z.PNT_UPLOAD_DT IS NOT NULL
+		ORDER BY Z.PNT_UPLOAD_DT DESC	
 	</select>
 	
 	<!-- 전체내역 조회-->
 	<select id="getAllPointList" parameterType="Point" resultType="Point">
 	/* TsfPoint.getAllPointList */
-		SELECT  CASE CPH.OCCUR_GB
-		            WHEN 'G069_10' THEN '상품 구매'
-		            WHEN 'G069_11' THEN '구매 취소'
-		            WHEN 'G069_12' THEN '상품 구매'
-		            WHEN 'G069_13' THEN '구매 취소'
-		            WHEN 'G069_20' THEN '리뷰'
-		            WHEN 'G069_21' THEN '리뷰'
-		            WHEN 'G069_30' THEN '이벤트'
-		            WHEN 'G069_31' THEN '회원가입'
-		            WHEN 'G069_32' THEN '생일'
-		            WHEN 'G069_35' THEN 'APP'
-		            WHEN 'G069_36' THEN '상품 구매'
-		            WHEN 'G069_37' THEN '이벤트'
-		            WHEN 'G069_40' THEN '상품 구매'
-		            WHEN 'G069_41' THEN '구매 취소'
-		            WHEN 'G069_42' THEN '사은품'
-		            WHEN 'G069_43' THEN '사은품'
-		            WHEN 'G069_44' THEN '관리자'
-		            WHEN 'G069_45' THEN '관리자'
-		            WHEN 'G069_46' THEN '적립취소'
-		            WHEN 'G069_90' THEN '관리자'
-		            WHEN 'G069_99' THEN '소멸'
-		       END                                          AS OCCUR_GB
-     , CASE CPH.OCCUR_GB
-                    WHEN 'G069_10' THEN G.GOODS_NM
-		            WHEN 'G069_11' THEN G.GOODS_NM
-		            WHEN 'G069_12' THEN G.GOODS_NM
-		            WHEN 'G069_13' THEN G.GOODS_NM
-		            WHEN 'G069_20' THEN G.GOODS_NM
-		            WHEN 'G069_21' THEN G.GOODS_NM
-		            WHEN 'G069_30' THEN '이벤트'
-		            WHEN 'G069_31' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_32' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_35' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_36' THEN G.GOODS_NM
-		            WHEN 'G069_37' THEN '출석체크'
-		            WHEN 'G069_40' THEN G.GOODS_NM
-		            WHEN 'G069_41' THEN G.GOODS_NM
-		            WHEN 'G069_42' THEN FR.GOODS_NM
-		            WHEN 'G069_43' THEN FR.GOODS_NM
-		            WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_45' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
-		            WHEN 'G069_99' THEN '유효기간 경과 소멸'
-		       END                                          AS  OCCUR_DTL_DESC
-		     , CPH.PNT_AMT
-		     , CPH.REG_DT AS PNT_UPLOAD_DT
-		FROM TB_CUST_POINT_HST CPH
-		LEFT JOIN TB_ORDER_DETAIL OD
-		ON  CPH.ORD_NO = OD.ORD_NO
-		AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
-		LEFT JOIN TB_GOODS G
-		ON  OD.GOODS_CD = G.GOODS_CD
-		LEFT JOIN (SELECT FG.GOODS_NM
-		                 ,OFV.ORD_NO 
-		           FROM TB_ORD_FREEGIFT_VAL OFV
-		           INNER JOIN TB_FREE_GOODS FG
-		           ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
-		           AND OFV.PRODUCT_NO = FG.PRODUCT_NO
-		           )FR ON CPH.ORD_NO = FR.ORD_NO
-		WHERE CPH.CUST_NO = #{custNo}
-		AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
-		GROUP BY CPH.REG_DT
-		ORDER BY CPH.REG_DT DESC
-	</select>
+		SELECT Z.*
+		FROM (
+		       SELECT  CASE CPH.OCCUR_GB
+		                    WHEN 'G069_20' THEN '리뷰'
+		                    WHEN 'G069_30' THEN '이벤트'
+		                    WHEN 'G069_31' THEN '회원가입'
+		                    WHEN 'G069_32' THEN '생일'
+		                    WHEN 'G069_35' THEN 'APP'
+		                    WHEN 'G069_36' THEN '상품 구매'
+		                    WHEN 'G069_37' THEN '이벤트'
+		                    WHEN 'G069_40' THEN '상품 구매'
+		                    WHEN 'G069_41' THEN '구매 취소'
+		                    WHEN 'G069_42' THEN '사은품'
+		                    WHEN 'G069_43' THEN '사은품'
+		                    WHEN 'G069_44' THEN '관리자'
+		                    WHEN 'G069_45' THEN '관리자'
+		                    WHEN 'G069_46' THEN '적립취소'
+		                    WHEN 'G069_90' THEN '기타'
+		                    WHEN 'G069_99' THEN '소멸'
+		                    END                                          AS OCCUR_GB
+		               ,CASE CPH.OCCUR_GB
+		                   WHEN 'G069_20' THEN G.GOODS_NM
+		                   WHEN 'G069_30' THEN '이벤트'
+		                   WHEN 'G069_31' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_32' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_35' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_36' THEN G.GOODS_NM
+		                   WHEN 'G069_37' THEN '출석체크'
+		                   WHEN 'G069_40' THEN G.GOODS_NM
+		                   WHEN 'G069_41' THEN G.GOODS_NM
+		                   WHEN 'G069_42' THEN FR.GOODS_NM
+		                   WHEN 'G069_43' THEN FR.GOODS_NM
+		                   WHEN 'G069_44' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_45' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_46' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_90' THEN CPH.OCCUR_DTL_DESC
+		                   WHEN 'G069_99' THEN '유효기간 경과 소멸'
+		                   END                                          AS  OCCUR_DTL_DESC
+		            , CPH.PNT_AMT
+		            , CPH.UPD_DT AS PNT_UPLOAD_DT
+		       FROM TB_CUST_POINT_HST CPH
+		       LEFT JOIN TB_ORDER_DETAIL OD
+		       ON  CPH.ORD_NO = OD.ORD_NO
+		       AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
+		       LEFT JOIN TB_GOODS G
+		       ON  OD.GOODS_CD = G.GOODS_CD
+		       LEFT JOIN (SELECT FG.GOODS_NM
+		                        ,OFV.ORD_NO
+		                  FROM TB_ORD_FREEGIFT_VAL OFV
+		                  INNER JOIN TB_FREE_GOODS FG
+		                  ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		                  AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		                  )FR ON CPH.ORD_NO = FR.ORD_NO
+		       WHERE CPH.CUST_NO = #{custNo}
+		       AND CPH.OCCUR_GB NOT IN ('G069_12','G069_13')
+		       AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
+		UNION ALL
+		      SELECT  CASE CPH.OCCUR_GB
+		                  WHEN 'G069_12' THEN '상품 구매'
+		                  WHEN 'G069_13' THEN '구매 취소'
+		                 END                                          AS OCCUR_GB
+		            , CASE CPH.OCCUR_GB
+		                  WHEN 'G069_12' THEN G.GOODS_NM
+		                  WHEN 'G069_13' THEN G.GOODS_NM
+		                 END                                          AS  OCCUR_DTL_DESC
+		           , SUM(CPH.PNT_AMT)
+		           , CPH.UPD_DT AS PNT_UPLOAD_DT
+		      FROM TB_CUST_POINT_HST CPH
+		      LEFT JOIN TB_ORDER_DETAIL OD
+		      ON  CPH.ORD_NO = OD.ORD_NO
+		      AND CPH.ORD_DTL_NO = OD.ORD_DTL_NO
+		      LEFT JOIN TB_GOODS G
+		      ON  OD.GOODS_CD = G.GOODS_CD
+		      LEFT JOIN (SELECT FG.GOODS_NM
+		                       ,OFV.ORD_NO
+		                 FROM TB_ORD_FREEGIFT_VAL OFV
+		                 INNER JOIN TB_FREE_GOODS FG
+		                 ON OFV.PRODUCT_CODE = FG.PRODUCT_CODE
+		                 AND OFV.PRODUCT_NO = FG.PRODUCT_NO
+		                 )FR ON CPH.ORD_NO = FR.ORD_NO
+		      WHERE CPH.CUST_NO = #{custNo}
+		        AND CPH.SWITCH_DUE_DT IS NOT NULL
+		        AND CPH.OCCUR_GB IN ('G069_12','G069_13')
+		        AND CPH.PNT_UPLOAD_STAT = 'G070_30'
+		        AND DATE_FORMAT(CPH.UPD_DT,'%Y%m') = #{searchDt}
+		) Z
+		WHERE Z.PNT_UPLOAD_DT IS NOT NULL
+		ORDER BY Z.PNT_UPLOAD_DT DESC	
+		</select>
 
 	<!-- 고객 포인트 내역 -->
 	<select id="getCustomerPoint" parameterType="Integer" resultType="Point">

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -157,6 +157,7 @@
                     <div>
                         <h4 th:if="${planInfo.planGb == 'P'}">다른 기획전 보기</h4>
                         <h4 th:if="${planInfo.planGb == 'E'}">다른 이벤트 보기</h4>
+                        <h4 th:if="${planInfo.planGb == 'C'}">다른 이벤트 보기</h4>
                         <a href="javascript:void(0);" th:if="${planInfo.planGb == 'P'}" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">전체보기</a>
                         <a href="javascript:void(0);" th:if="${planInfo.planGb == 'E'}" onclick="cfnGoToPage(_PAGE_EVENT_MAIN);">전체보기</a>
                     </div>
@@ -227,7 +228,6 @@
 	<!-- //댓글 이미지 팝업 -->	    
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
-
 let review = [[${reviewInfo}]];
 let coupon = [[${couponInfo}]];
 let plan = [[${planInfo}]];
@@ -266,69 +266,71 @@ if(planCornerList.length>0){
 		html += '             </div>';
 		html += '             <div class="itemsGrp">';
 		$.each(planCornerGoodsList, function(idx2, item2)  {
-			html += '                 <div class="item_prod">';
-			html += '                     <div class="item_state">';
-			html += '		<button type="button" class="itemLike';
-			if(item2.likeIt == 'likeit'){
-				html += ' likeit';
-			}
-			html += ' "';
-			html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
-			
-			html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
-			html += '                             <div class="itemPic">';
-			html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ goodsView +'/'+item2.sysImgNm +'">';
-			html += '                             </div>';
-			html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>';
-			html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
-			html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
-			if (item2.currPrice != item2.listPrice) {
-				html += '                                 <span class="itemPrice_original">'+item2.listPrice.addComma()+'</span>';
-			}
-			if (item2.dcRate != 0) {
-				html += '                                 <span class=" itemPercent">'+item2.dcRate.addComma()+'%</span>';
-			}
-			
-			
-			html += '                             </p>';
-			html += '                             <div class="itemcolorchip">';
-			if(!gagajf.isNull(item2.colorChips)){
-				var colorArr = item2.colorChips.split(",");
-				var colorCd = '';
-				var rgbColor = '';
-				for(let i=0; i<colorArr.length; i++){
-					var colorInfo = colorArr[i].split(":");
-					colorCd = colorInfo[0];
-					rgbColor = colorInfo[1];
-					if(rgbColor=='#FFFFFF'){
-						html += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>';
-					}else{
-						html += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>';
+			if (item2.cornerNm == item.cornerNm) {
+				html += '                 <div class="item_prod">';
+				html += '                     <div class="item_state">';
+				html += '		<button type="button" class="itemLike';
+				if(item2.likeIt == 'likeit'){
+					html += ' likeit';
+				}
+				html += ' "';
+				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+				
+				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
+				html += '                             <div class="itemPic">';
+				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ goodsView +'/'+item2.sysImgNm +'">';
+				html += '                             </div>';
+				html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>';
+				html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
+				html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
+				if (item2.currPrice != item2.listPrice) {
+					html += '                                 <span class="itemPrice_original">'+item2.listPrice.addComma()+'</span>';
+				}
+				if (item2.dcRate != 0) {
+					html += '                                 <span class=" itemPercent">'+item2.dcRate.addComma()+'%</span>';
+				}
+				
+				
+				html += '                             </p>';
+				html += '                             <div class="itemcolorchip">';
+				if(!gagajf.isNull(item2.colorChips)){
+					var colorArr = item2.colorChips.split(",");
+					var colorCd = '';
+					var rgbColor = '';
+					for(let i=0; i<colorArr.length; i++){
+						var colorInfo = colorArr[i].split(":");
+						colorCd = colorInfo[0];
+						rgbColor = colorInfo[1];
+						if(rgbColor=='#FFFFFF'){
+							html += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>';
+						}else{
+							html += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>';
+						}
 					}
 				}
-			}
-			html += '                             </div>';
-			if(!gagajf.isNull(item2.icon)){
-				var iconArr = item2.icon.split(",");
-				var iconGb = '';
-				var iconNm = '';
-				html += '	<p class="itemBadge">';
-				for(let i=0; i<iconArr.length; i++){
-					var iconInfo = iconArr[i].split(":");
-					iconGb = iconInfo[0];
-					iconNm = iconInfo[1];
-					html += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>';
+				html += '                             </div>';
+				if(!gagajf.isNull(item2.icon)){
+					var iconArr = item2.icon.split(",");
+					var iconGb = '';
+					var iconNm = '';
+					html += '	<p class="itemBadge">';
+					for(let i=0; i<iconArr.length; i++){
+						var iconInfo = iconArr[i].split(":");
+						iconGb = iconInfo[0];
+						iconNm = iconInfo[1];
+						html += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>';
+					}
+					html += '	</p>';
 				}
-				html += '	</p>';
-			}
-			if(item2.goodsTnm != null){
-				html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
+				if(item2.goodsTnm != null){
+					html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
+				}
+				html += '                         </a>';
+				html += '                     </div>';
+				html += '                 </div>';
 			}
-			html += '                         </a>';
-			html += '                     </div>';
-			html += '                 </div>';
+			
 		})
-
 		html += '             </div>';
 		html += '         </div>';
 	})
@@ -948,6 +950,7 @@ var fnReplySave = function() {
 			ajaxReplyList();	
 			$('#replyText').val('');
 			$('.pics').remove();
+			$('.fileAdd').show();
 			//댓글 작성시 글자 카운트
 			$('#cmt_cnt').text(0);
 			});
@@ -1112,7 +1115,7 @@ $(document).ready( function() {
 			$("#replyText").val('');
 			return false;
 		}
-		
+		var imgFiles=$('.imgUpload .pics');
 		var maxFileLength = 10; /* 최대 파일 갯수를 입력해 주세요 */
 		if (imgFiles.length >= maxFileLength) {
 			mcxDialog.alert('이미지는 최대' + maxFileLength +'장 까지 첨부 가능합니다.');

src/main/webapp/WEB-INF/views/web/planning/PlanningEventAttendFormWeb.html

@@ -199,7 +199,7 @@
                 <div class="cont_head">
                     <div>
                         <h4>다른 이벤트 보기</h4>
-                        <a href="javascript:void(0);" th:if="${planInfo.planGb == 'E'}" onclick="cfnGoToPage(_PAGE_EVENT_MAIN);">전체보기</a>
+                        <a href="javascript:void(0);" th:if="${planInfo.planGb == 'C'}" onclick="cfnGoToPage(_PAGE_EVENT_MAIN);">전체보기</a>
                     </div>
                 </div>
                 <div class="cont_body">

src/main/webapp/WEB-INF/views/web/planning/PlanningShotGuideFormWeb.html

@@ -35,7 +35,7 @@
 				</div>
 				<div class="cont_body">
 				    <div class="bulletship">
-						<div class="bulletship_head">
+						<div class="bulletship_head" th:utext="${#strings.replace(#strings.replace(shotHtmlTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
                             <img src="/images/pc/thumb/bullet_bg1.png" alt="10시까지 주문하면 당일도착">
                         </div>
                         <div class="bulletship_body" id="shotHtml">
@@ -50,8 +50,13 @@
                             </div> -->
                             		<!-- 비로그인 상태 or 로그인을 했지만 주소정보를 못 가져오는 경우 -->                      
                         </div>
-                        <div class="bulletship_foot"><div class="bulletship_foot"><br></div></div><div class="bulletship_foot"><br></div><div class="bulletship_foot">
-                            <img src="/images/pc/thumb/bullet_bg2.png" alt="주문/도착, 배송일, 대상상품">
+                        <div class="bulletship_foot">
+                        	<div class="bulletship_foot"><br></div>
+                        </div>
+                        <div class="bulletship_foot"><br>
+                        </div>
+                        <div class="bulletship_foot" th:utext="${#strings.replace(#strings.replace(shotHtmlBtm.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
+                           <!--  <img src="/images/pc/thumb/bullet_bg2.png" alt="주문/도착, 배송일, 대상상품"> -->
                         </div>
                     </div> 
                 </div>
@@ -166,69 +171,70 @@ if(planCornerList.length>0){
 		html += '             </div>';
 		html += '             <div class="itemsGrp">';
 		$.each(planCornerGoodsList, function(idx2, item2)  {
-			html += '                 <div class="item_prod">';
-			html += '                     <div class="item_state">';
-			if(item2.likeIt === 'likeit'){
-			html += '		<button type="button" class="itemLike likeit active"';
-			}else{
-				html += '		<button type="button" class="itemLike"';
-			}
-			html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
-			
-			html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
-			html += '                             <div class="itemPic">';
-			html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ goodsView +'/'+item2.sysImgNm +'">';
-			html += '                             </div>';
-			html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>';
-			html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
-			html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
-			if (item2.currPrice != item2.listPrice) {
-				html += '                                 <span class="itemPrice_original">'+item2.listPrice.addComma()+'</span>';
-			}
-			if (item2.dcRate != 0) {
-				html += '                                 <span class=" itemPercent">'+item2.dcRate.addComma()+'%</span>';
-			}
-			
-			
-			html += '                             </p>';
-			html += '                             <div class="itemcolorchip">';
-			if(!gagajf.isNull(item2.colorChips)){
-				var colorArr = item2.colorChips.split(",");
-				var colorCd = '';
-				var rgbColor = '';
-				for(let i=0; i<colorArr.length; i++){
-					var colorInfo = colorArr[i].split(":");
-					colorCd = colorInfo[0];
-					rgbColor = colorInfo[1];
-					if(rgbColor=='#FFFFFF'){
-						html += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>';
-					}else{
-						html += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>';
+			if (item2.cornerNm == item.cornerNm) {
+				html += '                 <div class="item_prod">';
+				html += '                     <div class="item_state">';
+				if(item2.likeIt === 'likeit'){
+				html += '		<button type="button" class="itemLike likeit active"';
+				}else{
+					html += '		<button type="button" class="itemLike"';
+				}
+				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+				
+				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
+				html += '                             <div class="itemPic">';
+				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ goodsView +'/'+item2.sysImgNm +'">';
+				html += '                             </div>';
+				html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>';
+				html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
+				html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
+				if (item2.currPrice != item2.listPrice) {
+					html += '                                 <span class="itemPrice_original">'+item2.listPrice.addComma()+'</span>';
+				}
+				if (item2.dcRate != 0) {
+					html += '                                 <span class=" itemPercent">'+item2.dcRate.addComma()+'%</span>';
+				}
+				
+				
+				html += '                             </p>';
+				html += '                             <div class="itemcolorchip">';
+				if(!gagajf.isNull(item2.colorChips)){
+					var colorArr = item2.colorChips.split(",");
+					var colorCd = '';
+					var rgbColor = '';
+					for(let i=0; i<colorArr.length; i++){
+						var colorInfo = colorArr[i].split(":");
+						colorCd = colorInfo[0];
+						rgbColor = colorInfo[1];
+						if(rgbColor=='#FFFFFF'){
+							html += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>';
+						}else{
+							html += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>';
+						}
 					}
 				}
-			}
-			html += '                             </div>';
-			if(!gagajf.isNull(item2.icon)){
-				var iconArr = item2.icon.split(",");
-				var iconGb = '';
-				var iconNm = '';
-				html += '	<p class="itemBadge">';
-				for(let i=0; i<iconArr.length; i++){
-					var iconInfo = iconArr[i].split(":");
-					iconGb = iconInfo[0];
-					iconNm = iconInfo[1];
-					html += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>';
+				html += '                             </div>';
+				if(!gagajf.isNull(item2.icon)){
+					var iconArr = item2.icon.split(",");
+					var iconGb = '';
+					var iconNm = '';
+					html += '	<p class="itemBadge">';
+					for(let i=0; i<iconArr.length; i++){
+						var iconInfo = iconArr[i].split(":");
+						iconGb = iconInfo[0];
+						iconNm = iconInfo[1];
+						html += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>';
+					}
+					html += '	</p>';
 				}
-				html += '	</p>';
-			}
-			if(item2.goodsTnm != null){
-				html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
+				if(item2.goodsTnm != null){
+					html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
+				}
+				html += '                         </a>';
+				html += '                     </div>';
+				html += '                 </div>';
 			}
-			html += '                         </a>';
-			html += '                     </div>';
-			html += '                 </div>';
 		})
-
 		html += '             </div>';
 		html += '         </div>';
 	})
@@ -242,7 +248,7 @@ if(planCornerList.length>0){
 }
 
 var shotBody = function () {
-	if (!cfCheckLogin() || (custAddr == null && custAddr == '')) {
+	if (!cfCheckLogin() || (custAddr == null || custAddr == '')) {
 		html = '';
 		html += '<div class="txt_result">                                                                              ';
 		html += '     <p>오전10시 이전 주문 당일도착</p>                                                                         ';
@@ -288,7 +294,7 @@ var fnOpenDaumAddr = function() {
 						success 	: function(result) {
 							if (result != null) {
 								$('#addr').text(cfnGetDaumRoadAddr(data));
-								if(result.shotDelvUseYn == "Y"){
+								if(result.shotYn.shotDelvUseYn == "Y"){
 									$('#shotAdr').text("총알배송");
 									$("#infoTxt").text("오늘 오전 10시까지 주문하시면 오늘 도착합니다. (토, 일, 공휴일 휴무)")