Merge branches 'ka-野翠山发票订单列表查询-20211011' and 'master' of…

Merge branches 'ka-野翠山发票订单列表查询-20211011' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -68,4 +68,16 @@ public class QueryOrdersRequest extends BaseConfig {
      * 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
      */
     private Integer marketingType;
+
+    /**
+     * 1:可开票，2:已开票,3:其他(不可开票)
+     */
+    private Integer invoiceState;
+
+    /**
+     * 查询订单状态 1 外卖  4 门店自提
+     */
+    private Integer queryOrderType;
+
+
 }

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

@@ -49,6 +49,11 @@ public interface OrderCenterSdkService {
     QueryOrdersResponse queryOrders(QueryOrdersRequest queryOrdersRequest);
 
     /**
+     * 野翠山发票订单列表查询
+     */
+    QueryOrdersResponse queryOrdersNew(QueryOrdersRequest queryOrdersRequest);
+
+    /**
      * 根据订单编号查询订单信息 C端
      */
     QueryOrderByIdResponse queryMCCafeOrderById(BaseQueryOrderRequest baseQueryOrderRequest);

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

@@ -488,6 +488,14 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
+    public QueryOrdersResponse queryOrdersNew(QueryOrdersRequest queryOrdersRequest) {
+        OrderUserConditionsReq request = orderSdkAdapter.convent2QueryOrdersRequest(queryOrdersRequest);
+        request.setInvoiceState(queryOrdersRequest.getInvoiceState());
+        com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp<QueryOrderForUserResp> userorderResponse = orderSdkService.queryOrderNew(request, queryOrdersRequest.getTrackingNo());
+        return orderSdkAdapter.convent2QueryOrdersResponse(userorderResponse);
+    }
+
+    @Override
     public QueryOrderByIdResponse queryMCCafeOrderById(BaseQueryOrderRequest request) {
         QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
                 request.getThirdOrderCode(), request.getWithOperationHistory(), request.getTrackingNo());

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -142,8 +142,6 @@ public class OrderController {
         return orderservice.refundNotifyCallback(requestVo);
     }
 
-
-
     /**
      * 查询订单列表
      */
@@ -154,6 +152,15 @@ public class OrderController {
     }
 
     /**
+     * 查询订单列表(野翠山发票订单列表查询)
+     */
+    @PostMapping("/queryOrdersNew")
+    @ApiAnnotation(logMessage = "queryOrdersNew")
+    public BaseResponse queryOrdersNew(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
+        return orderservice.queryOrdersNew(queryOrderVo);
+    }
+
+    /**
      * 围餐-预览订单
      * @param queryOrderVo
      * @return

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -52,6 +52,11 @@ public interface Orderservice extends OrderFactoryService{
     BaseResponse queryOrders(QueryOrderVo queryOrderVo);
 
     /**
+     * 查询订单列表
+     */
+    BaseResponse queryOrdersNew(QueryOrderVo queryOrderVo);
+
+    /**
      * 支付取消删除订单
      */
     BaseResponse deleteOrder(DeleteOrderVo deleteOrderVo);

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

@@ -32,6 +32,8 @@ public class InterfaceAddressConstant {
     public static final String QUERY_QUEUE_SIZE = "order/v2/queryQueueSize";
     //根据用户综合条件查询
     public static final String QUERY_ORDER_FOR_USER = "order/v2/queryOrderForUser";
+    //野翠山订单列表查询
+    public static final String QUERY_ORDER_NEW = "order/v2/invoice/list/order";
     //根据订单编号查询订单状态跟踪信息
     public static final String QUERY_TRACK_INFO = "order/v2/queryTrackInfo";
 

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

@@ -65,4 +65,9 @@ public class OrderUserConditionsReq {
      */
     private Integer marketingType;
 
+    /**
+     * 1:可开票，2:已开票,3:其他(不可开票)
+     */
+    private Integer invoiceState;
+
 }

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

@@ -257,6 +257,19 @@ public class OrderSdkService {
     }
 
     /**
+     * 野翠山订单列表查询
+     * @param request
+     * @param trackingNo
+     * @return
+     */
+    public OrderBaseResp<QueryOrderForUserResp> queryOrderNew(OrderUserConditionsReq request, String trackingNo) {
+        OrderBaseResp<QueryOrderForUserResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.QUERY_ORDER_NEW,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<QueryOrderForUserResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+    /**
      * 根据订单编号查询订单状态跟踪信息
      */
     public OrderBaseResp<List<OrderTraceInfoResp>> queryTrackInfo(String orderCode, String trackingNo) {