Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

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

@@ -395,5 +395,15 @@ public class OrderController {
     public BaseResponse queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
         return orderservice.queryOrderRider(requestVo);
     }
+    /**
+     * timeOutRefund
+     * @param timeOutOrderVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "timeOutOrderRefund")
+    @PostMapping("/timeOutOrderRefund")
+    public BaseResponse timeOutOrderRefund(@Validated @LogParams @RequestBody TimeOutOrderVo timeOutOrderVo){
+        return orderservice.timeOutOrderRefund(timeOutOrderVo);
+    }
 
 }

order-application-service/src/main/java/cn/freemud/entities/vo/TimeOutOrderVo.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 lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+@Data
+public class TimeOutOrderVo {
+
+    @NotEmpty(message = "订单编号不能为空")
+    private String oid;
+
+    private String partnerId;
+
+}

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

@@ -144,4 +144,6 @@ public interface Orderservice {
     BaseResponse queryCollageOrderById(Integer operation,String sessionId, String oid, String partnerId,String channel);
 
     BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
+
+    BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo);
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1265,6 +1265,20 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responseVo);
     }
 
+    @Override
+    public BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo) {
+        Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = this.getOrderBeanByOrderId(timeOutOrderVo.getOid());
+        if (MapUtils.isEmpty(orderBeans)) {
+            ResponseUtil.error("404","订单不存在");
+        }
+        QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
+
+        if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
+            this.timeOutRefund(orderBean);
+        }
+        return ResponseUtil.success();
+    }
+
     private String getRedpacketsPicture(String activityId) {
         if (StringUtils.isNotBlank(activityId)) {
             try {
@@ -3746,4 +3760,5 @@ public class OrderServiceImpl implements Orderservice {
             }
         }
     }
+
 }