机构类型

src/main/java/com/zswl/dataservice/httpRequest/conf/FullCardAPIConfig.java

@@ -23,6 +23,7 @@ public class FullCardAPIConfig {
     //-----------------------云版消费机 start -----------------------
     public static final String ServerTime = api + "/hxz/v1/ServerTime";
     public static final String ConsumTransactions = api + "/hxz/v1/ConsumTransactions";
+    public static final String orderQuery = api + "/hxz/v1/orderQuery";
 
     // 全卡业务平台 start -----------------
     // 同步设备
@@ -37,6 +38,8 @@ public class FullCardAPIConfig {
         // ----------------------------云版消费机 start -----------------
         map.put(ServerTime, ApiConfParam.builder().apiName(ServerTime).methodType(MethodType.Json).build());
         map.put(ConsumTransactions, ApiConfParam.builder().apiName(ConsumTransactions).methodType(MethodType.Json).build());
+        map.put(orderQuery, ApiConfParam.builder().apiName(orderQuery).methodType(MethodType.Json).build());
+
 
         // ----------------------------全卡项目 start -----------------
         map.put(deviceSync, ApiConfParam.builder().apiName(deviceSync).methodType(MethodType.Json).build());

src/main/java/com/zswl/dataservice/service/payment/HxzService.java

@@ -57,6 +57,7 @@ public class HxzService extends SuperService {
                 FullCardAPIConfig.ServerTime, param);
         if (resultContent.isSuccess()) {
             ServerTimeResult timeResult = resultContent.toBean(ServerTimeResult.class);
+
             if (timeResult.isSuccess()) {
                 var nowTime = new Date(System.currentTimeMillis());
                 LocalDate date = LocalDate.now();
@@ -86,15 +87,6 @@ public class HxzService extends SuperService {
         ConsumTransactionsModel params = JSONUtil.toBean(dataStr, ConsumTransactionsModel.class);
         ConsumTransactionsResult ret = new ConsumTransactionsResult();
 
-        // 检查设备
-        String deviceId = params.getDeviceId();
-        DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
-        if (ObjectUtils.isEmpty(deviceInfo)) {
-            ret.setFailed("设备未注册");
-            requestInfoService.addHXZRequestInfo(params, ret);
-            return ResultContent.buildSuccess(ret);
-        }
-
         ConsumTransactionsFullParam param = new ConsumTransactionsFullParam();
         param.setParam(params);
         APIResponseModel resultContent = apiRequestService.sendFullCardAPI(
@@ -108,38 +100,26 @@ public class HxzService extends SuperService {
             ret.setStatus(0);
             ret.setMsg(resultContent.getMsg());
         }
-
-//
-//        //十进制转16进制
-//        final String cardNumber = params.getCardNo();
-//        final String amount = params.getAmount();
-//        //查询卡(钱包)
-//        if (params.getMode() == 2) {
-//            ret = new ConsumTransactionsResult()
-//                    .setStatus(0)
-//                    .setMsg("不支持查询钱包")
-//                    .setCardNo(params.getCardNo())
-//                    .setAmount(amount);
-//            return ResultContent.buildSuccess(ret);
-//        }
-//
-//        // 刷卡消费
-//        log.info("consumTransactions : {} - {} - {}", params.getOrder(), cardNumber, amount);
-//        ret = new ConsumTransactionsResult()
-//                .setStatus(1)
-//                .setCardNo(params.getCardNo())
-//                .setMoney(amount)
-//                .setSubsidy("0.0")
-//                .setAmount(amount);
-//        log.info("ConsumTransactions : {} - {}", params, JsonUtil.toJson(ret));
         return ResultContent.buildSuccess(ret);
     }
 
     @ExecuteAnnotationServiceMethod(value = "orderQuery", remark = "云版消费机 2.3 用户刷卡消费结果查询接口")
     public ResultContent<Object> orderQuery(String dataStr) {
-        OrderQueryResult result = new OrderQueryResult();
+        OrderQueryModel param = JSONUtil.toBean(dataStr, OrderQueryModel.class);
 
-        return ResultContent.buildSuccess(result);
+        ConsumTransactionsResult ret = new ConsumTransactionsResult();
+        APIResponseModel resultContent = apiRequestService.sendFullCardAPI(
+                FullCardAPIConfig.orderQuery, param);
+        if (resultContent.isSuccess()) {
+            // 请求成功
+            ConsumTransactionsFullResult fullResult = resultContent.toBean(ConsumTransactionsFullResult.class);
+            ret = fullResult.getModel();
+        } else {
+            // 失败
+            ret.setStatus(0);
+            ret.setMsg(resultContent.getMsg());
+        }
+        return ResultContent.buildSuccess(ret);
     }
 
     /**