|
|
@@ -1617,9 +1617,9 @@
|
|
|
, G.LIST_PRICE
|
|
|
, G.CURR_PRICE
|
|
|
, G.GOODS_GB
|
|
|
+ , G.GOODS_STAT
|
|
|
, G.PRE_PPNT_USABLE_YN
|
|
|
, G.PRE_MPNT_USABLE_YN
|
|
|
- , G.MIN_ORD_AMT
|
|
|
, G.MAX_ORD_QTY
|
|
|
, G.DAY_MAX_ORD_QTY
|
|
|
, G.GIFT_PACK_YN
|
|
|
@@ -1649,7 +1649,6 @@
|
|
|
LEFT OUTER JOIN TB_GOODS_RES_SELL GRS
|
|
|
ON CA.GOODS_CD = GRS.GOODS_CD
|
|
|
WHERE 1 = 1
|
|
|
- AND G.GOODS_STAT = 'G008_90'
|
|
|
<if test="custNo == 0">
|
|
|
AND CA.CUST_NO = 0
|
|
|
AND CA.JSESSION_ID = #{jsessionId}
|
|
|
@@ -1657,12 +1656,18 @@
|
|
|
<if test="custNo != 0">
|
|
|
AND CA.CUST_NO = #{custNo}
|
|
|
</if>
|
|
|
- <if test="cartSqArr != null and cartSqArr ==''">
|
|
|
+ <choose>
|
|
|
+ <when test="cartSqArr != null and cartSqArr.length > 0">
|
|
|
+ AND G.GOODS_STAT = 'G008_90'
|
|
|
AND CA.CART_SQ IN
|
|
|
- <foreach collection="cartSqArr" item="item" index="index" open="(" close=")" separator=",">
|
|
|
- #{item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
+ <foreach collection="cartSqArr" item="item" index="index" open="(" close=")" separator=",">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ AND G.GOODS_STAT IN ('G008_90', 'G008_70')
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
) Z
|
|
|
ORDER BY Z.SUPPLY_COMP_CD
|
|
|
, Z.DELV_FEE_CD
|
|
|
@@ -1771,7 +1776,7 @@
|
|
|
, CP.MAX_DC_AMT
|
|
|
, CP.BUY_LIMIT_AMT
|
|
|
, CASE WHEN CP.DC_WAY = 'G240_11'
|
|
|
- THEN (((Z.CURR_PRCE + Z.ADD_PRICE) * Z.GOODS_QTY) * CP.DC_PVAL) / 100
|
|
|
+ THEN (((Z.CURR_PRICE + Z.ADD_PRICE) * Z.GOODS_QTY) * CP.DC_PVAL) / 100
|
|
|
ELSE CP.DC_PVAL * Z.GOODS_QTY
|
|
|
END PC_CURR_PRICE
|
|
|
FROM TB_COUPON CP
|
|
|
@@ -2098,8 +2103,8 @@
|
|
|
</select>
|
|
|
|
|
|
<!-- 사은품 : 2차조건 적용된 사은품상품금액 구간정보조회 -->
|
|
|
- <select id="getFreeGiftGoodsApplyAmt" parameterType="Order" resultType="Order">
|
|
|
- /* TsfOrder.getFreeGiftGoodsApplyAmt */
|
|
|
+ <select id="getFreeGiftGoodsApplyAmt2" parameterType="Order" resultType="Order">
|
|
|
+ /* TsfOrder.getFreeGiftGoodsApplyAmt2 */
|
|
|
SELECT FGS.FREEGIFT_SECTION_SQ
|
|
|
, FGS.FREEGIFT_SQ
|
|
|
, FGS.SECTION_GB
|
|
|
@@ -2116,8 +2121,8 @@
|
|
|
</select>
|
|
|
|
|
|
<!-- 사은품 : 3차조건 적용된 구간정보의 사은품정보조회 -->
|
|
|
- <select id="getFreeGiftGoodsApplyAmt" parameterType="Order" resultType="Order">
|
|
|
- /* TsfOrder.getFreeGiftGoodsApplyAmt */
|
|
|
+ <select id="getFreeGiftGoodsApplyAmt3" parameterType="Order" resultType="Order">
|
|
|
+ /* TsfOrder.getFreeGiftGoodsApplyAmt3 */
|
|
|
SELECT FGV.FREEGIFT_SECTION_SQ
|
|
|
, FGV.FREEGIFT_SQ
|
|
|
, FGV.USE_POINT
|
xodud1202