From ac337f75ec0277e9ddfa2dfd5ff84e0277d378b3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 25 十二月 2025 14:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/jiashida
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java | 63 +++++++------------------------
1 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java
index ea0a100..a041c3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TRefundApplicationController.java
@@ -14,6 +14,7 @@
import com.ruoyi.system.export.TPhysicalGoodsImport;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.BigGiftPackageQuery;
+import com.ruoyi.system.query.RefundApplicationQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TBigGiftPackageOrderService;
import com.ruoyi.system.service.TBigGiftPackageService;
@@ -48,21 +49,17 @@
private final TRefundApplicationService tRefundApplicationService;
private final TokenService tokenService;
private final TBigGiftPackageOrderService tBigGiftPackageOrderService;
- private final TAppUserService tAppUserService;
- private final TBigGiftPackageService tBigGiftPackageService;
- public TRefundApplicationController(TRefundApplicationService tRefundApplicationService, TokenService tokenService, TBigGiftPackageOrderService tBigGiftPackageOrderService, TAppUserService tAppUserService, TBigGiftPackageService tBigGiftPackageService) {
+ public TRefundApplicationController(TRefundApplicationService tRefundApplicationService, TokenService tokenService, TBigGiftPackageOrderService tBigGiftPackageOrderService) {
this.tRefundApplicationService = tRefundApplicationService;
this.tokenService = tokenService;
this.tBigGiftPackageOrderService = tBigGiftPackageOrderService;
- this.tAppUserService = tAppUserService;
- this.tBigGiftPackageService = tBigGiftPackageService;
}
@ApiOperation(value = "退款申请列表")
@PostMapping(value = "/pageRefundList")
- public R<Page<TBigGiftPackageOrder>> pageRefundList(@RequestBody BigGiftPackageQuery query) {
+ public R<Page<TBigGiftPackageOrder>> pageRefundList(@RequestBody RefundApplicationQuery query) {
Page<TBigGiftPackageOrder> page = tRefundApplicationService.pageRefundList(query);
return R.ok(page);
}
@@ -71,50 +68,17 @@
@ApiOperation(value = "退款申请详情")
@GetMapping(value = "/refundDetail/{id}")
public R<TRefundApplicationVo> refundDetail(@PathVariable Integer id) {
+ return R.ok(tRefundApplicationService.refundDetail(id));
+ }
+
+ @ApiOperation(value = "退款申请删除")
+ @DeleteMapping(value = "/delete/{id}")
+ @Log(title = "退款申请-删除", businessType = BusinessType.DELETE)
+ public R<String> delete(@PathVariable Integer id) {
TRefundApplication refundApplication = tRefundApplicationService.getById(id);
- TRefundApplicationVo vo = new TRefundApplicationVo();
- vo.setId(refundApplication.getId());
- vo.setBigGiftPackageOrderId(refundApplication.getBigGiftPackageOrderId());
-
- // 订单信息
- TBigGiftPackageOrder order = tBigGiftPackageOrderService.getById(refundApplication.getBigGiftPackageOrderId());
- vo.setCode(order.getCode());
- vo.setCreateTime(order.getCreateTime());
- vo.setOrderPrice(order.getOrderPrice());
-
- // 用户信息
- TAppUser appUser = tAppUserService.getById(order.getAppUserId());
- vo.setUserName(appUser.getName());
- vo.setPhone(appUser.getPhone());
-
-
- // 商品信息
- TBigGiftPackage tBigGiftPackage = tBigGiftPackageService.getById(order.getBigGiftPackageId());
- vo.setBigGiftPackageName(tBigGiftPackage.getName());
- vo.setBigGiftPackageCover(tBigGiftPackage.getCoverImage());
- vo.setBigGiftPackagePrice(tBigGiftPackage.getTotalPrice());
- vo.setBigGiftPackageIntro(tBigGiftPackage.getIntroduction());
-
- // 销量
- long count = tBigGiftPackageOrderService.count(new LambdaQueryWrapper<TBigGiftPackageOrder>().eq(TBigGiftPackageOrder::getBigGiftPackageId, order.getBigGiftPackageId()).ne(TBigGiftPackageOrder::getStatus, 5));
- vo.setBigGiftPackageSales((int)count);
-
- // 支付信息
- vo.setStatus(order.getStatus());
- vo.setOrderAmount(order.getOrderPrice());
- vo.setFinalPayment(order.getFinalPayment());
- vo.setPaidTime(order.getFinalPaymentTime());
- vo.setRemark(order.getRemark());
-
- // 退款信息
- vo.setRefundReason(refundApplication.getRefundReason());
- vo.setVoucherPicture(refundApplication.getVoucherPicture());
- vo.setRefundStatus(refundApplication.getStatus());
-
- // 审核信息
- vo.setAuditRemark(refundApplication.getAuditRemark());
- vo.setAuditTime(refundApplication.getAuditTime());
- return R.ok(vo);
+ refundApplication.setDelFlag(1);
+ tRefundApplicationService.updateById(refundApplication);
+ return R.ok();
}
@ApiOperation(value = "退款申请审核")
@@ -137,6 +101,7 @@
return R.ok("操作成功");
}
+
@ApiOperation(value = "退款申请导出")
@PostMapping(value = "/export")
@Log(title = "退款申请-导出", businessType = BusinessType.EXPORT)
--
Gitblit v1.7.1