From ad2cf6a1e3d70f7997a31664e0b968b4475e4939 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 10 Feb 2025 13:32:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransactionRecordsRequestHandler.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 9bb5e0955..3f31bcb18 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -678,27 +678,12 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler { }, executor); } - // // 给车辆绑定优惠券 - // try { - // // BigDecimal totalElectricity = new BigDecimal(data.getTotalElectricity()); - // // if (totalElectricity.compareTo(BigDecimal.TEN) > 0) { - // // // 充电度数大于10度 - // // } - // String bindResult = bindCoupon(orderBasicInfo); - // log.info("绑定优惠券 订单信息:{}, result:{}", orderBasicInfo, bindResult); - // } catch (BusinessException e) { - // log.error("绑定优惠券 error, code:{}, msg:{}", e.getCode(), e.getMessage()); - // } catch (Exception e) { - // log.error("绑定优惠券 error,", e); - // } - // 异步推送第三方平台订单信息 CompletableFuture.runAsync(() -> { try { commonService.commonPushOrderInfo(finalOrderBasicInfo); } catch (Exception e) { log.error("推送第三方平台订单信息error, ", e); - e.printStackTrace(); } }, executor); @@ -708,7 +693,6 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler { commonService.commonPushOrderInfoV2(finalOrderBasicInfo); } catch (Exception e) { log.error("推送第三方平台订单信息error, ", e); - e.printStackTrace(); } }, executor); } else { From 679cca6b98580255a897f0901a6ae40c6ec4a71a Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 10 Feb 2025 13:54:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=81=9C=E8=BD=A6=E5=88=B8?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=9C=A80x13=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TransactionRecordsRequestHandler.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 3f31bcb18..d297a6c09 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -661,22 +661,7 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler { log.error("结算订单发生异常 orderCode:{}", orderBasicInfo.getOrderCode(), e); } - // 异步绑定第三方平台优惠券 OrderBasicInfo finalOrderBasicInfo = orderBasicInfo; - String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderBasicInfo.getOrderCode(); - Object cacheObject = redisCache.getCacheObject(redisKey); - if (cacheObject == null) { - CompletableFuture.runAsync(() -> { - try { - String bindResult = commonService.bindCoupon(finalOrderBasicInfo); - log.info("绑定优惠券 订单信息:{}, result:{}", finalOrderBasicInfo, bindResult); - // 删除绑定优惠券缓存 - redisCache.deleteObject(redisKey); - } catch (Exception e) { - log.error("绑定优惠券 error,", e); - } - }, executor); - } // 异步推送第三方平台订单信息 CompletableFuture.runAsync(() -> { From 5e66ca653dd660688fb3ddf1478e40c896e44679 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 10 Feb 2025 14:26:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9thirdparty=E4=B8=AD?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=B9=B3=E5=8F=B0=E4=BB=A3=E7=A0=81=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/thirdparty/RJController.java | 2 +- .../test/java/SpringBootTestController.java | 2 +- .../UploadRealTimeMonitorHandler.java | 40 +++++++++---------- .../thirdparty/common/CommonService.java | 4 +- .../common/LTYTCommonParams.java | 2 +- .../common/LTYTCommonResult.java | 2 +- .../service/LTYTService.java | 2 +- .../service/RJService.java | 2 +- .../service/impl/LTYTServiceImpl.java | 5 +-- .../service/impl/RJServiceImpl.java | 6 +-- 10 files changed, 33 insertions(+), 34 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyunting => parking}/common/LTYTCommonParams.java (93%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyunting => parking}/common/LTYTCommonResult.java (82%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyunting => parking}/service/LTYTService.java (91%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{ruanjie => parking}/service/RJService.java (85%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyunting => parking}/service/impl/LTYTServiceImpl.java (97%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{ruanjie => parking}/service/impl/RJServiceImpl.java (93%) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java index 23ba5f3cf..7bd01af17 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/RJController.java @@ -5,7 +5,7 @@ import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.ruanjie.UseCouponDTO; -import com.jsowell.thirdparty.ruanjie.service.RJService; +import com.jsowell.thirdparty.parking.service.RJService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 3ccce38bd..5841fe2fe 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -77,7 +77,7 @@ import com.jsowell.thirdparty.common.NotificationDTO; import com.jsowell.thirdparty.common.NotificationService; import com.jsowell.thirdparty.huawei.HuaWeiService; import com.jsowell.thirdparty.lianlian.service.LianLianService; -import com.jsowell.thirdparty.lutongyunting.service.LTYTService; +import com.jsowell.thirdparty.parking.service.LTYTService; import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; import com.jsowell.thirdparty.platform.util.Cryptos; import com.jsowell.thirdparty.platform.util.Encodes; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index 81567a66d..8a33bd772 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -322,28 +322,28 @@ public class UploadRealTimeMonitorHandler extends AbstractYkcHandler { } // 判断该订单是否需要下发优惠券 - String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderInfo.getOrderCode(); - Object cacheObject = redisCache.getCacheObject(redisKey); - if (cacheObject == null && sumChargingTime >= 10) { - // 异步绑定优惠券并设置缓存 - CompletableFuture.runAsync(() -> { - try { - commonService.bindCoupon(orderInfo); - redisCache.setCacheObject(redisKey, Boolean.TRUE, 24, TimeUnit.HOURS); - } catch (Exception e) { - log.error("异步绑定车辆优惠券 error,", e); - } - }, executor); - } + // String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderInfo.getOrderCode(); + // Object cacheObject = redisCache.getCacheObject(redisKey); + // if (cacheObject == null && sumChargingTime >= 10) { + // // 异步绑定优惠券并设置缓存 + // CompletableFuture.runAsync(() -> { + // try { + // commonService.bindCoupon(orderInfo); + // redisCache.setCacheObject(redisKey, Boolean.TRUE, 24, TimeUnit.HOURS); + // } catch (Exception e) { + // log.error("异步绑定车辆优惠券 error,", e); + // } + // }, executor); + // } // 异步绑定优惠券 - // CompletableFuture.runAsync(() -> { - // try { - // commonService.bindParkingCoupon(realTimeMonitorData, orderInfo); - // } catch (Exception e) { - // log.error("异步绑定车辆停车优惠券error", e); - // } - // }, executor); + CompletableFuture.runAsync(() -> { + try { + commonService.bindParkingCoupon(realTimeMonitorData, orderInfo); + } catch (Exception e) { + log.error("异步绑定车辆停车优惠券error", e); + } + }, executor); } // 充电时保存实时数据到redis diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index f7a6e8ad4..bb75331e8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -34,14 +34,14 @@ import com.jsowell.pile.vo.web.ChargeParkingDiscountVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.huawei.HuaweiServiceV2; import com.jsowell.thirdparty.lianlian.service.LianLianService; -import com.jsowell.thirdparty.lutongyunting.service.LTYTService; +import com.jsowell.thirdparty.parking.service.LTYTService; import com.jsowell.thirdparty.nanrui.service.NRService; import com.jsowell.thirdparty.platform.service.impl.DianXingPlatformServiceImpl; import com.jsowell.thirdparty.platform.service.impl.HaiNanPlatformServiceImpl; import com.jsowell.thirdparty.platform.service.impl.NingXiaPlatformServiceImpl; import com.jsowell.thirdparty.platform.service.impl.QingHaiPlatformServiceImpl; import com.jsowell.thirdparty.platform.util.HttpRequestUtil; -import com.jsowell.thirdparty.ruanjie.service.RJService; +import com.jsowell.thirdparty.parking.service.RJService; import com.jsowell.thirdparty.service.ThirdpartySecretInfoService; import com.jsowell.thirdparty.xindiantu.service.XDTService; import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/LTYTCommonParams.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/LTYTCommonParams.java index 8f3563db8..481baa0c3 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/LTYTCommonParams.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyunting.common; +package com.jsowell.thirdparty.parking.common; import lombok.Data; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/LTYTCommonResult.java similarity index 82% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/LTYTCommonResult.java index d21570b0f..c0e3a247d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/common/LTYTCommonResult.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyunting.common; +package com.jsowell.thirdparty.parking.common; import lombok.Data; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/LTYTService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/LTYTService.java similarity index 91% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/LTYTService.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/LTYTService.java index 43638939c..709793f2d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/LTYTService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/LTYTService.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyunting.service; +package com.jsowell.thirdparty.parking.service; import com.jsowell.pile.dto.lutongyunting.BindCouponDTO; import com.jsowell.pile.dto.lutongyunting.GetTokenDTO; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ruanjie/service/RJService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/RJService.java similarity index 85% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ruanjie/service/RJService.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/RJService.java index e6751083c..a8c60de50 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ruanjie/service/RJService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/RJService.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.ruanjie.service; +package com.jsowell.thirdparty.parking.service; import com.jsowell.pile.dto.ruanjie.UseCouponDTO; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java similarity index 97% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java index 94cabc553..981e5a6bd 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyunting.service.impl; +package com.jsowell.thirdparty.parking.service.impl; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSON; @@ -14,8 +14,7 @@ import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.dto.lutongyunting.BindCouponDTO; import com.jsowell.pile.dto.lutongyunting.GetTokenDTO; import com.jsowell.pile.service.CarCouponRecordService; -import com.jsowell.thirdparty.lutongyunting.common.LTYTCommonParams; -import com.jsowell.thirdparty.lutongyunting.service.LTYTService; +import com.jsowell.thirdparty.parking.service.LTYTService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ruanjie/service/impl/RJServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/RJServiceImpl.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ruanjie/service/impl/RJServiceImpl.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/RJServiceImpl.java index 1e805e5b3..0319921b8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ruanjie/service/impl/RJServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/RJServiceImpl.java @@ -1,12 +1,12 @@ -package com.jsowell.thirdparty.ruanjie.service.impl; +package com.jsowell.thirdparty.parking.service.impl; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.util.sign.MD5Util; import com.jsowell.pile.dto.ruanjie.UseCouponDTO; -import com.jsowell.thirdparty.lutongyunting.service.impl.LTYTServiceImpl; -import com.jsowell.thirdparty.ruanjie.service.RJService; +import com.jsowell.thirdparty.parking.service.impl.LTYTServiceImpl; +import com.jsowell.thirdparty.parking.service.RJService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service;