From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVipConfigServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVipConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVipConfigServiceImpl.java
index 96d1af4..20cc3c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVipConfigServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVipConfigServiceImpl.java
@@ -76,8 +76,16 @@
if (StringUtil.isNullOrEmpty(record.getKey()))
throw new UserVipConfigException(1, "鏍囪瘑涓嶈兘涓虹┖");
+
+ String remark = record.getRemark();
+ if ("null".equalsIgnoreCase(remark)) {
+ record.setRemark("");
+ }
+
+
record.setUpdateTime(new Date());
if (record.getId() == null) {
+ record.setStartTime(new Date());
record.setCreateTime(new Date());
userVipConfigMapper.insert(record);
} else {
--
Gitblit v1.8.0