机构类型

src/main/java/com/zswl/dataservice/controller/payment/HxzController.java

@@ -1,8 +1,8 @@
 package com.zswl.dataservice.controller.payment;
 
 
-import com.zswl.dataservice.model.payment.ServerTimeModel;
-import com.zswl.dataservice.model.payment.ServerTimeResult;
+import com.github.microservice.models.hxz.ServerTimeModel;
+import com.github.microservice.models.hxz.ServerTimeResult;
 import com.zswl.dataservice.service.payment.HxzService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,13 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.SimpleDateFormat;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 @Slf4j
 @RestController
 @RequestMapping("hxz/v1")

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

@@ -22,6 +22,7 @@ public class FullCardAPIConfig {
 
     //-----------------------云版消费机 start -----------------------
     public static final String ServerTime = api + "/hxz/v1/ServerTime";
+    public static final String ConsumTransactions = api + "/hxz/v1/ConsumTransactions";
 
     // 全卡业务平台 start -----------------
     // 同步设备
@@ -35,6 +36,7 @@ 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());
 
         // ----------------------------全卡项目 start -----------------
         map.put(deviceSync, ApiConfParam.builder().apiName(deviceSync).methodType(MethodType.Json).build());

src/main/java/com/zswl/dataservice/model/payment/ServerTimeModel.java

@@ -1,24 +0,0 @@
-package com.zswl.dataservice.model.payment;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- *
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ServerTimeModel {
-
-    @Schema(description = "设备中的总白名单数")
-    @JsonProperty("WLSum")
-    private Integer wLSum;
-
-    @Schema(description = "自定义机号")
-    @JsonProperty("DeviceID")
-    private Integer deviceID;
-}

src/main/java/com/zswl/dataservice/model/payment/ServerTimeResult.java

@@ -1,23 +0,0 @@
-package com.zswl.dataservice.model.payment;
-
-import com.zswl.dataservice.model.payment.base.HxzBaseResult;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/6/25
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ServerTimeResult extends HxzBaseResult {
-    @Schema(description = "服务器时间")
-    private String Time;
-    @Schema(description = "1：有白名单更新  0：无")
-    private int WLUptate;
-    @Schema(description = "起始页数（当WLUptate为1却WLPage为0时 清除所有白名单）")
-    private int WLPage;
-}

src/main/java/com/zswl/dataservice/model/payment/base/HxzBaseResult.java

@@ -1,41 +0,0 @@
-package com.zswl.dataservice.model.payment.base;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author TRX
- * @date 2024/6/25
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class HxzBaseResult implements Serializable {
-    // 1:成功； 0：失败
-    private int Status = 0;
-    // 错误消息（Status为0时屏幕显示此内容，最多不超过8个汉字）
-    private String Msg;
-
-    public boolean isSuccess() {
-        return Status == 1;
-    }
-
-    // 设置失败
-    public void setFailed(String msg) {
-        Status = 0;
-        this.Msg = msg;
-    }
-    // 设置成功
-    public void setSuccess(String msg) {
-        Status = 1;
-        this.Msg = msg;
-    }
-    // 设置成功
-    public void setSuccess() {
-        Status = 1;
-    }
-
-}

src/main/java/com/zswl/dataservice/service/other/RequestInfoService.java

@@ -3,7 +3,7 @@ package com.zswl.dataservice.service.other;
 import com.zswl.dataservice.dao.payment.RequestInfoDao;
 import com.zswl.dataservice.domain.payment.RequestInfo;
 import com.zswl.dataservice.httpRequest.apiConf.APIResponseModel;
-import com.zswl.dataservice.model.payment.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.HxzBaseResult;
 import com.zswl.dataservice.type.RequestType;
 import com.zswl.dataservice.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;

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

@@ -9,11 +9,10 @@ import com.zswl.dataservice.domain.mqtt.DeviceInfo;
 import com.zswl.dataservice.httpRequest.ApiRequestService;
 import com.zswl.dataservice.httpRequest.apiConf.APIResponseModel;
 import com.zswl.dataservice.httpRequest.conf.FullCardAPIConfig;
-import com.zswl.dataservice.model.payment.ServerTimeModel;
-import com.zswl.dataservice.model.payment.ServerTimeResult;
+import com.github.microservice.models.hxz.ServerTimeModel;
+import com.github.microservice.models.hxz.ServerTimeResult;
 import com.zswl.dataservice.service.base.SuperService;
 import com.zswl.dataservice.service.other.RequestInfoService;
-import com.zswl.dataservice.utils.net.JsonUtil;
 import com.zswl.dataservice.utils.result.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -85,30 +84,54 @@ public class HxzService extends SuperService {
     @ExecuteAnnotationServiceMethod(value = "ConsumTransactions", remark = "云版消费机 2.2 用户刷卡综合接口")
     public ResultContent<Object> consumTransactions(String dataStr) {
         ConsumTransactionsModel params = JSONUtil.toBean(dataStr, ConsumTransactionsModel.class);
+        ConsumTransactionsResult ret = new ConsumTransactionsResult();
 
-        ConsumTransactionsResult ret = null;
-        //十进制转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);
+        // 检查设备
+        String deviceId = params.getDeviceId();
+        DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
+        if (ObjectUtils.isEmpty(deviceInfo)) {
+            ret.setFailed("设备未注册");
+            requestInfoService.addHXZRequestInfo(params, ret);
             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));
+        ConsumTransactionsFullParam param = new ConsumTransactionsFullParam();
+        param.setParam(params);
+        APIResponseModel resultContent = apiRequestService.sendFullCardAPI(
+                FullCardAPIConfig.ConsumTransactions, param);
+        if (resultContent.isSuccess()) {
+            // 请求成功
+            ConsumTransactionsFullResult fullResult = resultContent.toBean(ConsumTransactionsFullResult.class);
+            ret = fullResult.getModel();
+        } else {
+            // 失败
+            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);
     }
 
@@ -121,6 +144,7 @@ public class HxzService extends SuperService {
 
     /**
      * 付款码（二维码）
+     *
      * @param dataStr
      * @return
      */