|
|
@@ -1,19 +1,19 @@
|
|
|
package org.dromara.server.consume.controller.v1;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
-import org.dromara.backstage.api.RemotePtParameterService;
|
|
|
import org.dromara.common.core.config.DefaultConfig;
|
|
|
import org.dromara.common.core.constant.CacheNames;
|
|
|
import org.dromara.common.core.constant.DefaultConstants;
|
|
|
import org.dromara.common.core.domain.R;
|
|
|
import org.dromara.common.core.domain.model.ErrorInfo;
|
|
|
import org.dromara.common.core.domain.model.ErrorResult;
|
|
|
+import org.dromara.common.core.enums.CreditTypeEnum;
|
|
|
import org.dromara.common.core.enums.SystemUseTypeEnum;
|
|
|
import org.dromara.common.redis.utils.RedisUtils;
|
|
|
import org.dromara.server.common.domain.consume.bo.ConsumptionBo;
|
|
|
@@ -173,6 +173,10 @@ public class ConsumeController {
|
|
|
|
|
|
R<ErrorInfo> errorInfo;
|
|
|
if (Objects.equals(type, "requestConsume")) {
|
|
|
+ if (ObjectUtil.equals(bo.getCreditType(), CreditTypeEnum.TERM_CONSUME)) {
|
|
|
+ // 如果是消费机请求消费，将消费时间设置为当前时间，以防消费时时钟不对造成实际消费时间不正确
|
|
|
+ bo.setConsumeDate(DateUtil.date());
|
|
|
+ }
|
|
|
errorInfo = consumeBusiness.createOrder(bo, mac, xfPwd);
|
|
|
// 是否推送云端消费
|
|
|
//if (ObjectUtil.equals(defaultConfig.getLocationFlag(), DefaultConstants.LOCAL_FLAG)) {
|
