机构类型

src/main/java/com/zswl/dataservice/model/hxz/ConsumTransactionsModel.java

@@ -1,47 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ConsumTransactionsModel implements Serializable {
-
-    @JsonProperty("Order")
-    private String Order;
-
-    @JsonProperty("CardNo")
-    private String CardNo;
-
-    @JsonProperty("CardMode")
-    private Integer CardMode;
-
-    @JsonProperty("Mode")
-    private Integer Mode;
-
-    @JsonProperty("PayType")
-    private Integer PayType;
-
-    @JsonProperty("Amount")
-    private String Amount;
-
-    @JsonProperty("Menus")
-    private Menus[] Menus;
-
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public static class Menus {
-        @JsonProperty("MenuID")
-        private String MenuID;
-
-        @JsonProperty("Count")
-        private String Count;
-    }
-}
-

src/main/java/com/zswl/dataservice/model/hxz/ConsumTransactionsResult.java

@@ -1,61 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
-public class ConsumTransactionsResult {
-
-    @JsonProperty("Status 1:成功； 0：失败")
-    private Integer Status = 0;
-
-    @JsonProperty("Msg")
-    private String Msg = "";
-
-    @JsonProperty("Name")
-    private String Name = "测试";
-
-    @JsonProperty("CardNo")
-    private String CardNo = "";
-
-    @JsonProperty("Money")
-    private String Money = "";
-
-    @JsonProperty("Subsidy")
-    private String Subsidy = "";
-
-    @JsonProperty("Times")
-    private String Times = "";
-
-    @JsonProperty("Integral")
-    private String Integral = "";
-
-    @JsonProperty("InTime")
-    private String InTime = "";
-
-    @JsonProperty("OutTime")
-    private String OutTime = "";
-
-    @JsonProperty("CumulativeTime")
-    private String CumulativeTime = "";
-
-    @JsonProperty("Amount")
-    private String Amount = "";
-
-    @JsonProperty("VoiceID")
-    private String VoiceID = "";
-
-    @JsonProperty("Text")
-    private String Text = "";
-
-
-}
-

src/main/java/com/zswl/dataservice/model/hxz/OrderQueryModel.java

@@ -1,27 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author TRX
- * @date 2024/6/28
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderQueryModel implements Serializable {
-
-    @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535))，用于识别上传数据不重复")
-    private String Order;
-
-    @Schema(description = "10进制卡序列号（实体卡号或虚拟卡号）")
-    private String CardNo;
-
-    @Schema(description = "卡模式（0：实体卡 1：电子卡）")
-    private Integer CardMode;
-}

src/main/java/com/zswl/dataservice/model/hxz/OrderQueryResult.java

@@ -1,59 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/6/28
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderQueryResult {
-
-    @Schema(description = "1:成功； 0：失败")
-    private Integer Status = 0;
-
-    @Schema(description = "错误消息（Status为0时屏幕显示此内容，最多不超过8个汉字）")
-    private String Msg;
-
-    @Schema(description = "人员姓名")
-    private String Name;
-
-    @Schema(description = "10进制卡序列号（实体卡号或虚拟卡号）")
-    private String CardNo;
-
-    @Schema(description = "现金余额（允许两位小数）")
-    private String Money;
-
-    @Schema(description = "补贴余额（允许两位小数）")
-    private String Subsidy;
-
-    @Schema(description = "剩余次数")
-    private String Times;
-
-    @Schema(description = "赠送余额（允许两位小数）")
-    private String Integral;
-
-    @Schema(description = "入场时间(固定值””)")
-    private String InTime;
-
-    @Schema(description = "出场时间(固定值””)")
-    private String OutTime;
-
-    @Schema(description = "累计使用时间：天时分秒")
-    private String CumulativeTime;
-
-    @Schema(description = "实际扣费金额(信息查询模式下返回”0”)")
-    private String Amount;
-
-    @Schema(description = "语音段（用于安卓系统设备）")
-    private String VoiceID;
-
-    @Schema(description = "自定义显示文本（Status为1时传入，屏幕显示此值，内容内使用\\r\\n换行，最多支持4行，每行不超过8个汉字）")
-    private String Text;
-
-}

src/main/java/com/zswl/dataservice/model/hxz/QRCodeTransactionModel.java

@@ -1,41 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QRCodeTransactionModel implements Serializable {
-
-    @JsonProperty("Mode:交易模式（0:扣费 1：充值3:信息查询）")
-    private String Mode;
-
-    @JsonProperty("PayType: 扣费类型（0:手动 1：菜单 2：定值 3：取餐 4：计时）")
-    private Integer PayType;
-
-    @JsonProperty("Amount: 消费金额(Mode为3时，此字段传入值可能为0)")
-    private String Amount;
-
-    @JsonProperty("扫描到的二维码字符串（最大长度为200）")
-    private String QR;
-
-    @JsonProperty("Menus")
-    private Menus[] Menus;
-
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public static class Menus {
-        @JsonProperty("MenuID")
-        private String MenuID;
-
-        @JsonProperty("Count")
-        private String Count;
-    }
-}
-

src/main/java/com/zswl/dataservice/model/hxz/QRCodeTransactionResult.java

