|
@@ -5,7 +5,6 @@ import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
import org.springframework.core.env.Environment;
|
|
|
import org.springframework.http.HttpEntity;
|
|
import org.springframework.http.HttpEntity;
|
|
@@ -18,6 +17,7 @@ import org.springframework.util.LinkedMultiValueMap;
|
|
|
import org.springframework.util.MultiValueMap;
|
|
import org.springframework.util.MultiValueMap;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
|
|
|
|
+import com.gagaframework.web.parameter.GagaMap;
|
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.Gson;
|
|
|
import com.google.gson.GsonBuilder;
|
|
import com.google.gson.GsonBuilder;
|
|
|
import com.style24.batch.biz.dao.TsbDeliveryDao;
|
|
import com.style24.batch.biz.dao.TsbDeliveryDao;
|
|
@@ -30,21 +30,17 @@ import com.style24.core.biz.service.TscOrderChangeService;
|
|
|
import com.style24.core.biz.service.TscOrderRefundService;
|
|
import com.style24.core.biz.service.TscOrderRefundService;
|
|
|
import com.style24.core.biz.service.TscWmsService;
|
|
import com.style24.core.biz.service.TscWmsService;
|
|
|
import com.style24.core.biz.thirdparty.HansaeErp;
|
|
import com.style24.core.biz.thirdparty.HansaeErp;
|
|
|
-import com.style24.core.support.env.TscConstants;
|
|
|
|
|
import com.style24.core.support.env.TscConstants.OrderChangeGb;
|
|
import com.style24.core.support.env.TscConstants.OrderChangeGb;
|
|
|
import com.style24.core.support.env.TscConstants.OrderChangeStat;
|
|
import com.style24.core.support.env.TscConstants.OrderChangeStat;
|
|
|
import com.style24.core.support.env.TscConstants.OrderDetailStat;
|
|
import com.style24.core.support.env.TscConstants.OrderDetailStat;
|
|
|
import com.style24.persistence.domain.Delivery;
|
|
import com.style24.persistence.domain.Delivery;
|
|
|
import com.style24.persistence.domain.Erp;
|
|
import com.style24.persistence.domain.Erp;
|
|
|
-import com.style24.persistence.domain.GiftCard;
|
|
|
|
|
import com.style24.persistence.domain.Order;
|
|
import com.style24.persistence.domain.Order;
|
|
|
import com.style24.persistence.domain.OrderChange;
|
|
import com.style24.persistence.domain.OrderChange;
|
|
|
import com.style24.persistence.domain.WmsDelivery;
|
|
import com.style24.persistence.domain.WmsDelivery;
|
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
-import com.gagaframework.web.parameter.GagaMap;
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 배치 Service
|
|
* 배치 Service
|
|
|
*
|
|
*
|
|
@@ -348,10 +344,10 @@ public class TsbDeliveryService {
|
|
|
orderChange.setCnclRtnReqQtyArr(cnclRtnReqQtyArr);
|
|
orderChange.setCnclRtnReqQtyArr(cnclRtnReqQtyArr);
|
|
|
|
|
|
|
|
// 환불 사전 정보 조회
|
|
// 환불 사전 정보 조회
|
|
|
- GagaMap refundPreInfo = orderChangeService.getRefundPreInfo2(orderChange);
|
|
|
|
|
|
|
+ GagaMap refundPreInfo = orderChangeService.getRefundPreInfo(orderChange);
|
|
|
List<Order> cnclReqList2 = (List<Order>)refundPreInfo.get("cnclReqList");
|
|
List<Order> cnclReqList2 = (List<Order>)refundPreInfo.get("cnclReqList");
|
|
|
|
|
|
|
|
- GagaMap info = orderRefundService.cnclRtnRefundAmt2(cnclReqList2);
|
|
|
|
|
|
|
+ GagaMap info = orderRefundService.cnclRtnRefundAmt(cnclReqList2);
|
|
|
|
|
|
|
|
//List<Order> cnclReqList = (List<Order>)info.get("cnclRtnList");
|
|
//List<Order> cnclReqList = (List<Order>)info.get("cnclRtnList");
|
|
|
List<Order> cancelOrderRefundList = (List<Order>)info.get("cancelOrderRefundList");
|
|
List<Order> cancelOrderRefundList = (List<Order>)info.get("cancelOrderRefundList");
|
card007