|
|
@@ -1,14 +1,11 @@
|
|
|
package org.dromara.server.hik.event.handler;
|
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
-import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
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.utils.StringUtils;
|
|
|
import org.dromara.consume.api.RemoteConsumeService;
|
|
|
@@ -22,8 +19,6 @@ import org.dromara.server.hik.event.domain.ConsumptionEventDetail;
|
|
|
import org.dromara.server.hik.event.domain.ConsumptionEventReceive;
|
|
|
import org.dromara.server.hik.event.domain.FileContent;
|
|
|
import org.dromara.server.hik.service.IXfTermService;
|
|
|
-import org.springframework.http.HttpStatus;
|
|
|
-import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
@@ -90,10 +85,10 @@ public class ConsumptionEventHandler implements HikEventHandler {
|
|
|
}else if(TRANSACTION_CONFIRMING_REQUEST.equals(consumptionEvent.getMinor())){
|
|
|
HashMap<String, Object> rs = new HashMap<>(1);
|
|
|
rs.put("result", "success");
|
|
|
- /**
|
|
|
- * 消费机 交易确认请求事件上报
|
|
|
- * eventType: ConsumptionEvent
|
|
|
- * minor:transactionConfirmingRequest
|
|
|
+ /*
|
|
|
+ 消费机 交易确认请求事件上报
|
|
|
+ eventType: ConsumptionEvent
|
|
|
+ minor:transactionConfirmingRequest
|
|
|
*/
|
|
|
Boolean cancel = consumptionEvent.getCancel();
|
|
|
if(cancel !=null && cancel){
|
|
|
@@ -187,8 +182,8 @@ public class ConsumptionEventHandler implements HikEventHandler {
|
|
|
}
|
|
|
confirmBo.setCustomTTSBroadcastVoice(broadcastVoice);
|
|
|
|
|
|
- /**
|
|
|
- * 这可以显示刷卡人的信息,比如姓名,部门等
|
|
|
+ /*
|
|
|
+ 这可以显示刷卡人的信息,比如姓名,部门等
|
|
|
*/
|
|
|
ConsumptionEventConfirmBo.ContentInfo contentInfo = new ConsumptionEventConfirmBo.ContentInfo();
|
|
|
contentInfo.setTitle(consumptionEvent.getName());
|