From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
index 4830876..fcfdc64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
@@ -68,8 +68,8 @@
* @return 单条数据
*/
@GetMapping("{id}")
- public R selectOne(@PathVariable("id") Serializable id) {
- return R.ok(this.comActRaffleRecordService.getById(id));
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.comActRaffleRecordService.selectById(id);
}
/**
@@ -93,6 +93,10 @@
*/
@PostMapping("/update")
public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
+ ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
+ if(comActRaffleRecord1.getStatus()!=1){
+ return R.fail("核销失败");
+ }
ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));
--
Gitblit v1.7.1