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

@@ -9,6 +9,7 @@ import com.liquidnet.service.goblin.param.GoblinBraceletOrderPayParam;
 import com.liquidnet.service.goblin.param.dougong.DougongSyncCallbackparam;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IGoblinBraceletOrderService extends IService<GoblinBraceletOrder> {
 
@@ -21,10 +22,11 @@ public interface IGoblinBraceletOrderService extends IService<GoblinBraceletOrde
 
     /**
      * 校验订单状态
+     *
      * @param orderId
      * @return
      */
-    ResponseDto<Integer> checkOrderResult(String orderId);
+    ResponseDto<Map<String, Object>> checkOrderResult(String orderId);
 
     /**
      * 斗拱支付回调

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

@@ -50,7 +50,7 @@ public class GoblinBraceletOrderController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单ID", example = "1"),
     })
-    public ResponseDto<Integer> checkOrderResult(@RequestParam("orderId") @NotBlank(message = "订单ID不能为空") String orderId) {
+    public ResponseDto<Map<String, Object>> checkOrderResult(@RequestParam("orderId") @NotBlank(message = "订单ID不能为空") String orderId) {
         return braceLetOrderService.checkOrderResult(orderId);
     }
 

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

@@ -218,7 +218,7 @@ public class GoblinBraceletOrderServiceImpl extends ServiceImpl<GoblinBraceletOr
     }
 
     @Override
-    public ResponseDto<Integer> checkOrderResult(String orderId) {
+    public ResponseDto<Map<String, Object>> checkOrderResult(String orderId) {
         final String uid = CurrentUtil.getCurrentUid();
         GoblinBraceletOrderVo braceletOrderVo = goblinRedisUtils.getBraceletOrderVo(orderId);
         if (braceletOrderVo == null) {
@@ -229,7 +229,10 @@ public class GoblinBraceletOrderServiceImpl extends ServiceImpl<GoblinBraceletOr
             log.error("暂无权限");
             return ResponseDto.failure("暂无权限");
         }
-        return ResponseDto.success(braceletOrderVo.getPayStatus());
+        Map<String, Object> map = new HashMap<>();
+        map.put("status", braceletOrderVo.getPayStatus());
+        map.put("outno", braceletOrderVo.getFoutTradeNo());
+        return ResponseDto.success(map);
     }
 
     @Override