Merge remote-tracking branch 'remotes/origin/feature_20191218_1.9.8_huc'

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>6.4.10.RELEASE</version>
+    <version>1.0.5-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -399,6 +399,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setPayStatuses(request.getPayStatuses());
         orderConditionsReq.setUserId(request.getUserId());
         orderConditionsReq.setThirdOrderCode(request.getThirdOrderCode());
+        orderConditionsReq.setBizType(request.getBizType());
         if (request.getOrderStatuses() != null && request.getOrderStatuses().size() > 0) {
             List<Integer> orderStatusList = new ArrayList<>();
             for (Integer orderStatus : request.getOrderStatuses()) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersByConditionsRequest.java

@@ -27,4 +27,6 @@ public class QueryOrdersByConditionsRequest extends BaseConfig {
     private List<Integer> payStatuses;
     private String thirdOrderCode;
     private String userId;
+    //订单业务类型 1:普通订单 2:虚拟订单
+    private Integer bizType;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

 package com.freemud.sdk.api.assortment.order.service;
 
-import com.freemud.application.sdk.api.ordercenter.request.GroupOrderClearReq;
+import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderConditionsReq;
+import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 
@@ -267,4 +268,18 @@ public interface OrderCenterSdkService {
      * @return
      */
     AssortmentOrderGetOrderAddProductResponse getOrderAddProduct(OrderCommonRequest orderCommonRequest);
+
+    /**
+     * 分页查询售后单(es)
+     */
+    AfterSalesListResp queryAfterSalesListES(QueryAfterSalesOrderConditionsReq queryRequest, String trackNo);
+
+    /**
+     * 查询售后单详情(es)
+     * @param orderCode
+     * @param partnerId
+     * @param trackNo
+     * @return
+     */
+    QueryOrderByIdResponse queryOrderByCodeES(String orderCode, String partnerId, String trackNo);
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -16,9 +16,10 @@ import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
-import com.freemud.application.sdk.api.membercenter.request.*;
+import com.freemud.application.sdk.api.membercenter.request.GetMemberExtendInfoRequest;
+import com.freemud.application.sdk.api.membercenter.request.SendPointRequest;
+import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest;
 import com.freemud.application.sdk.api.membercenter.response.GetMemberExtendInfoResponse;
-import com.freemud.application.sdk.api.membercenter.response.GetMemberPaids;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
 import com.freemud.application.sdk.api.membercenter.service.MemberScoreService;
@@ -29,6 +30,7 @@ import com.freemud.application.sdk.api.ordercenter.request.create.CreateFatherSo
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.*;
+import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
@@ -55,27 +57,25 @@ import com.freemud.sdk.api.assortment.order.adapter.*;
 import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
 import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
 import com.freemud.sdk.api.assortment.order.enums.*;
-import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
+import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse.DataBean.OrderBean;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.AssortmentOrderProductVo;
 import com.google.gson.Gson;
-import com.sun.net.httpserver.Authenticator;
-import com.netflix.discovery.converters.Auto;
-import ma.glasnost.orika.MapperFacade;
-import ma.glasnost.orika.impl.DefaultMapperFactory;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.freemud.application.sdk.api.membercenter.constant.InterfaceAddressConstant.MEMBER_EXTEND_INFO;
@@ -1244,4 +1244,25 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         assortmentOrderGetOrderAddProductResponse.setErrcode(Integer.valueOf(ResponseResult.SUCCESS.getCode()));
         return assortmentOrderGetOrderAddProductResponse;
     }
+
+    @Override
+    public AfterSalesListResp queryAfterSalesListES(QueryAfterSalesOrderConditionsReq queryRequest, String trackNo) {
+        return orderDownLoadSdkService.queryAfterSalesOrderConditions(queryRequest, "");
+    }
+
+    @Override
+    public QueryOrderByIdResponse queryOrderByCodeES(String partnerId, String orderCode, String trackingNo) {
+        QueryByCodeResponse orderInfo = orderDownLoadSdkService.queryOrderByCode(partnerId,orderCode,trackingNo);
+        if (orderInfo == null || orderInfo.getResult() == null) {
+            return new QueryOrderByIdResponse();
+        }
+        QueryOrderByIdResponse response = new QueryOrderByIdResponse();
+        response.setErrcode(Integer.parseInt(orderInfo.getCode()));
+        response.setErrmsg(orderInfo.getMessage());
+        if (StringUtils.isEmpty(orderInfo.getResult().getOrderCode())) {
+            return response;
+        }
+        QueryOrderByIdResponse orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(orderInfo);
+        return orderByIdResponse;
+    }
 }

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -138,4 +138,17 @@ public class InterfaceAddressConstant {
      * 订单确认（从订单未支付或下单状态变成订单完成）会员使用
      */
     public static final String ORDER_AFFIRM = "order/v2/affirm";
+
+    /**
+     * 根据批次号查询余下数据，每次查询后scrollid 有效时间重新刷新为120秒
+     */
+    public static final String QUERY_ORDER_AFTER_SALE_DOWN = "order/v2/queryAfterSalesOrderByScrollId";
+    /**
+     *根据综合条件查询售后单(单次查询默认返回500条（建议pageSize不要大于1000），返回的scrollId 有效时间为120秒)
+     */
+    public static final String QUERY_AFT_SALE_ORDER_LIST = "order/v2/queryAfterSalesOrderConditions";
+    /**
+     * 根据订单号查询订单详情
+     */
+    public static final String QUERY_ORDER_BY_CODE = "order/v2/queryOrderByCode";
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/AfterSalesStatus.java

@@ -12,6 +12,8 @@
  */
 package com.freemud.application.sdk.api.ordercenter.enums;
 
+import java.util.Arrays;
+
 public enum  AfterSalesStatus {
 
     PENDING(1,"待处理"),
@@ -45,4 +47,11 @@ public enum  AfterSalesStatus {
         this.index = index;
         this.name = name;
     }
+
+    public static AfterSalesStatus getByIndex(byte index) {
+        return Arrays.stream(AfterSalesStatus.values())
+                .filter(e -> e.index == index)
+                .findFirst()
+                .orElse(null);
+    }
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/QueryAfterSalesOrderConditionsReq.java

+package com.freemud.application.sdk.api.ordercenter.request;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 售后单分页条件查询请求
+ */
+@Data
+public class QueryAfterSalesOrderConditionsReq {
+    // "商户号",required = true)
+    private String partnerId;
+
+    // "售后单编号")
+    private String afterSalesCode;
+
+    // "门店编号")
+    private List<String> storeIds = new ArrayList<>();
+
+    // "三方订单号")
+    private String thirdOrderCode;
+
+    // "订单编号")
+    private String orderCode;
+
+    // "客户电话")
+    private String customerMobile;
+
+    // OrderClientType.API_DESC)
+    private List<Byte> orderClients;
+
+    // "订单类型")
+    private List<Integer> orderTypes = new ArrayList<>();
+
+    // "配送类型 1自配送(三方渠道配送、商家店员配送) 2平台配送")
+    private Byte expressType;
+
+    // "订单创建开始时间戳")
+    private Long startTimestamp;
+
+    // "订单创建结束时间戳")
+    private Long endTimestamp;
+
+    // "售后单创建时间开始")
+    private Long startAfterCreateTimestamp;
+
+    // "售后单创建结束")
+    private Long endAfterCreateTimestamp;
+
+    // AfterSalesStatus.API_DESC)
+    private List<Byte> afterSalesStatusList;
+
+    // OrderStatus.API_DESC)
+    private List<Byte> orderStateList;
+
+    // "第几页,从1开始，默认第1页")
+    private Integer pageNum;
+
+    // "每页条目数量，默认10条")
+    private Integer pageSize;
+
+    protected Integer ver;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/AfterSalesListResp.java

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 售后单查询
+ */
+@Data
+public class AfterSalesListResp {
+    protected String code;
+    protected String message;
+    private Integer totalNum;
+    private List<AfterSalesOrderResp> result;
+
+    private String scrollId;
+    protected String ver;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java

@@ -2,19 +2,17 @@ package com.freemud.application.sdk.api.ordercenter.service;
 
 import com.freemud.application.sdk.api.base.BaseRequest;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
-import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.config.OrderDownLoadCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
 import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
+import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.QueryOrderByScrollRequest;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
-import com.freemud.application.sdk.api.ordercenter.response.BaseResponse;
-import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
-import com.freemud.application.sdk.api.ordercenter.response.QueryOrderForUserResp;
+import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
-import com.freemud.application.sdk.api.ordercenter.util.ResponseUtil;
 import com.freemud.application.sdk.api.util.RequestThirdPartyUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +68,51 @@ public class OrderDownLoadSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * 分页查询售后单
+     *
+     * @param queryRequest
+     * @param trackingNo
+     * @return
+     */
+    public AfterSalesListResp queryAfterSalesOrderConditions(QueryAfterSalesOrderConditionsReq queryRequest, String trackingNo) {
+        AfterSalesListResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.QUERY_AFT_SALE_ORDER_LIST,
+                createBaseRequest(queryRequest, trackingNo), new ParameterizedTypeReference<AfterSalesListResp>() {
+                });
+        return responseDTO;
+    }
+
+    /**
+     * 售后单查询下载
+     * @param request
+     * @param trackingNo
+     * @return
+     */
+    public BaseDownLoadResponse queryAfterSalesOrderByScrollId(QueryOrderByScrollRequest request, String trackingNo) {
+        long begin = System.currentTimeMillis();
+        BaseDownLoadResponse<List<AfterSalesOrderResp>> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexDownLoad(restTemplate, InterfaceAddressConstant.QUERY_ORDER_AFTER_SALE_DOWN,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<BaseDownLoadResponse<List<AfterSalesOrderResp>>>() {
+                });
+        ThirdPartyLog.infoConvertJson(begin, System.currentTimeMillis(), InterfaceAddressConstant.QUERY_ORDER_AFTER_SALE_DOWN, request, responseMini(responseDTO));
+        return responseHandle(responseDTO);
+    }
+
+    /**
+     * 根据订单号查询订单详情
+     *
+     * @param partnerId
+     * @param orderCode
+     * @param trackingNo
+     * @return
+     */
+    public QueryByCodeResponse queryOrderByCode(String partnerId, String orderCode, String trackingNo) {
+        String url = InterfaceAddressConstant.QUERY_ORDER_BY_CODE + "?orderCode=" + orderCode + "&partnerId=" + partnerId;
+        QueryByCodeResponse queryResponse = RequestThirdPartyUtils.httpGetReqComplex(this.restTemplate, url
+                , createBaseRequest(null, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {
+                });
+        return queryResponse;
+    }
+
     BaseDownLoadResponse responseMini(BaseDownLoadResponse responseDTO){
 
         BaseDownLoadResponse baseDownLoadResponse = new BaseDownLoadResponse();