@@ -1,24 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/6/28
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QRCodeTransactionResult {
-    @Schema(description = "1:成功；0：失败（非支付成功，而是请求服务器成功）")
-    private Integer Status;
-
-    @Schema(description = "错误消息（Status为1时屏幕显示此内容，最多不超过8个汉字）")
-    private String Msg;
-
-    @Schema(description = "订单号")
-    private String Qrorder;
-}

src/main/java/com/zswl/dataservice/model/hxz/TransactionInquiryModel.java

@@ -1,18 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/6/28
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TransactionInquiryModel {
-    @Schema(description = "二维码交易订单号（该值来自于第六及第七接口返回的QROrder）")
-    private String QROrder;
-}

src/main/java/com/zswl/dataservice/model/hxz/TransactionInquiryResult.java

@@ -1,51 +0,0 @@
-package com.zswl.dataservice.model.hxz;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/6/28
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TransactionInquiryResult {
-    @Schema(description = "1:成功；0：失败")
-    private Integer Status = 0;
-
-    @Schema(description = "错误消息（Status为0时屏幕显示此内容，最多不超过8个汉字）")
-    private String Msg;
-
-    @Schema(description = "人员姓名")
-    private String Name;
-    @Schema(description = "10进制卡序列号（实体卡号或虚拟卡号）")
-    private String CardNo;
-    @Schema(description = "现金余额（允许两位小数点")
-    private String Money;
-    @Schema(description = "补贴余额（允许两位小数点）")
-    private String Subsidy;
-    @Schema(description = "剩余次数")
-    private String Times;
-    @Schema(description = "赠送余额（允许两位小数点）")
-    private String Integral;
-    @Schema(description = "入场时间(固定值””)")
-    private String InTime;
-
-    @Schema(description = "出场时间(固定值””)")
-    private String OutTime;
-
-    @Schema(description = "累计使用时间：天时分秒")
-    private String CumulativeTime;
-
-    @Schema(description = "实际扣费金额（信息模式下返回为0）")
-    private String Amount;
-
-    @Schema(description = "语音段")
-    private String VoiceID;
-
-    @Schema(description = "自定义显示文本（Status为1时传入，屏幕显示此值，内容内使用\\r\\n换行，最多支持4行，每行不超过8个汉字）")
-    private String Text;
-}

src/main/java/com/zswl/dataservice/service/artemis/OperationMessageService.java

@@ -306,7 +306,7 @@ public class OperationMessageService {
             // 业务处理失败
             entity.setIsHandleSuccess(isHandleSuccess);
             entity.setHandleMsg(handleMsg);
-
+            log.info("handleMsg: {}", handleMsg);
             if (isHandleSuccess) {
                 // 处理成功，返回响应
                 responseMessage(entity);

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

@@ -1,6 +1,7 @@
 package com.zswl.dataservice.service.payment;
 
 import cn.hutool.json.JSONUtil;
+import com.github.microservice.models.hxz.*;
 import com.zswl.dataservice.dao.mqtt.DeviceInfoDao;
 import com.zswl.dataservice.domain.ExecuteAnnotationService;
 import com.zswl.dataservice.domain.ExecuteAnnotationServiceMethod;
@@ -8,7 +9,6 @@ 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.hxz.*;
 import com.zswl.dataservice.model.payment.ServerTimeModel;
 import com.zswl.dataservice.model.payment.ServerTimeResult;
 import com.zswl.dataservice.service.base.SuperService;
@@ -112,7 +112,7 @@ public class HxzService extends SuperService {
         return ResultContent.buildSuccess(ret);
     }
 
-    @ExecuteAnnotationServiceMethod(value = "orderQuery", remark = "云版消费机 用户刷卡消费结果查询接口")
+    @ExecuteAnnotationServiceMethod(value = "orderquery", remark = "云版消费机 用户刷卡消费结果查询接口")
     public ResultContent<Object> orderQuery(String dataStr) {
         OrderQueryResult result = new OrderQueryResult();
 
@@ -128,6 +128,8 @@ public class HxzService extends SuperService {
 
     @ExecuteAnnotationServiceMethod(value = "QRCodeTransaction", remark = "云版消费机 付款码（二维码）支付接口")
     public ResultContent<Object> QRCodeTransaction(String dataStr) {
+        QRCodeTransactionModel params = JSONUtil.toBean(dataStr, QRCodeTransactionModel.class);
+
         QRCodeTransactionResult result = new QRCodeTransactionResult();
 
         return ResultContent.buildSuccess(result);

src/main/java/com/zswl/dataservice/utils/mqtt/mqttConfig/client/MQClient.java

@@ -36,12 +36,6 @@ public class MQClient {
             @Override
             public Message postProcessMessage(Message message) throws JMSException {
                 message.setJMSMessageID("ID:" + finalMessageId);
-                if (message instanceof TextMessage) {
-                    TextMessage textMessage = (TextMessage) message;
-                    textMessage.setJMSMessageID("ID:your-custom-message-id");
-                    return textMessage;
-                }
-                message.setJMSCorrelationID("11111111111111");
                 return message;
             }
         });