Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.scm.git into develop

src/main/java/com/style24/persistence/domain/Order.java

@@ -144,7 +144,6 @@ public class Order extends TscBaseDomain {
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] multiOrdDtlStat;
 
-	private int sumListPrice;
 	private int sumOrdAmt;
 	private int sumOrdCnclAmt;
 	private int sumRealPayAmt;

src/main/java/com/style24/persistence/domain/SweetTracker.java

@@ -0,0 +1,38 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+
+import lombok.Data;
+
+/**
+ * 스윗트래커 Domain
+ * 
+ * @author moon
+ * @since 2021. 04. 13
+ */
+@SuppressWarnings("serial")
+@Data
+public class SweetTracker extends TscBaseDomain {
+
+	private String fid;            // 식별값
+	private String invoice_no;	   // 운송장번호
+	private String time_trans; 	   // 택배사 처리시간
+	private String time_sweet; 	   // 스윗트래커 등록시간
+	private String where; 		   // 택배 위치
+	private String telno_office;   // 사업소 기반 전화번호
+	private String telno_man; 	   // 배송기사 전화번호
+	private String details; 	   // 배송상세 정보
+	private String recv_addr; 	   // 수취인 주소
+	private String recv_name; 	   // 수취인 이름
+	private String send_name; 	   // 발신인 이름
+	private String man; 		   // 배송기사 이름
+	private String estmate;        // 배송예정 시간
+	
+	private Integer level; 	  // 배송단계(1~6단계)
+	
+	private Integer delvLevel;
+	private String delvWhere; 
+	
+	private Integer ordDtlNo;
+
+}

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

@@ -2,5 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.style24.scm.biz.dao.TssDeliveryDao">
 
+	<!-- 스윗트래커정보 등록   -->
+	<insert id="insertTbSweetTracker" parameterType="SweetTracker" >
+		/*TssDelivery.insertTbSweetTracker*/
+		INSERT INTO TB_SWEET_TRACKER 
+		(
+			  INVOICE_NO		-- 운송장번호			
+			, DELV_LEVEL		-- 배송단계  			
+			, TIME_TRANS		-- 택배사 처리시간		
+			, TIME_SWEET		-- 스윗트래커 등록시간	
+			, DELV_WHERE		-- 택배 위치			
+			, TELNO_OFFICE		-- 사업소 기반 전화번호	
+			, TELNO_MAN			-- 배송기사 전화번호		
+			, DETAILS			-- 배송상세 정보		
+			, RECV_ADDR			-- 수취인 주소			
+			, RECV_NAME			-- 수취인 이름			
+			, SEND_NAME			-- 발신인 이름			
+			, MAN				-- 배송기사 이름		
+			, ESTMATE			-- 배송예정 시간		
+			, REG_DT			-- 등록일시
+		)
+		VALUES
+		(
+			  #{invoice_no}		-- 운송장번호			
+			, #{delvLevel}		-- 배송단계  			
+			, #{time_trans}		-- 택배사 처리시간		
+			, #{time_sweet}		-- 스윗트래커 등록시간	
+			, #{delvWhere}		-- 택배 위치			
+			, #{telno_office}	-- 사업소 기반 전화번호	
+			, #{telno_man}		-- 배송기사 전화번호		
+			, #{details}		-- 배송상세 정보		
+			, #{recv_addr}		-- 수취인 주소			
+			, #{recv_name}		-- 수취인 이름			
+			, #{send_name}		-- 발신인 이름			
+			, #{man}			-- 배송기사 이름		
+			, #{estmate}		-- 배송예정 시간		
+			, NOW()
+		) ON DUPLICATE KEY
+		  UPDATE
+		  REG_DT = NOW()
+	</insert>
 
+	<!-- 주문상세번호 조회 -->	
+	<select id="getOrdDtlNoList" resultType="SweetTracker">
+		/*TssDelivery.getOrdDtlNoList*/
+		SELECT ORD_DTL_NO FROM TB_ORDER_DETAIL WHERE INVOICE_NO = #{invoice_no}
+		
+	</select>
+	
+	<!-- 주문상세 상태값 변경    -->
+	<insert id="updateTbOrderDtlStat" parameterType="SweetTracker" >
+		/*TssDelivery.updateTbOrderDtlStat*/
+		UPDATE TB_ORDER_DETAIL SET
+			  ORD_DTL_STAT = 'G013_60'
+			, UPD_NO       = #{regNo}
+			, UPD_DT       = NOW();
+		WHERE ORD_DTL_NO   = #{ordDtlNo}
+	</insert>	
+	
+	
 </mapper>

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

@@ -1,6 +1,9 @@
 package com.style24.scm.biz.dao;
 
