From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/activation/controller/ActivationController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/activation/controller/ActivationController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/activation/controller/ActivationController.java
index 5c69a2b..9605dd8 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/activation/controller/ActivationController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/activation/controller/ActivationController.java
@@ -119,6 +119,15 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入survey")
public R submit(@Valid Activation activation) {
+ //首先需判断票号是否存在
+
+ //如存在，判断该票是否已激活
+
+ //若已经激活，则返回已激活
+
+ //未激活，进入激活流程
+
+
return R.status(activationService.saveOrUpdate(activation));
}
--
Gitblit v1.9.3