Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -43,6 +43,10 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
     //TASK 倒计时
     boolean checkOrderTime(String userId);
 
+    //TASK 订单状态
+    ResponseDto<Integer> checkOrderResult(String orderId);
+
+
     // 下单接口(无订单->待支付->可支付)
     // 删除订单
     // 代理票务 可买状态判断

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -70,6 +71,18 @@ public class KylinOrderTicketsController {
         return ResponseDto.success(orderTicketsService.orderDetails(orderId));
     }
 
+    @GetMapping("checkPayment")
+    @ApiOperation("订单详情")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") String orderId) {
+        Integer status = orderTicketsService.checkOrderResult(orderId).getData();
+        HashMap<String,Integer> map = new HashMap<>();
+        map.put("status",status);
+        return ResponseDto.success(map);
+    }
+
+
+
     @GetMapping("checkOrderTime")
     @ApiOperation("订单过期脚本")
     @ApiResponse(code = 200, message = "接口返回对象参数")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -823,6 +823,22 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         return true;
     }
 
+    @Override
+    public ResponseDto<Integer> checkOrderResult(String orderId) {
+        KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId);
+        if (orderTicketData == null) {
+            return ResponseDto.failure("订单不存在");
+        }else{
+            String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
+            PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
+            if (checkVo.getStatus() == 1) {
+                return ResponseDto.success(1);
+            }else{
+                return ResponseDto.success(0);
+            }
+        }
+    }
+
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
         boolean isAgent = ticketData.getIsAgent() == 1;
         if (isAgent) {