From fbb35a6b9ed181fa7e5d7bc1fb0c3318a1d18db1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 13:50:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 293 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 182 insertions(+), 111 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 6153bb3..ac038fe 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -8,11 +8,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.BalanceChangeRecordClient;
+import com.ruoyi.account.api.feignClient.UserCouponClient;
import com.ruoyi.account.api.feignClient.UserPointClient;
import com.ruoyi.account.api.model.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.QRCodeGenerator;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.enums.OrderStatus;
@@ -22,14 +24,12 @@
import com.ruoyi.order.model.OrderBalancePayment;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.model.RefundPass;
-import com.ruoyi.order.service.CommissionService;
-import com.ruoyi.order.service.OrderBalancePaymentService;
-import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.service.RefundPassService;
+import com.ruoyi.order.service.*;
import com.ruoyi.order.util.ExpressDeliveryUtil;
import com.ruoyi.order.util.payment.PaymentUtil;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.payment.model.RefundResult;
+import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.util.vo.QueryKD100Vo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.*;
@@ -37,13 +37,16 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
+import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -98,6 +101,19 @@
@Resource
private RefundPassService refundPassService;
+ @Resource
+ private TechnicianSubscribeClient technicianSubscribeClient;
+ @Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private SystemConfigClient systemConfigClient;
+
+ @Resource
+ private UserCouponClient userCouponClient;
@@ -135,17 +151,16 @@
orderGoodsVO.setGoodsName(goods.getName());
orderGoodsVO.setType(goods.getType());
orderGoodsVO.setGoodsPic(goods.getHomePagePicture());
- orderGoodsVO.setSellingPrice(goods.getSellingPrice());
- orderGoodsVO.setIntegral(goods.getIntegral());
+ orderGoodsVO.setSellingPrice(orderGood.getSellingPrice());
+ orderGoodsVO.setIntegral(orderGood.getIntegral());
orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
goodsList.add(orderGoodsVO);
}
// 收货地址
String addressJson = order.getAddressJson();
UserAddress userAddress = new UserAddress();
- if (StringUtils.isNotEmpty(addressJson)){
+ if (2 == order.getDistributionMode()){
userAddress = JSONObject.parseObject(addressJson, UserAddress.class);
-
}
// 优惠券
String couponJson = order.getCouponJson();
@@ -161,13 +176,7 @@
orderActivityInfo = JSONObject.parseObject(activityJson, OrderActivityInfo.class);
}
OrderDetailVO orderDetailVO = new OrderDetailVO();
-
- if (CollectionUtil.isNotEmpty(orderGoods)){
- String goodJson = orderGoods.get(0).getGoodJson();
- Goods goods = JSONObject.parseObject(goodJson, Goods.class);
- orderDetailVO.setDistributionMode(goods.getDistributionMode());
- }
-
+ orderDetailVO.setDistributionMode(order.getDistributionMode());
Technician technician = new Technician();
if (order.getTechnicianId() != null){
R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
@@ -183,6 +192,7 @@
orderDetailVO.setAddressId(userAddress.getId());
orderDetailVO.setRecieveName(userAddress.getRecieveName());
orderDetailVO.setRecievePhone(userAddress.getRecievePhone());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderDetailVO.setRecieveAddress(userAddress.getRecieveAddress());
orderDetailVO.setOrderNumber(order.getOrderNumber());
orderDetailVO.setCreateTime(order.getCreateTime());
@@ -200,6 +210,22 @@
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
orderDetailVO.setTechnicianName(technician.getName());
+ orderDetailVO.setTechnicianId(technician.getId());
+ if(order.getOrderType() == 1){
+ List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+ if(data.size() > 0){
+ Long id = data.get(0).getId();
+ orderDetailVO.setTechnicianSubscribeId(id.toString());
+ }
+ }
+ // 生成核销码BASE64
+ try {
+ String base64 = QRCodeGenerator.generateQRCodeBase64(order.getOrderNumber(), 124, 124);
+ orderDetailVO.setWriteOffCode(base64);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new ServiceException("生成核销码失败");
+ }
return orderDetailVO;
}
@@ -256,6 +282,7 @@
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
+ order.setCancellerAppUserId(loginUserApplet.getUserid());
orderMapper.updateById(order);
}
@@ -433,6 +460,7 @@
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(paymentAmount);
@@ -440,6 +468,51 @@
balanceChangeRecord.setDelFlag(0);
balanceChangeRecord.setCreateTime(LocalDateTime.now());
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
+
+ //退回获得的消费积分
+ //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
+ Integer lavePoint = appUser.getLavePoint();
+
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(1);
+ userPoint1.setAppUserId(appUser.getId());
+ userPoint1.setObjectId(order.getId());
+ UserPoint userPoint2 = userPointClient.getUserPointList(userPoint1).getData().get(0);
+ JSONObject jsonObject = JSON.parseObject(userPoint2.getExtention());
+ Integer shopPoint = jsonObject.getInteger("shopPoint");
+ Integer availablePoint = jsonObject.getInteger("availablePoint");
+ Integer transferablePoint = jsonObject.getInteger("transferablePoint");
+ appUser.setShopPoint(appUser.getShopPoint() - shopPoint);
+ appUser.setLavePoint(appUser.getLavePoint() - shopPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - availablePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - availablePoint);
+ if(null != transferablePoint){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - transferablePoint);
+ }
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
+
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUser.setVipId(appUser.getVipId() - 1);
+ }
+
+ //构建积分流水明细
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(shopPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
+ //回退优惠券状态
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ userCoupon.setUseTime(null);
+ userCouponClient.editReturnUse(userCoupon);
+ }
}
if(3 == payMethod){
//开始运费退款，积分支付，运费是单独进行支付的，所以需要单独退款
@@ -468,6 +541,7 @@
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(expressAmount);
@@ -504,39 +578,6 @@
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
}
- //退回获得的消费积分
- //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- Integer lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
- //构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- appUserClient.editAppUserById(appUser);
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
@@ -559,26 +600,29 @@
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
this.updateById(order);
-
//退回获得的消费积分
//需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
Integer lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(1);
+ userPoint1.setAppUserId(appUser.getId());
+ userPoint1.setObjectId(order.getId());
+ UserPoint userPoint2 = userPointClient.getUserPointList(userPoint1).getData().get(0);
+ JSONObject jsonObject = JSON.parseObject(userPoint2.getExtention());
+ Integer shopPoint = jsonObject.getInteger("shopPoint");
+ Integer availablePoint = jsonObject.getInteger("availablePoint");
+ Integer transferablePoint = jsonObject.getInteger("transferablePoint");
+ appUser.setShopPoint(appUser.getShopPoint() - shopPoint);
+ appUser.setLavePoint(appUser.getLavePoint() - shopPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - availablePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - availablePoint);
+ if(null != transferablePoint){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - transferablePoint);
}
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
+
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
if(vipDemotion){
appUser.setVipId(appUser.getVipId() - 1);
}
@@ -587,13 +631,20 @@
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
+ userPoint.setVariablePoint(shopPoint);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
appUserClient.editAppUserById(appUser);
+
+ //回退优惠券状态
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ userCoupon.setUseTime(null);
+ userCouponClient.editReturnUse(userCoupon);
+ }
return R.ok();
}
@@ -640,44 +691,7 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
-
- //退回获得的消费积分
- //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
- //构建积分流水明细
- userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- appUserClient.editAppUserById(appUser);
-
- order.setRefundStatus(2);
- order.setRefundTime(LocalDateTime.now());
- return null;
+ return R.ok();
}
/**
@@ -755,18 +769,14 @@
orderInfo.setDiscountAmount(order.getDiscountTotalAmount());
orderInfo.setExpressAmount(order.getExpressAmount());
orderInfo.setPaymentAmount(order.getPaymentAmount());
- orderInfo.setPoint(order.getGetPoint());
- if(StringUtils.isNotEmpty(order.getAddressJson())){
+ orderInfo.setGetPoint(order.getGetPoint());
+ if(2 == order.getDistributionMode()){
UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderInfo.setAddress(userAddress.getRecieveAddress());
- }
- if(StringUtils.isNotEmpty(order.getExpressJson())){
- JSONObject jsonObject = JSON.parseObject(order.getExpressJson());
- String com = jsonObject.getString("com");
- String num = jsonObject.getString("num");
- QueryKD100Vo queryKD100Vo = ExpressDeliveryUtil.kd100QueryTrack(com, num);
- orderInfo.setExpress(queryKD100Vo);
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
+ orderInfo.setExpress(mapTrackKD100Vo);
}
List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
@@ -781,6 +791,30 @@
goodsJson.add(map);
}
orderInfo.setGoodsJson(JSON.toJSONString(goodsJson));
+ orderInfo.setPoint(order.getPoint());
+ if(null != order.getAfterSaleTime()){
+ orderInfo.setAfterSaleTime(order.getAfterSaleTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(StringUtils.isNotEmpty(order.getActivityJson())){
+ OrderActivityInfo activityInfo = JSON.parseObject(order.getActivityJson(), OrderActivityInfo.class);
+ orderInfo.setActivityName(activityInfo.getActivityName());
+ }
+ if(null != order.getEndTime()){
+ AppUser user = appUserClient.getAppUserById(order.getCancellerAppUserId());
+ orderInfo.setCanceller(user.getName());
+ orderInfo.setWriteOffTime(order.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(order.getOrderType() == 1){
+ List<TechnicianSubscribe> technicianSubscribes = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+ if(technicianSubscribes.size() > 0){
+ Set<Integer> collect = technicianSubscribes.stream().map(TechnicianSubscribe::getTechnicianId).collect(Collectors.toSet());
+ List<Technician> data = technicianClient.getTechnicianByIds(collect).getData();
+ orderInfo.setTechnicianName(data.stream().map(Technician::getName).collect(Collectors.joining(",")));
+ }
+ }
+ List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), order.getId()).getData();
+ BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ orderInfo.setSubcommission(reduce);
return orderInfo;
}
@@ -806,4 +840,41 @@
public Integer getShopSaleNum(Integer shopId, Integer type) {
return this.baseMapper.getShopSaleNum(shopId, type);
}
+
+
+ /**
+ * 定时查询快递信息
+ */
+ @Override
+ public void taskExpress() {
+ Set<Long> order_express = redisTemplate.opsForZSet().rangeByScore("order_express", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+ if(order_express.size() > 0){
+ for (Long id : order_express) {
+ Order order = this.getById(id);
+ if(order.getOrderStatus() != 2){
+ redisTemplate.opsForZSet().remove("order_express", id);
+ continue;
+ }
+ String expressJson = order.getExpressJson();
+ if(StringUtils.isEmpty(expressJson)){
+ redisTemplate.opsForZSet().remove("order_express", id);
+ continue;
+ }
+ //{"com":"jd","num":"JDV016336234367"}
+ JSONObject jsonObject = JSON.parseObject(expressJson);
+ String com = jsonObject.getString("com");
+ String num = jsonObject.getString("num");
+ UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
+ MapTrackKD100Vo mapTrackKD100Vo = ExpressDeliveryUtil.kd100MapTrack(com, num, order.getDeliverProvince() + order.getDeliverCity(),
+ userAddress.getProvince() + userAddress.getCity());
+ order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
+ this.updateById(order);
+ //延长时间x小时
+ SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+ Integer waitTime = jsonObject1.getInteger("waitTime");
+ redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
+ }
+ }
+ }
}
--
Gitblit v1.7.1