Procházet zdrojové kódy

Merge branch 'card007' into develop

card007 před 4 roky
rodič
revize
f4f3004372

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

@@ -1739,7 +1739,6 @@
 		SELECT R.ORD_CHG_SQ
 		     , P.PAY_MEANS
 		     , FN_GET_CODE_NM('G014', P.PAY_MEANS)   AS PAY_MEANS_NM
-		     , P.CARD_NM
 		     , R.RA_BANK
 		     , CASE WHEN PAY_MEANS = 'G014_20' || PAY_MEANS = 'G014_10'
 		                THEN FN_GET_CODE_NM('G940', R.RA_BANK)
@@ -4828,7 +4827,7 @@
 		         </choose>
 		      </where>
 		         AND O.DISP_YN = 'Y'
-		         AND O.REG_DT > 20210901
+		         -- AND O.REG_DT > 20210901
 		      UNION ALL
 		      SELECT 0               AS ORDER_RECEIPT
 		           , 0               AS DEPOSIT_WAITING
@@ -4874,7 +4873,7 @@
 			</choose>
 		</where>
 		         AND O.DISP_YN = 'Y'
-		         AND O.REG_DT > 20210901
+		         -- AND O.REG_DT > 20210901
 		) AS Z
 	</select>