机构类型

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

@@ -25,6 +25,9 @@ public class FullCardAPIConfig {
     public static final String ConsumTransactions = api + "/hxz/v1/ConsumTransactions";
     public static final String orderQuery = api + "/hxz/v1/orderQuery";
 
+    public static final String QRCodeTransaction = api + "/hxz/v1/QRCodeTransaction";
+    public static final String TransactionInquiry = api + "/hxz/v1/TransactionInquiry";
+
     // 全卡业务平台 start -----------------
     // 同步设备
     public static final String deviceSync = api + "/deviceSync/syncDevices";
@@ -40,11 +43,14 @@ public class FullCardAPIConfig {
         map.put(ConsumTransactions, ApiConfParam.builder().apiName(ConsumTransactions).methodType(MethodType.Json).build());
         map.put(orderQuery, ApiConfParam.builder().apiName(orderQuery).methodType(MethodType.Json).build());
 
+        // B扫C功能接口配置
+        map.put(QRCodeTransaction, ApiConfParam.builder().apiName(QRCodeTransaction).methodType(MethodType.Json).build());
+        map.put(TransactionInquiry, ApiConfParam.builder().apiName(TransactionInquiry).methodType(MethodType.Json).build());
+
 
         // ----------------------------全卡项目 start -----------------
         map.put(deviceSync, ApiConfParam.builder().apiName(deviceSync).methodType(MethodType.Json).build());
 
-
     }
 
     public static ApiConfParam getApiConfParam(String apiName) {

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

@@ -2,6 +2,7 @@ package com.zswl.dataservice.service.payment;
 
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.hxz.*;
+import com.github.microservice.models.type.PaymentType;
 import com.zswl.dataservice.dao.mqtt.DeviceInfoDao;
 import com.zswl.dataservice.domain.ExecuteAnnotationService;
 import com.zswl.dataservice.domain.ExecuteAnnotationServiceMethod;
@@ -131,10 +132,22 @@ public class HxzService extends SuperService {
     @ExecuteAnnotationServiceMethod(value = "QRCodeTransaction", remark = "云版消费机 2.7 付款码（二维码）支付接口")
     public ResultContent<Object> QRCodeTransaction(String dataStr) {
         QRCodeTransactionModel params = JSONUtil.toBean(dataStr, QRCodeTransactionModel.class);
+        // 根据QR判断支付模式
+        params.setPaymentType(PaymentType.WxQrCode);
 
-        QRCodeTransactionResult result = new QRCodeTransactionResult();
-
-        return ResultContent.buildSuccess(result);
+        QRCodeTransactionResult ret = new QRCodeTransactionResult();
+        APIResponseModel resultContent = apiRequestService.sendFullCardAPI(
+                FullCardAPIConfig.QRCodeTransaction, params);
+        if (resultContent.isSuccess()) {
+            // 请求成功
+            QRCodeTransactionFullResult fullResult = resultContent.toBean(QRCodeTransactionFullResult.class);
+            ret = fullResult.getModel();
+        } else {
+            // 失败
+            ret.setStatus(0);
+            ret.setMsg(resultContent.getMsg());
+        }
+        return ResultContent.buildSuccess(ret);
     }
 
     @ExecuteAnnotationServiceMethod(value = "TransactionInquiry", remark = "云版消费机 2.8.二维码支付结果查询接口")

src/main/java/com/zswl/dataservice/service/sync/DeviceSyncFullCardService.java

@@ -120,6 +120,7 @@ public class DeviceSyncFullCardService extends SuperService {
         if (ObjectUtils.isNotEmpty(list)) {
             deviceInfos = list.stream().map(it -> {
                 DeviceInfoSyncParam syncParam = new DeviceInfoSyncParam();
+
                 BeanUtils.copyProperties(it, syncParam);
                 List<GateWay2Device> gateWay2Devices = gateWay2DeviceDao.findByDeviceInfo(it);
                 List<String> gateWayIds = gateWay2Devices.stream().map(it2 -> {