From d0e96daddf8d06900c468ee71a8ee4f14fc1c980 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 10:28:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index 57982d2..8a2c528 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -1,9 +1,18 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.order.api.model.TOrderAppeal;
+import com.ruoyi.order.api.query.TOrderAppealQuery;
+import com.ruoyi.order.api.vo.TOrderAppealVO;
+import com.ruoyi.order.service.TOrderAppealService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -13,10 +22,51 @@
* @author xiaochen
* @since 2024-08-07
*/
-@Api(tags = "订单申诉")
@RestController
@RequestMapping("/t-order-appeal")
public class TOrderAppealController {
+ private final TOrderAppealService orderAppealService;
+ private final TokenService tokenService;
+
+ @Autowired
+ public TOrderAppealController(TOrderAppealService orderAppealService, TokenService tokenService) {
+ this.orderAppealService = orderAppealService;
+ this.tokenService = tokenService;
+ }
+
+ /**
+ * 查询订单申诉列表
+ */
+ @ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉分页列表")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TOrderAppealVO>> pageList(@RequestBody TOrderAppealQuery query) {
+ // TODO 用户id 获取小程序当前登录用户id
+ Long userId = tokenService.getLoginUser().getUserid();
+ query.setAppUserId(userId);
+ return AjaxResult.ok(orderAppealService.pageList(query));
+ }
+
+ /**
+ * 查询订单申诉详情
+ */
+ @GetMapping(value = "/getDetailById")
+ @ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉详情")
+ public AjaxResult<TOrderAppealVO> getDetailById(Integer id) {
+ return AjaxResult.ok(orderAppealService.getDetailById(id));
+ }
+
+
+
+ @ResponseBody
+ @PostMapping(value = "/addOrderAppeal")
+ @ApiOperation(value = "申诉订单", tags = {"小程序-充电记录（个人中心）"})
+ public AjaxResult addOrderAppeal(@RequestBody TOrderAppeal orderAppeal){
+ Long appUserId = tokenService.getLoginUserApplet().getUserId();
+ orderAppeal.setAppUserId(appUserId);
+ orderAppeal.setStatus(1);
+ orderAppealService.save(orderAppeal);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1