浏览代码

Merge remote-tracking branch 'style24/stage_tsit' into style

card007 4 年之前
父节点
当前提交
0ec7e41f5b
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/main/java/com/style24/persistence/mybatis/shop/TssSettle.xml

+ 3 - 3
src/main/java/com/style24/persistence/mybatis/shop/TssSettle.xml

@@ -63,7 +63,7 @@
 	</select>
 	
 	<!-- 입점업체 상품정산 목록 -->
-	<select id="getSupplyCompanyGoodsFeeList" parameterType="SupplyCompFee" resultType="SupplyCompFee">
+	<select id="getSupplyCompanyGoodsFeeList" parameterType="SupplyCompFee" resultType="SupplyCompFee" timeout="600">
 		/* TsaSettle.getSupplyCompanyGoodsFeeList */
 		SELECT ODIH.ORD_NO                                                                                     /*주문번호*/
 		     , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
@@ -162,11 +162,11 @@
 		                                                   END))
 		                    END AS SIGNED INT)                                                          AS SELL_AMT                /*판매금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
-		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * CASE WHEN CC2.CPN_ID=59 THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액 / 59번쿠폰제외*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액 / 59번쿠폰제외*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * 
 		               (((100 - IFNULL(CB1.BURDEN_RATE,0)) / 100) * ODIH.CPN1_DC_AMT
-		                + ((100 - IFNULL(CB2.BURDEN_RATE,0)) / 100) * CASE WHEN CC2.CPN_ID=59 THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END )             AS SELF_CPN_DC_AMT         /*자사쿠폰분담액 / 59번 쿠폰 제외 / 주문서쿠폰제외*/
+		                + ((100 - IFNULL(CB2.BURDEN_RATE,0)) / 100) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END )             AS SELF_CPN_DC_AMT         /*자사쿠폰분담액 / 59번 쿠폰 제외 / 주문서쿠폰제외*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) *
 		               ((IFNULL(CB1.BURDEN_RATE,0) / 100) * ODIH.CPN1_DC_AMT
 		                + (IFNULL(CB2.BURDEN_RATE,0) / 100) * ODIH.GOODS_CPN_DC_AMT