이태영 - 20210419 입점 미발주 목록 메뉴 수정

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

@@ -774,7 +774,7 @@
 		     , ODI.OPT_CD2
 		     , OD.ORD_QTY 
 		     , OD.ORD_AMT
-		     , OD.CPN1_DC_AMT + TMTB1_DC_AMT + TMTB2_DC_AMT +  GOODS_CPN_DC_AMT + CART_CPN_DC_AMT + PNT_DC_AMT + PRE_PNT_DC_AMT AS TOT_DC_AMT
+		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
 		     , OD.REAL_ORD_AMT 
 		     , OD.INVOICE_NO 
 		FROM   TB_ORDER O
@@ -786,6 +786,7 @@
 		INNER  JOIN TB_PAYMENT P
 		ON     O.ORD_NO = P.ORD_NO 
 		AND    P.PAY_GB = 'O'
+		AND    P.PAY_STAT = 'G016_30'
 		INNER  JOIN TB_GOODS G
 		ON     OD.GOODS_CD = G.GOODS_CD
 		INNER  JOIN TB_DELIVERY_ADDR DA
@@ -875,7 +876,7 @@
 	<update id="updateOrderDetailInvoice" parameterType="Order">
 		/* TsaOrder.updateOrderDetailInvoice */
 		UPDATE TB_ORDER_DETAIL
-		SET    ORD_DTL_STAT = 'G013_55'
+		SET    ORD_DTL_STAT = 'G013_40'
 		     , INVOICE_NO = REPLACE(#{invoiceNo},'-','')
 		     , INVOICE_SEND_YN = 'Y'
 		     , SHIP_COMP_CD = #{shipCompCd}
@@ -886,6 +887,16 @@
 		AND    SUPPLY_COMP_CD = #{supplyCompCd}
 	</update>
 
+	<!-- 주문 상품 정보 상태 변경  -->
+	<update id="updateOrderDetailItemStat" parameterType="Order">
+		/* TsaOrder.updateOrderDetailItemStat : 주문 상품 정보 상태 변경 */
+		UPDATE TB_ORDER_DETAIL_ITEM
+		SET    ORD_DTL_STAT = #{ordDtlStat}
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
+		WHERE  ORD_DTL_NO = #{ordDtlNo}
+	</update>
+
 </mapper>
 
 

src/main/java/com/style24/scm/biz/dao/TssOrderDao.java

@@ -228,4 +228,12 @@ public interface TssOrderDao {
 	 * @since 2020. 11. 30
 	 */
 	int updateOrderDetailInvoice(Order order);
+
+	/**
+	 * 주문 상품 정보 상태 변경
+	 * @param Order
+	 * @author xodud1202
+	 * @since 2021. 04. 19
+	 */
+	void updateOrderDetailItemStat(Order order);
 }

src/main/java/com/style24/scm/biz/service/TssOrderService.java

@@ -9,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.gagaframework.excel.env.GagaExcelConstants;
 import com.gagaframework.excel.xssf.GagaExcelResultHandler;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Order;
 import com.style24.scm.biz.dao.TssOrderDao;
@@ -235,6 +236,10 @@ public class TssOrderService {
 			if (result > 0) {
 				// 3. 주문상세상태 변경 이력생성
 				orderDao.createOrderDetailHst(updateData);
+
+				// 202010419 xodud1202 주문상품상세 상태 변경
+				updateData.setOrdDtlStat(TscConstants.OrderDetailStat.GOODS_PREPARE.value());
+				orderDao.updateOrderDetailItemStat(updateData);
 			}
 			
 			// 4. 엑셀 다운로드용 임시테이블 데이타 체크
@@ -402,6 +407,8 @@ public class TssOrderService {
 				// 7. 주문상세상태 변경 이력 등록
 				if (result > 0) {
 					successCount++;
+					updateData.setOrdDtlStat(TscConstants.OrderDetailStat.DELIVERY_PREPARE.value());
+					orderDao.updateOrderDetailItemStat(updateData);
 					orderDao.createOrderDetailHst(updateData);
 				} else {
 					failedGoodCdStr += updateData.getGoodsCd() + " /  " + updateData.getOptCd2() + "(Error1)<br/>";

src/main/java/com/style24/scm/biz/web/TssOrderController.java

@@ -108,7 +108,7 @@ public class TssOrderController extends TssBaseController {
 	}
 	
 	/**
-	 * 입점업체미발주목록 - 엑셀다운로드시 주문상태값 변경(출고완료)
+	 * 입점업체미발주목록 - 엑셀다운로드시 주문상태값 변경(상품준비중)
 	 *
 	 * @param orderList - 미발주목록
 	 * @return GagaResponse

src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -110,7 +110,7 @@
 		<div class="panelStyle">
 			<ul class="panelBar">
 				<li>
-					<button type="button" class="btn btn-info btn-lg" onclick="cfnDownloadSampleFile('SF018');">입점송장번호등록다운로드</button>
+					<button type="button" class="btn btn-info btn-lg" onclick="cfnDownloadSampleFile('SF020');">입점송장번호등록다운로드</button>
 				</li>
 				<li class="aR">
 					<button type="button" id="btnExcelDown" class="btn btn-info btn-lg">엑셀다운로드</button>