From 118afd697fe3197236dcf0ffd6cfd39bcec2d85f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 14 七月 2025 13:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 93cb18a..ab38808 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -8,13 +8,24 @@
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.*;
import org.springframework.web.multipart.MultipartFile;
@@ -31,13 +42,18 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
+@Api(tags = "鏉ョエ鐧昏")
public class TicketRegistrationController extends BaseController {
+ private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
private ITicketRegistrationService ticketRegistrationService;
private ICommonFileService commonFileService;
private IProductRecordService productRecordService;
+
+ @Autowired
+ private IPaymentRegistrationService paymentRegistrationService;
/**
* 鏌ヨ鏉ョエ鐧昏鍒楄〃
@@ -47,6 +63,32 @@
startPage();
List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
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));
}
/**
@@ -77,17 +119,34 @@
return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
}
+
+ @GetMapping("/getProductRecordById")
+ public AjaxResult getProductRecordById(Long id) {
+ if (id == null) {
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ return AjaxResult.success(productRecordService.getProductRecordById(id));
+ }
+
+ @ApiModelProperty("淇敼鏉ョエ鐧昏")
+ @PostMapping("/updateRegistration")
+ public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
+
+ return productRecordService.updateRecord(productRecordDto);
+ }
+
/**
- * 鍒犻櫎鏉ョエ鐧昏
+ * 鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)
*/
- @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.DELETE)
+ @Log(title = "鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)", businessType = BusinessType.DELETE)
@DeleteMapping("/delRegistration")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult delRegistration(@RequestBody Long[] ids) {
return toAjax(ticketRegistrationService.delRegistration(ids));
}
@PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
+ public AjaxResult uploadFile(MultipartFile file, Long id, Integer type) {
try {
return AjaxResult.success(commonFileService.uploadFile(file, id, type));
} catch (Exception e) {
@@ -105,6 +164,16 @@
}
/**
+ * 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+ */
+ @GetMapping("/productRecordPage")
+ public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+
+ IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
+ return AjaxResult.success(list);
+ }
+
+ /**
* 鏌ヨ鍙戠エ鍙�
*/
@GetMapping("/getTicketNo")
@@ -119,4 +188,13 @@
public IPage<TicketRegistration> listPage(Page page, TicketRegistration ticketRegistration) {
return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
}
+
+ @ApiModelProperty("鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
+ @GetMapping("/getPuargeById")
+ public AjaxResult getPuargeById(Long id) {
+ return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
+ }
+
+
+
}
--
Gitblit v1.9.3