Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-11-10 c094aa1a63e711a632f24a17f21462778829ecc7

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 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("支付失败");

 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);
        }
    }