|
...
|
...
|
@@ -11,6 +11,7 @@ import java.util.concurrent.TimeUnit; |
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
import com.yoho.order.model.*;
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.elasticsearch.common.collect.Lists;
|
|
...
|
...
|
@@ -40,20 +41,6 @@ import com.yoho.order.dal.QiniuLiveRecordMapper; |
|
|
|
import com.yoho.order.dal.SellerOrderGoodsMapper;
|
|
|
|
import com.yoho.order.dal.SellerOrderMapper;
|
|
|
|
import com.yoho.order.dal.SellerOrderMetaMapper;
|
|
|
|
import com.yoho.order.model.Area;
|
|
|
|
import com.yoho.order.model.BuyerOrder;
|
|
|
|
import com.yoho.order.model.BuyerOrderGoods;
|
|
|
|
import com.yoho.order.model.BuyerOrderMeta;
|
|
|
|
import com.yoho.order.model.BuyerOrderReq;
|
|
|
|
import com.yoho.order.model.ExpressCompany;
|
|
|
|
import com.yoho.order.model.ExpressInfo;
|
|
|
|
import com.yoho.order.model.ExpressRecord;
|
|
|
|
import com.yoho.order.model.OrderOperateRecord;
|
|
|
|
import com.yoho.order.model.OrdersPay;
|
|
|
|
import com.yoho.order.model.QiniuLiveRecord;
|
|
|
|
import com.yoho.order.model.SellerOrder;
|
|
|
|
import com.yoho.order.model.SellerOrderGoods;
|
|
|
|
import com.yoho.order.model.SellerOrderMeta;
|
|
|
|
import com.yoho.service.model.order.request.OrderRequest;
|
|
|
|
import com.yoho.ufo.dal.IdentifyRecordsMapper;
|
|
|
|
import com.yoho.ufo.dal.ProductMapper;
|
|
...
|
...
|
@@ -71,21 +58,6 @@ import com.yohobuy.ufo.model.order.resp.BuyerOrderResp; |
|
|
|
import com.yohobuy.ufo.model.order.resp.ExpressInfoResp;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.OrderDetailResp;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.OrderOperateRecordResp;
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.elasticsearch.common.collect.Lists;
|
|
|
|
import org.elasticsearch.common.collect.Maps;
|
|
|
|
import org.elasticsearch.common.netty.util.internal.StringUtil;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @author caoyan
|
...
|
...
|
|
