用户登录记录查询

src/main/java/com/chelvc/cloud/admin/controller/LoginController.java

@@ -0,0 +1,37 @@
+package com.chelvc.cloud.admin.controller;
+
+import com.chelvc.cloud.uc.api.dto.LoginDTO;
+import com.chelvc.cloud.uc.api.param.LoginPagingParam;
+import com.chelvc.cloud.uc.api.service.LoginService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
+import com.chelvc.framework.common.model.Pagination;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 用户登陆记录接口
+ *
+ * @author liude
+ * @date 2024/4/30
+ */
+@Validated
+@RestController
+@ResponseWrapping
+public class LoginController {
+    @DubboReference
+    private LoginService loginService;
+    /**
+     * 查询用户分页
+     *
+     * @param param 查询参数
+     * @return 用户分页信息
+     */
+    @GetMapping("/login/paging")
+    public Pagination<LoginDTO> getLoginPaging(@Valid LoginPagingParam param) {
+        return this.loginService.getLoginPaging(param);
+    }
+}

src/main/java/com/chelvc/cloud/admin/controller/MerchantAuthController.java

@@ -52,4 +52,28 @@ public class MerchantAuthController {
                                    String state ) {
         this.merchantAuthService.certificationAudit(id, state);
     }
+
+
+    /**
+     * 新增商家认证
+     *
+     * @param param 新增参数
+     * @return 商家商家认证主键
+     */
+    @PostMapping("/merchantAuth")
+    public Long addMerchantAuth(@RequestBody @Valid MerchantAuthModifyParam param) {
+        return this.merchantAuthService.addMerchantAuth(param);
+    }
+
+    /**
+     * 修改商家商家认证
+     *
+     * @param id    商家商家认证主键
+     * @param param 修改参数
+     */
+    @PutMapping("/merchantAuth/{id}")
+    public void updateMerchantAuth(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
+                                   @RequestBody @Valid MerchantAuthModifyParam param) {
+        this.merchantAuthService.updateMerchantAuth(id, param);
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/MerchantController.java

@@ -147,7 +147,7 @@ public class MerchantController {
      *
      * @return 获取经营报表状况
      */
-    @GetMapping("/merchant/operatReport")
+    @PostMapping("/merchant/operatReport")
     public List<Map<String,Object>> operatReport(@RequestBody @Valid ReportModifyParam param) {
         return this.merchantService.operatReport(param);
     }

src/main/java/com/chelvc/cloud/admin/controller/ReservationController.java

@@ -6,12 +6,14 @@ import com.chelvc.cloud.vehicle.api.service.ReservationService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Min;
 
 /**
  * 预约管理接口
@@ -36,4 +38,14 @@ public class ReservationController {
     public Pagination<ReservationDTO> getReservationPaging(@Valid ReservationPagingParam param) {
         return this.reservationService.getReservationPaging(param);
     }
+
+    /**
+     * 更新预约单的状态
+     * @param id 预约单ID
+     * @param status 预约单的状态
+     */
+    @PutMapping("/updateReservationsStatus/{id}")
+    public void updateReservationsStatus(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id, @Valid String status) {
+        this.reservationService.updateReservationsStatus(id, status);
+    }
 }