Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.11-查询未支付订单-海波'

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

@@ -282,4 +282,14 @@ public interface OrderCenterSdkService {
      * @return
      */
     QueryOrderByIdResponse queryOrderByCodeES(String orderCode, String partnerId, String trackNo);
+
+
+    /**
+     * 根据用户ID 查询30分钟内未支付并且有券的 订单
+     *
+     * @param userId              用户ID
+     * @param trackingNo           交易号
+     * @return
+     */
+    QueryOrdersResponse queryOrderWithCoupon(String userId, String trackingNo);
 }

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

@@ -1300,4 +1300,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         QueryOrderByIdResponse orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(orderInfo);
         return orderByIdResponse;
     }
+
+    @Override
+    public QueryOrdersResponse queryOrderWithCoupon(String userId, String trackingNo) {
+
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse response
+                = orderSdkService.queryOrderWithCoupon(userId, trackingNo);
+        return orderSdkAdapter.convent2QueryOrdersResponse(response);
+    }
 }

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

@@ -21,6 +21,7 @@ import cn.freemud.monitorcenter.tools.HealthUtil;
 import cn.freemud.service.EncircleOrderService;
 import cn.freemud.service.OrderAdapterService;
 import cn.freemud.service.Orderservice;
+import cn.freemud.utils.ResponseUtil;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.ApiOperation;
@@ -195,4 +196,14 @@ public class OrderController {
         return encircleOrderService.queryTableNumberStatus(encircleReserveBaseVo);
     }
 
+    /**
+     * 查询30分钟未支付的优惠券订单
+     */
+    @ApiAnnotation(logMessage = "queryOrderWithCoupon")
+    @ApiOperation(value = "查询30分钟未支付的优惠券订单", notes = "查询30分钟未支付的优惠券订单", produces = "application/json")
+    @PostMapping("/queryOrderWithCoupon")
+    public BaseResponse queryOrderWithCoupon(@LogParams @RequestBody QueryOrderWithCouponVo orderWithCouponVo) {
+        return ResponseUtil.success();
+    }
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderWithCouponVo.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: GetProductVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/5/16 17:35
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.entities.vo;
+
+import cn.freemud.entities.dto.UserDeliveryInfoDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.util.List;
+
+
+@Data
+public class QueryOrderWithCouponVo {
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+
+}

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

@@ -151,4 +151,9 @@ public class InterfaceAddressConstant {
      * 根据订单号查询订单详情
      */
     public static final String QUERY_ORDER_BY_CODE = "order/v2/queryOrderByCode";
+
+    /**
+     * 根据用户ID 查询30分钟内未支付并且有券的 订单
+     */
+    public static final String QUERY_ORDER_WITH_COUPON="order/v2/queryOrderWithCoupon";
 }

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

@@ -657,4 +657,19 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * 根据用户ID 查询30分钟内未支付并且有券的 订单
+     *
+     * @param userId              用户ID
+     * @param trackingNo           交易号
+     * @return
+     */
+    public BaseResponse<QueryOrderForUserResp> queryOrderWithCoupon(String userId, String trackingNo) {
+        String url = InterfaceAddressConstant.QUERY_ORDER_WITH_COUPON + "?userId=" + userId;
+        OrderBaseResp<QueryOrderForUserResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, url,
+                createBaseRequest(null, trackingNo), new ParameterizedTypeReference<OrderBaseResp<QueryOrderForUserResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }