浙里办

hmit-api/src/main/java/io/hmit/controller/ApiLoginController.java

@@ -104,11 +104,15 @@ public class ApiLoginController {
                     userService.insert(user);
 
                     userId = user.getId();
+                    userMap.put("userId",user_map.get("userid").toString());
+                    userMap.put("userNick",user_map.get("username").toString());
                     userMap.put("username", user.getUsername());
                     userMap.put("mobile", user.getMobile());
                     userMap.put("idnum",user.getIdCardNo());
                 }else{
                     userId = oldUser.getId();
+                    userMap.put("userId",user_map.get("userid").toString());
+                    userMap.put("userNick",user_map.get("username").toString());
                     userMap.put("username", oldUser.getUsername());
                     userMap.put("mobile", oldUser.getMobile());
                     userMap.put("idnum",oldUser.getIdCardNo());

hmit-api/src/main/java/io/hmit/modules/appointment/controller/AppointmentOrderController.java

@@ -83,9 +83,13 @@ public class AppointmentOrderController {
     }
 
     @Login
-    @GetMapping("{id}")
+    @GetMapping("getDetail")
     @ApiOperation("信息,预约详情接口")
-    public Result<AppointmentOrderDTO> get(@PathVariable("id") Long id){
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "预约的主键id", paramType = "query", required = true, dataType="Long")
+    })
+    public Result<AppointmentOrderDTO> getDetail(@ApiIgnore @RequestParam Map<String,Object> params){
+        Long id =Long.valueOf(params.get("id").toString());
         AppointmentOrderDTO data = appointmentOrderService.get(id);
         if(null!=data.getStatus() && Constant.ReservationStatus.GET_NUM.getValue()<=data.getStatus() ) {
             data.setYynumberDTO(appointmentOrderService.findByYuNumber(data.getAppointmentNum()));
@@ -152,10 +156,10 @@ public class AppointmentOrderController {
     }
 
     @Login
-    @GetMapping("/cancel/{id}")
+    @GetMapping("/cancel")
     @ApiOperation("预约取消")
-    public Result cancelReservation(@PathVariable("id") Long id,@ApiIgnore @LoginUser UserEntity user){
-
+    public Result cancelReservation(@ApiIgnore @RequestParam Map<String,Object> params,@ApiIgnore @LoginUser UserEntity user){
+        Long id =Long.valueOf(params.get("id").toString());
         AppointmentOrderDTO data = appointmentOrderService.get(id);
         data.setStatus(Constant.ReservationStatus.CANCEL.getValue());
         data.setStatusName(Constant.ReservationStatus.CANCEL.getMsg());
@@ -168,10 +172,10 @@ public class AppointmentOrderController {
     }
 
     @Login
-    @GetMapping("/deleteOverNum/{id}")
+    @GetMapping("/deleteOverNum")
     @ApiOperation("消除过号")
-    public Result deleteOverNum(@PathVariable("id") Long id,@ApiIgnore @LoginUser UserEntity user){
-
+    public Result deleteOverNum(@ApiIgnore @RequestParam Map<String,Object> params,@ApiIgnore @LoginUser UserEntity user){
+        Long id =Long.valueOf(params.get("id").toString());
         AppointmentOrderDTO data = appointmentOrderService.get(id);
         data.setStatus(Constant.ReservationStatus.ELIMINATE_INVALID_NUM.getValue());
         data.setStatusName(Constant.ReservationStatus.ELIMINATE_INVALID_NUM.getMsg());
@@ -182,10 +186,10 @@ public class AppointmentOrderController {
         return new Result();
     }
 
-    @GetMapping(value = "/signin/{appointmentOrderId}")
+    @GetMapping(value = "/signin")
     @ApiOperation("签到")
-    public Result signin(@PathVariable(value = "appointmentOrderId") Long appointmentOrderId){
-
+    public Result signin(@ApiIgnore @RequestParam Map<String,Object> params,@ApiIgnore @LoginUser UserEntity user){
+        Long appointmentOrderId =Long.valueOf(params.get("id").toString());
         //根据appointmentOrderId获取到订单实体
         AppointmentOrderDTO appointmentOrderDTO = appointmentOrderService.get(appointmentOrderId);