海康修改回退

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/handler/ConsumptionEventHandler.java

@@ -63,28 +63,28 @@ public class ConsumptionEventHandler implements HikEventHandler {
             // 调用现有原始消费请求接口
             RemoteConsumeBo remoteBo = setParamBo(receive, consumptionEvent);
             remoteBo.setTermNo(termVo.getTermNo());
-//            log.info("transactionPreprocessingRequest 调用消费服务的消费请求接口，入参：{}", JSONUtil.toJsonStr(remoteBo));
-            //RemoteResultDto result = remoteConsumeService.dealHikRequestConsume(remoteBo);
-            //R<ErrorInfo> errorInfo = result.getErrorInfo();
-            //RemoteConsumeBo updatedRemoteBo = result.getUpdatedRemoteBo();
-            //String reason = "";
-            //BigDecimal balance = updatedRemoteBo.getBalance();
-            //BigDecimal consumeMoney = updatedRemoteBo.getConsumeMoney();
-            //String deptName =updatedRemoteBo.getDeptName();
-            //if (R.isError(errorInfo)) {
-            //    // 应答失败
-            //    bussiRs = false;
-            //    reason = errorInfo.getMsg();
-            //    ErrorInfo data = errorInfo.getData();
-            //    if(data != null){
-            //        reason = data.getMessage();
-            //    }
-            //}
-            // 直接应答成功
-            String deptName = "";
+            log.info("transactionPreprocessingRequest 调用消费服务的消费请求接口，入参：{}", JSONUtil.toJsonStr(remoteBo));
+            RemoteResultDto result = remoteConsumeService.dealHikRequestConsume(remoteBo);
+            R<ErrorInfo> errorInfo = result.getErrorInfo();
+            RemoteConsumeBo updatedRemoteBo = result.getUpdatedRemoteBo();
             String reason = "";
-            BigDecimal balance = BigDecimal.ZERO;
-            BigDecimal consumeMoney = remoteBo.getConsumeMoney();
+            BigDecimal balance = updatedRemoteBo.getBalance();
+            BigDecimal consumeMoney = updatedRemoteBo.getConsumeMoney();
+            String deptName =updatedRemoteBo.getDeptName();
+            if (R.isError(errorInfo)) {
+                // 应答失败
+                bussiRs = false;
+                reason = errorInfo.getMsg();
+                ErrorInfo data = errorInfo.getData();
+                if(data != null){
+                    reason = data.getMessage();
+                }
+            }
+            // 直接应答成功
+//            String deptName = "";
+//            String reason = "";
+//            BigDecimal balance = BigDecimal.ZERO;
+//            BigDecimal consumeMoney = remoteBo.getConsumeMoney();
 
             return answerEvent(consumptionEvent, bussiRs, balance, consumeMoney, reason, deptName);
         } else if (TRANSACTION_CONFIRMING_REQUEST.equals(consumptionEvent.getMinor())) {
@@ -99,7 +99,7 @@ public class ConsumptionEventHandler implements HikEventHandler {
             if (cancel != null && cancel) {
                 log.info("消费机消费请求确认事件,取消交易：{}", JSONUtil.toJsonStr(receive));
                 // 将原始记录标记为删除 termVo.getTermNo() consumptionEvent.getSerialNo() TermRecordId
-//                remoteConsumeService.cancleDeal(termVo.getTermNo(), consumptionEvent.getSerialNo());
+                remoteConsumeService.cancleDeal(termVo.getTermNo(), consumptionEvent.getSerialNo());
                 return rs;
             }
 
@@ -109,8 +109,8 @@ public class ConsumptionEventHandler implements HikEventHandler {
             remoteBo.setRecordId(0L);
             remoteBo.setTermNo(termVo.getTermNo());
             log.info("transactionConfirmingRequest 调用调用消费请求与入库接口，入参：{}", JSONUtil.toJsonStr(remoteBo));
-            //RemoteResultDto result = remoteConsumeService.dealHikUploadRecord(remoteBo);
-            RemoteResultDto result = remoteConsumeService.dealHikFullRecord(remoteBo);
+            RemoteResultDto result = remoteConsumeService.dealHikUploadRecord(remoteBo);
+//            RemoteResultDto result = remoteConsumeService.dealHikFullRecord(remoteBo);
 //            log.info("消费机消费请求确认事件,结果：{}", JSONObject.toJSONString(result.getUpdatedRemoteBo()));
             R<ErrorInfo> errorInfo = result.getErrorInfo();
             if (R.isError(errorInfo)) {

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/handler/TransactionRecordEventHandler.java

@@ -108,7 +108,7 @@ public class TransactionRecordEventHandler implements HikEventHandler {
                 if (CollectionUtils.isEmpty(vos)){
                     // 组装参数，调用消费记录入库的接口 // 如果失败要记录入库
                     log.info("TransactionRecordEvent调用消费请求与入库接口，入参，{}", JSONUtil.toJsonStr(remoteBo));
-                    RemoteResultDto remoteResultDto = remoteConsumeService.dealHikFullRecord(remoteBo);
+                    RemoteResultDto remoteResultDto = remoteConsumeService.dealHikUploadRecord(remoteBo);
                     errorInfo = remoteResultDto.getErrorInfo();
                     RemoteConsumeBo updatedRemoteBo = remoteResultDto.getUpdatedRemoteBo();
                     if(updatedRemoteBo !=null) {

ruoyi-server/ruoyi-server-hik/src/main/java/org/dromara/server/hik/event/timedtask/HandleTask.java

@@ -99,7 +99,7 @@ public class HandleTask {
                         Long.valueOf(vo.getTermRecordId()),remoteBo.getConsumeDate(), remoteBo.getConsumeMoney());
                     if(CollectionUtils.isEmpty(list)){
                         log.info("定时任务，调用消费入库接口，消费机交易记录事件,入参，{}", JSONUtil.toJsonStr(remoteBo));
-                        rs = remoteConsumeService.dealHikFullRecord(remoteBo);
+                        rs = remoteConsumeService.dealHikUploadRecord(remoteBo);
                     }else{
                         log.info("消费机事件，已经存在消费记录，不再处理：{}", JSONUtil.toJsonStr(vo));
                         rs = new RemoteResultDto(R.ok(),null);