From 5adb3b16305a0d8dfdb8104a368d9dda6a4963f3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 18 九月 2025 13:47:29 +0800
Subject: [PATCH] Merge branch 'master' into pim_ywx
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 0f2d5f4..ab38808 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -8,17 +8,22 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.purchase.service.IPaymentRegistrationService;
import com.ruoyi.purchase.service.IProductRecordService;
import com.ruoyi.purchase.service.ITicketRegistrationService;
+import com.ruoyi.purchase.service.impl.PaymentRegistrationServiceImpl;
import com.ruoyi.sales.service.ICommonFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -40,11 +45,15 @@
@Api(tags = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
+ private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
private ITicketRegistrationService ticketRegistrationService;
private ICommonFileService commonFileService;
private IProductRecordService productRecordService;
+
+ @Autowired
+ private IPaymentRegistrationService paymentRegistrationService;
/**
* 鏌ヨ鏉ョエ鐧昏鍒楄〃
@@ -56,6 +65,32 @@
return getDataTable(list);
}
+ @ApiOperation("鏍规嵁id鏌ヨ浠樻娴佹按淇℃伅")
+ @GetMapping("/getById")
+ public List<PaymentRegistrationDto> getById( Long id ) {
+ return ticketRegistrationService.getPaymentRegistrationDtoById(id);
+ }
+
+ @ApiOperation("鏍规嵁id鏌ヨ浠樻娴佹按")
+ @GetMapping("/getPaymentRegistrationById")
+ public AjaxResult getPaymentRegistrationById(Long id) {
+ PaymentRegistration byId = paymentRegistrationService.getById(id);
+ return AjaxResult.success(byId);
+ }
+
+ @ApiOperation("淇敼浠樻娴佹按")
+ @PutMapping("/updatePaymentRegistration")
+ @Log(title = "淇敼浠樻娴佹按", businessType = BusinessType.UPDATE)
+ public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
+ return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
+ }
+
+ @ApiOperation("鍒犻櫎浠樻娴佹按")
+ @DeleteMapping("/delPaymentRegistration")
+ public AjaxResult delPaymentRegistration(@RequestBody Long id) {
+ return toAjax(paymentRegistrationService.delPaymentRegistration(id));
+ }
+
/**
* 瀵煎嚭鏉ョエ鐧昏鍒楄〃
*/
--
Gitblit v1.9.3