Merge remote-tracking branch 'origin/jxl-lixianzhifu' into jxl-lixianzhifu

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinBraceLetOrderService.java

@@ -20,5 +20,9 @@ public interface IGoblinBraceLetOrderService {
      */
     ResponseDto<Integer> checkOrderResult(String orderId);
 
+    /**
+     * 斗拱支付回调
+     * @return
+     */
     ResponseDto<Boolean> dougongCallBack();
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinBraceletOrderController.java

@@ -39,7 +39,7 @@ public class GoblinBraceletOrderController {
     }
 
 
-    @PostMapping("/checkPayment")
+    @GetMapping("/checkPayment")
     @ApiOperation("查询订单状态")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单ID", example = "1"),

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinBraceLetOrderServiceImpl.java

@@ -245,7 +245,13 @@ public class GoblinBraceLetOrderServiceImpl implements IGoblinBraceLetOrderServi
 
     @Override
     public ResponseDto<Integer> checkOrderResult(String orderId) {
-        return null;
+        final String uid = CurrentUtil.getCurrentUid();
+        GoblinBraceletOrderVo braceletOrderVo = goblinRedisUtils.getBraceletOrderVo(uid, orderId);
+        if (braceletOrderVo == null) {
+            log.error("订单不存在");
+            return ResponseDto.failure("订单不存在");
+        }
+        return ResponseDto.success(braceletOrderVo.getPayStatus());
     }
 
     @Override