机构类型

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ServerTimeModel.java

@@ -1,24 +0,0 @@
-package com.zhongshu.card.client.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;
-}

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ServerTimeResult.java

@@ -1,23 +0,0 @@
-package com.zhongshu.card.client.model.payment;
-
-import com.zhongshu.card.client.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;
-}

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/base/HxzBaseResult.java

@@ -1,41 +0,0 @@
-package com.zhongshu.card.client.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;
-    }
-
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/HxzController.java

@@ -1,8 +1,10 @@
 package com.zhongshu.card.server.core.controller.payment;
 
 
-import com.zhongshu.card.client.model.payment.ServerTimeModel;
-import com.zhongshu.card.client.model.payment.ServerTimeResult;
+import com.github.microservice.models.hxz.ConsumTransactionsFullParam;
+import com.github.microservice.models.hxz.ConsumTransactionsFullResult;
+import com.github.microservice.models.hxz.ServerTimeModel;
+import com.github.microservice.models.hxz.ServerTimeResult;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.server.core.service.payment.HxzService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,4 +35,11 @@ public class HxzController {
         return hxzService.serverTime(serverTimeModel);
     }
 
+
+    @Operation(summary = "用户刷卡综合接口")
+    @PostMapping(value = "ConsumTransactions", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResultContent<ConsumTransactionsFullResult> consumTransactions(@RequestBody ConsumTransactionsFullParam param) {
+        return hxzService.consumTransactions(param);
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/WalletController.java

@@ -4,9 +4,10 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
-import com.zhongshu.card.client.model.payment.*;
-import com.zhongshu.card.client.model.school.DeviceInfoModel;
-import com.zhongshu.card.client.model.school.DeviceInfoSearch;
+import com.zhongshu.card.client.model.payment.WalletModel;
+import com.zhongshu.card.client.model.payment.WalletRechargeModel;
+import com.zhongshu.card.client.model.payment.WalletRechargeParam;
+import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.server.core.domain.payment.Wallet;
 import com.zhongshu.card.server.core.service.payment.WalletService;
@@ -19,8 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author TRX
@@ -77,8 +80,8 @@ public class WalletController {
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到充值详情")
-    @RequestMapping(value = "rechargeCurrent", method = {RequestMethod.POST})
-    public ResultContent<WalletRechargeModel> rechargeCurrent(@RequestBody IDParam param) {
+    @RequestMapping(value = "getUserWalletRecharge", method = {RequestMethod.POST})
+    public ResultContent<WalletRechargeModel> getUserWalletRecharge(@RequestBody IDParam param) {
         return walletService.getUserWalletRecharge(param.getId());
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/HxzService.java

@@ -1,7 +1,6 @@
 package com.zhongshu.card.server.core.service.payment;
 
-import com.zhongshu.card.client.model.payment.ServerTimeModel;
-import com.zhongshu.card.client.model.payment.ServerTimeResult;
+import com.github.microservice.models.hxz.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.server.core.dao.school.DeviceInfoDao;
 import com.zhongshu.card.server.core.domain.school.DeviceInfo;
@@ -11,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author TRX
@@ -31,6 +31,7 @@ public class HxzService extends SuperService {
 
     /**
      * 得到系统时间
+     *
      * @param param
      * @return
      */
@@ -42,10 +43,26 @@ public class HxzService extends SuperService {
             result.setFailed("业务设备未注册");
             requestInfoService.addRequestInfo(param, result);
             return ResultContent.buildFail("业务设备未注册");
-        }else {
+        } else {
             result.setSuccess();
         }
         requestInfoService.addRequestInfo(param, result);
         return ResultContent.buildSuccess(result);
     }
+
+    /**
+     * 云板消费机 刷卡消费
+     *
+     * @param param
+     * @return
+     */
+    public ResultContent<ConsumTransactionsFullResult> consumTransactions(@RequestBody ConsumTransactionsFullParam param) {
+        ConsumTransactionsFullResult result = new ConsumTransactionsFullResult();
+        ConsumTransactionsResult model = new ConsumTransactionsResult();
+
+        requestInfoService.addRequestInfo(param, model);
+
+        return ResultContent.buildSuccess(result);
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/RequestInfoService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.service.payment;
 
-import com.zhongshu.card.client.model.payment.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.HxzBaseResult;
 import com.zhongshu.card.client.utils.type.payment.RequestType;
 import com.zhongshu.card.server.core.dao.payment.RequestInfoDao;
 import com.zhongshu.card.server.core.domain.payment.RequestInfo;