+import java.util.Collection;
+
 import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.SweetTracker;
 
 /**
  * 배송 Dao
@@ -11,4 +14,32 @@ import com.style24.core.support.annotation.ShopDs;
 @ShopDs
 public interface TssDeliveryDao {
 
+	
+	/**
+	 * 배송완료 상태값 변경 
+	 * @param SweetTracker
+	 * @return
+	 * @author moon
+	 * @since 2021. 04. 14
+	 */
+	void updateTbOrderDtlStat(SweetTracker sweetTracker);	
+	
+	/**
+	 * 스윗트래커 배송상태 등록 
+	 * @param SweetTracker
+	 * @return
+	 * @author moon
+	 * @since 2021. 04. 14
+	 */
+	void insertTbSweetTracker(SweetTracker sweetTracker);
+	
+	/**
+	 * 주문상세번호 조회  
+	 * @param SweetTracker
+	 * @return Collection<SweetTracker>
+	 * @author moon
+	 * @since 2021. 04. 14
+	 */	
+	Collection<SweetTracker> getOrdDtlNoList(SweetTracker sweetTracker);
+	
 }

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

@@ -1,18 +1,23 @@
 package com.style24.scm.biz.service;
 
+import java.util.Collection;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.style24.core.biz.dao.TscOrderDao;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.scm.biz.dao.TssDeliveryDao;
-
+import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.SweetTracker;
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * 배송 Service
  *
- * @author gagamel
- * @since 2020. 10. 19
+ * @author moon
+ * @since 2021. 04. 13
  */
 @Service
 @Slf4j
@@ -24,4 +29,40 @@ public class TssDeliveryService {
 	@Autowired
 	private TssDeliveryDao deliveryDao;
 
+	@Autowired
+	private TscOrderDao orderDao;	
+	
+	/**
+	 * 스윗트래커 배송상태 등록 및 주문상세상태 변경 
+	 * @param  SweetTracker
+	 * @return 
+	 * @author moon
+	 * @since  2020. 12. 08
+	 */
+	@Transactional("shopTxnManager")
+	public void saveDelvStat(SweetTracker sweetTracker) {
+        
+		if(6 == sweetTracker.getLevel()) {
+			// 주문상세번호 조회 
+			Collection<SweetTracker> list = deliveryDao.getOrdDtlNoList(sweetTracker);
+			for(SweetTracker data : list) {
+				// 주문상태값 변경
+				deliveryDao.updateTbOrderDtlStat(data);
+				// 주문상세이력
+				Order order = new Order();
+				order.setOrdDtlNo(data.getOrdDtlNo());
+				order.setUpdNo(0);
+				order.setRegNo(0);
+				orderDao.createOrderDetailHst(order);				
+			}
+
+		}
+		// 	TB_SWEET_TRACKER 등록 
+		sweetTracker.setDelvLevel(sweetTracker.getLevel());
+		sweetTracker.setDelvWhere(sweetTracker.getWhere());
+		deliveryDao.insertTbSweetTracker(sweetTracker);
+		
+		
+	}
+	
 }

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

@@ -2,9 +2,12 @@ package com.style24.scm.biz.web;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.style24.core.support.message.TscMessageByLocale;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.style24.persistence.domain.SweetTracker;
 import com.style24.scm.biz.service.TssDeliveryService;
 import com.style24.scm.support.controller.TssBaseController;
 
@@ -13,18 +16,33 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * 배송 Controller
  *
- * @author gagamel
- * @since 2020. 10. 19
+ * @author moon
+ * @since 2021. 04. 13
  */
 @Controller
-@RequestMapping("/order")
+@RequestMapping("/delivery")
 @Slf4j
 public class TssDeliveryController extends TssBaseController {
 
-	@Autowired
-	private TscMessageByLocale message;
 
 	@Autowired
 	private TssDeliveryService deliveryService;
 
+	/**
+	 * 스윗트래커 
+	 *
+	 * @param String
+	 * @return  
+	 * @author moon
+	 * @since 2021. 04. 13
+	 */
+	@RequestMapping(value = "/sweettracker/response")
+	@ResponseBody
+	public GagaResponse sweetTrackerResponse(SweetTracker sweetTracker) throws Exception {
+
+		log.info("-----> "+sweetTracker);
+		deliveryService.saveDelvStat(sweetTracker);
+		return super.ok("OK");
+		
+	}	
 }

src/main/java/com/style24/scm/support/config/TssWebMvcConfig.java

@@ -34,7 +34,8 @@ public class TssWebMvcConfig implements WebMvcConfigurer {
 	public void addInterceptors(InterceptorRegistry registry) {
 		final String[] excludePathPatterns = new String[] {
 			"/", "/index", "/signin", "/image/**", "/ux/**", "/smartEditor/**",
-			"/error/**", "/data/**", "/login", "/logout"
+			"/error/**", "/data/**", "/login", "/logout",
+			"/delivery/sweettracker/response"
 		};
 
 		registry.addInterceptor(defaultInterceptor)

src/main/resources/config/application-tsit.yml

@@ -16,6 +16,7 @@ logging:
     config: classpath:log/logback-tsit.xml
 
 domain:
+    scm: //ts5000.ipdisk.co.kr
     admin: //tdadmin.style24.com
     style24: //tdfront.style24.com
     front: //tdfront.style24.com