From f8859528c2571b6207ac3ef9750de17665fa8685 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 11 Feb 2025 14:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => common}/request/DataRequest.java | 2 +- .../{ => common}/request/RequestCarInfo.java | 2 +- .../request/RequestDiscountCreate.java | 2 +- .../{ => common}/response/DataResponse.java | 2 +- .../response/ResponseCarInfo.java | 2 +- .../response/ResponseDiscountCreate.java | 4 ++ .../response/ResponseDiscountDestroy.java | 4 ++ .../request/RequestDiscountDestroy.java | 17 ----- .../parking/request/RequestLaneInfoList.java | 17 ----- .../parking/request/RequestPayNotify.java | 64 ------------------- .../parking/request/RequestScanLaneQr.java | 20 ------ .../response/ResponseDiscountCreate.java | 4 -- .../response/ResponseDiscountDestroy.java | 4 -- .../response/ResponseLaneInfoList.java | 21 ------ .../parking/response/ResponsePayNotify.java | 16 ----- .../parking/response/ResponseScanLaneQr.java | 20 ------ .../service/impl/QcyunsServiceImpl.java | 51 +++++++++++++-- 17 files changed, 58 insertions(+), 194 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/{ => common}/request/DataRequest.java (92%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/{ => common}/request/RequestCarInfo.java (80%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/{ => common}/request/RequestDiscountCreate.java (96%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/{ => common}/response/DataResponse.java (88%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/{ => common}/response/ResponseCarInfo.java (88%) create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountCreate.java create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountDestroy.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountDestroy.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestLaneInfoList.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestPayNotify.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestScanLaneQr.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountCreate.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountDestroy.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseLaneInfoList.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponsePayNotify.java delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseScanLaneQr.java diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/DataRequest.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/DataRequest.java similarity index 92% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/DataRequest.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/DataRequest.java index 0347e8ad8..48d788c27 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/DataRequest.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/DataRequest.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.parking.request; +package com.jsowell.thirdparty.parking.common.request; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestCarInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/RequestCarInfo.java similarity index 80% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestCarInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/RequestCarInfo.java index d7b5ae4cb..f4e0b9497 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestCarInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/RequestCarInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.parking.request; +package com.jsowell.thirdparty.parking.common.request; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountCreate.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/RequestDiscountCreate.java similarity index 96% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountCreate.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/RequestDiscountCreate.java index 024c35d66..b7f51959c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountCreate.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/request/RequestDiscountCreate.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.parking.request; +package com.jsowell.thirdparty.parking.common.request; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/DataResponse.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/DataResponse.java similarity index 88% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/DataResponse.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/DataResponse.java index 4276381a5..c811dbe97 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/DataResponse.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/DataResponse.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.parking.response; +package com.jsowell.thirdparty.parking.common.response; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseCarInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseCarInfo.java similarity index 88% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseCarInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseCarInfo.java index 2189149f2..0d2166385 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseCarInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseCarInfo.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.parking.response; +package com.jsowell.thirdparty.parking.common.response; import lombok.Getter; import lombok.Setter; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountCreate.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountCreate.java new file mode 100644 index 000000000..2c5992dcf --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountCreate.java @@ -0,0 +1,4 @@ +package com.jsowell.thirdparty.parking.common.response; + +public class ResponseDiscountCreate { +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountDestroy.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountDestroy.java new file mode 100644 index 000000000..ae9800c81 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/response/ResponseDiscountDestroy.java @@ -0,0 +1,4 @@ +package com.jsowell.thirdparty.parking.common.response; + +public class ResponseDiscountDestroy { +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountDestroy.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountDestroy.java deleted file mode 100644 index fa993f6ef..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestDiscountDestroy.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsowell.thirdparty.parking.request; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class RequestDiscountDestroy { - /** - * 停车场编号 - */ - private String parkId; - /** - * 优惠券派发流水 - */ - private String grantSerial; -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestLaneInfoList.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestLaneInfoList.java deleted file mode 100644 index d793e41a9..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestLaneInfoList.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsowell.thirdparty.parking.request; - -import lombok.Getter; -import lombok.Setter; - -/** - * @desc:获取通道信息实体类 - * @date: 2021-11-16 14:50 - */ -@Setter -@Getter -public class RequestLaneInfoList { - - //车场ID - Integer parkId; - -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestPayNotify.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestPayNotify.java deleted file mode 100644 index 9a6eea0bb..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestPayNotify.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jsowell.thirdparty.parking.request; - -import lombok.Getter; -import lombok.Setter; - -/** - * @desc:固定车续费实体类 - * @date: 2021-10-30 15:46 - */ -@Setter -@Getter -public class RequestPayNotify { - //停车场ID - Integer parkId; - //车牌号(可空-临时车无牌车支付时) - String plate; - //外部订单号 - String outTradeNo; - //金额 - Double amount; - // 支付类型 0-现金，1-电子支付 - Integer payType; - //车型（1-按临时车计费 2-按固定车计费 3-储值车计费） - Integer carType; - //月租车主键ID - Integer carId; - //计费车类型 0-代表临时车 ，其他-对应(登记车型表) - Integer chargeType; - //通道id 不为null时，通道扫码支付 - Integer laneId; - //平台进出场ID (平台ID与本地ID不能同时为空) - Integer recordId; - //本地进出场ID (平台ID与本地ID不能同时为空) - Integer localId; - //[月租] 月租车截止日期 (carType!=2 为空) - String endDate; - //[月租] 月租车充值月数 (carType!=2 为空) - Integer number; - //支付方式 1-微信 2-支付宝 用于获取用户openID或者userId - Integer sourceType; - //公众号 openId - String openId; - //支付详情 - String payRemark; - - public RequestPayNotify() { - } - - public RequestPayNotify(Integer parkId, Integer carType, Integer chargeType, String plate, Double amount, Integer laneId, Integer recordId, Integer localId, String endDate, Integer number, Integer sourceType, String openId, String payRemark) { - this.parkId = parkId; - this.carType = carType; - this.chargeType = chargeType; - this.plate = plate; - this.amount = amount; - this.laneId = laneId; - this.recordId = recordId; - this.localId = localId; - this.endDate = endDate; - this.number = number; - this.sourceType = sourceType; - this.openId = openId; - this.payRemark = payRemark; - } -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestScanLaneQr.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestScanLaneQr.java deleted file mode 100644 index 0727c967a..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/request/RequestScanLaneQr.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jsowell.thirdparty.parking.request; - -import lombok.Getter; -import lombok.Setter; - -/** - * @desc:请求参数,车主扫码通道二维码，入场or出场(支持无牌车) - * @auther: wb - * @date: 2021-12-02 10:53 - */ -@Setter -@Getter -public class RequestScanLaneQr { - - Integer parkId; //车场ID - Integer laneId; //通道ID - Integer laneType; //通道Type 1-入 2-出 - String noPlate; //无牌车 - -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountCreate.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountCreate.java deleted file mode 100644 index d7cc43470..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountCreate.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.jsowell.thirdparty.parking.response; - -public class ResponseDiscountCreate { -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountDestroy.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountDestroy.java deleted file mode 100644 index a955af158..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseDiscountDestroy.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.jsowell.thirdparty.parking.response; - -public class ResponseDiscountDestroy { -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseLaneInfoList.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseLaneInfoList.java deleted file mode 100644 index f03ca5253..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseLaneInfoList.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jsowell.thirdparty.parking.response; - -import com.pay.api.bean.LaneInfo; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -/** - * @desc:续费通知接口 - * @date: 2021-10-30 15:46 - */ -@Setter -@Getter -public class ResponseLaneInfoList { - - int parkId; - String parkName; - List laneList; //通道List - -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponsePayNotify.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponsePayNotify.java deleted file mode 100644 index b60d7b36a..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponsePayNotify.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jsowell.thirdparty.parking.response; - -import lombok.Getter; -import lombok.Setter; - -/** - * @desc:续费通知接口 - * @date: 2021-10-30 15:46 - */ -@Setter -@Getter -public class ResponsePayNotify { - - - -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseScanLaneQr.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseScanLaneQr.java deleted file mode 100644 index 95541578c..000000000 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/response/ResponseScanLaneQr.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jsowell.thirdparty.parking.response; - -import lombok.Getter; -import lombok.Setter; - -/** - * @desc:响应参数,车主扫码通道二维码，入场or出场(支持无牌车) - * @date: 2021-11-16 14:50 - */ -@Setter -@Getter -public class ResponseScanLaneQr { - - Integer parkId; //车场ID - Integer laneId; //通道ID - Integer laneType; //通道类型 - String plate; //车牌号 - Object inQrResponse; //入场响应 - Object outQrResponse; //出场响应 -} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java index db7b502fa..abb213424 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/QcyunsServiceImpl.java @@ -1,13 +1,17 @@ package com.jsowell.thirdparty.parking.service.impl; import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.google.common.collect.Maps; import com.jsowell.common.core.domain.parking.ParkingCommonParam; import com.jsowell.common.util.ParkingUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.UUID; +import com.jsowell.thirdparty.parking.common.ServiceApiCmd; +import com.jsowell.thirdparty.parking.common.response.DataResponse; import com.jsowell.thirdparty.parking.service.QcyunsService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.Map; @@ -15,6 +19,7 @@ import java.util.Map; /** * */ +@Slf4j @Service public class QcyunsServiceImpl implements QcyunsService { @@ -34,24 +39,58 @@ public class QcyunsServiceImpl implements QcyunsService { if (StringUtils.isBlank(parkId)) { parkId = "11609"; } + // 业务参数 Map data = Maps.newHashMap(); data.put("ParkId", parkId); data.put("PlateNumber", plateNumber); - + // 组装请求体 ParkingCommonParam param = new ParkingCommonParam(); - param.setService("CarInfo"); + param.setService(ServiceApiCmd.CarInfo); param.setVersion("01"); param.setMsgId(UUID.randomUUID().toString()); param.setOrgId("BTTEST01"); param.setData(data); - - String secretKey = ""; // 生成sign ParkingUtil.generateAndSetSign(param, secretKey); - // 发送请求 String result = HttpUtil.post(URL, JSON.toJSONString(param)); - System.out.println(result); + DataResponse dataResponse = JSONUtil.toBean(result, DataResponse.class); + log.info("获取车辆信息接口成功, response:{}", JSON.toJSONString(dataResponse)); + if (dataResponse.getRetCode() == 0) { + return dataResponse.getRetData().toString(); + } return null; } + + /** + * 商家减免 + * @return + */ + public boolean createDiscountCoupon() { + // 业务参数 + Map data = Maps.newHashMap(); + data.put("parkingSerial", ""); + data.put("grantSerial", ""); + data.put("plate", ""); // 车牌号 + data.put("storeName", ""); // 商家名称 + data.put("type", ""); // 优惠类型: 1.金额, 2.时长, 3.全免 + data.put("value", ""); // 当type=1时单位为分;当type=2时单位为分钟 + data.put("parkId", ""); // + // 组装请求体 + ParkingCommonParam param = new ParkingCommonParam(); + param.setService(ServiceApiCmd.DiscountCreate); + param.setVersion("01"); + param.setMsgId(UUID.randomUUID().toString()); + param.setOrgId("BTTEST01"); + param.setData(data); + // 生成sign + ParkingUtil.generateAndSetSign(param, secretKey); + // 发送请求 + String result = HttpUtil.post(URL, JSON.toJSONString(param)); + DataResponse dataResponse = JSONUtil.toBean(result, DataResponse.class); + log.info("创建优惠券成功, response:{}", JSON.toJSONString(dataResponse)); + if (dataResponse.getRetCode() == 0) { + } + return false; + } }