From 9c5b811fb700bc66e66dbf38ed8733e57a4edac6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:19:14 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 9a34f86..b43d503 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
@@ -69,7 +69,7 @@
      */
     @GetMapping("{id}")
     public R selectOne(@PathVariable("id") Long id) {
-        return R.ok(this.comActRaffleRecordService.selectById(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().equals(comActRaffleRecordVO.getStatus())){
+            return R.fail("不可重复核销");
+        }
         ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
         BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
         return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));

--
Gitblit v1.7.1