提交 票务查看支付状态接口

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

@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.dto.param.SyncOrderDtoParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -30,6 +31,6 @@ public interface IKylinOrderTicketsOrderService {
     String syncOrder(SyncOrderParam syncOrderParam);
 
     //去 PHP pay检查 订单状态
-    ResponseDto<Integer> checkOrderResult(String orderId);
+    ResponseDto<HashMap<String,Object>> checkOrderResult(String orderId);
 
 }

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

@@ -81,14 +81,7 @@ public class KylinOrderTicketsController {
     @GetMapping("checkPayment")
     @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单ID不能为空") String orderId) {
-        Integer status = orderTicketsOrderService.checkOrderResult(orderId).getData();
-        if (null == status) {
-            return ResponseDto.failure(ErrorMapping.get("20003"));
-        } else {
-            HashMap<String, Integer> map = ObjectUtil.cloneHashMapStringAndInteger();
-            map.put("status", status);
-            return ResponseDto.success(map);
-        }
+    public ResponseDto<HashMap<String, Object>> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单ID不能为空") String orderId) {
+        return orderTicketsOrderService.checkOrderResult(orderId);
     }
 }

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

@@ -1076,14 +1076,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     }
 
     @Override
-    public ResponseDto<Integer> checkOrderResult(String orderId) {
+    public ResponseDto<HashMap<String,Object>> checkOrderResult(String orderId) {
         String uid = CurrentUtil.getCurrentUid();
         KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId);
         if (orderTicketData == null) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {
             if (!orderTicketData.getUserId().equals(uid)) {
-                return null;
+                ResponseDto.failure(ErrorMapping.get("20003"));
             }
             DragonPayOrderQueryRespDto data = dragonOrdersService.checkOrderStatusByCode(orderTicketData.getPayCode());
             SyncOrderParam syncOrderDtoParam = SyncOrderParam.getNew();
@@ -1095,13 +1095,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             syncOrderDtoParam.setPrice(data.getPrice());
             syncOrderDtoParam.setStatus(data.getStatus());
             syncOrderDtoParam.setType(data.getType());
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
+            map.put("performanceId", orderTicketData.getPerformanceId());
             if (syncOrderDtoParam.getStatus() == 1) {
                 //处理订单
                 syncOrder(syncOrderDtoParam);
-                return ResponseDto.success(1);
+                map.put("status", 1);
             } else {
-                return ResponseDto.success(0);
+                map.put("status", 0);
             }
+            return ResponseDto.success(map);
         }
     }