Ver código fonte

feat : 打包错误修改

bilingfeng 2 anos atrás
pai
commit
b2abde1989

+ 2 - 1
game-module/game-common/src/main/java/com/zanxiang/common/domain/ResultMap.java

@@ -47,13 +47,14 @@ public class ResultMap extends HashMap<String, Object> {
         return r;
         return r;
     }
     }
 
 
-    public static ResultMap ok(Integer deviceType, Object data) {
+    public static ResultMap ok(Integer deviceType, Object data, String orderId) {
         ResultMap r = new ResultMap();
         ResultMap r = new ResultMap();
         r.put("code", HttpStatusEnum.SUCCESS.getCode());
         r.put("code", HttpStatusEnum.SUCCESS.getCode());
         r.put("msg", HttpStatusEnum.SUCCESS.getMsg());
         r.put("msg", HttpStatusEnum.SUCCESS.getMsg());
         HashMap<String, Object> dataMap = new HashMap<>(2);
         HashMap<String, Object> dataMap = new HashMap<>(2);
         dataMap.put("data", data);
         dataMap.put("data", data);
         dataMap.put("deviceType", deviceType);
         dataMap.put("deviceType", deviceType);
+        dataMap.put("orderId", orderId);
         r.put("data", dataMap);
         r.put("data", dataMap);
         return r;
         return r;
     }
     }

+ 2 - 2
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/PayController.java

@@ -95,8 +95,8 @@ public class PayController {
     }
     }
 
 
     @ApiOperation(value = "获取订单支付结果")
     @ApiOperation(value = "获取订单支付结果")
-    @RequestMapping(value = "/get/result", method = RequestMethod.GET)
-    public ResultVO<Boolean> getResult(String orderId) {
+    @GetMapping(value = "/get/result")
+    public ResultVO<Boolean> getResult(@RequestParam String orderId) {
         return ResultVO.ok(orderPayService.payResult(orderId));
         return ResultVO.ok(orderPayService.payResult(orderId));
     }
     }