From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 4 +++-
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 2 ++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index 0f52a1a..dce33d3 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -283,6 +283,8 @@
distribService.distribRecord(order.getId(), order.getUserId());
// 推荐返利
distribService.inviteAddOrderScore(order.getUserId(), order.getId().toString());
+ } catch (RestException e) {
+ throw new RestException(e.getMessage());
} catch (Exception e) {
log.error("异常", e);
throw new RestException("支付失败");
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index bd1ee31..4cb50d3 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -530,7 +530,9 @@
sysMessage.setFlag("2");
sysMessageMapper.insert(sysMessage);
- redisUtil.setex(key, times.toString(), 84400);
+ Date tomorrow = DateUtil.parse(DateUtil.tomorrow().toString("yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+ long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, false);
+ redisUtil.setex(key, times.toString(), (int) time);
}
}
--
Gitblit v1.9.1