From 0ce689b428cf9ceb58972db2bdd42a1a176f8f20 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 11 七月 2025 14:52:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 40ec673..ae4141b 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -83,11 +83,20 @@
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 TicketRegistrationDto ticketRegistrationDto) {
+ public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
- return AjaxResult.success();
+ return productRecordService.updateRecord(productRecordDto);
}
/**
--
Gitblit v1.9.3