autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-07 03:20:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Guoqs
2025-08-26 16:00:58 +08:00
parent a9e481abb5
commit 4e7bf56522
2 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/TransactionRecordsStrategy.java
View File

@@ -2,7 +2,6 @@ package com.jsowell.netty.strategy.ykc;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.google.common.primitives.Bytes; import com.google.common.primitives.Bytes;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants; import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
@@ -33,7 +32,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.Date; import java.util.Date;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CompletableFuture;
/** /**
* 交易记录确认 * 交易记录确认
@@ -647,41 +645,41 @@ public class TransactionRecordsStrategy implements AbstractYkcStrategy {
} }
// 异步绑定第三方平台优惠券 // 异步绑定第三方平台优惠券
OrderBasicInfo finalOrderBasicInfo = orderBasicInfo; // OrderBasicInfo finalOrderBasicInfo = orderBasicInfo;
String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderBasicInfo.getOrderCode(); // String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderBasicInfo.getOrderCode();
Object cacheObject = redisCache.getCacheObject(redisKey); // Object cacheObject = redisCache.getCacheObject(redisKey);
if (cacheObject == null) { // if (cacheObject == null) {
CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
try { // try {
String bindResult = commonService.bindCoupon(finalOrderBasicInfo); // String bindResult = commonService.bindCoupon(finalOrderBasicInfo);
log.info("绑定优惠券 订单信息:{}, result:{}", finalOrderBasicInfo, bindResult); // log.info("绑定优惠券 订单信息:{}, result:{}", finalOrderBasicInfo, bindResult);
// 删除绑定优惠券缓存 // // 删除绑定优惠券缓存
redisCache.deleteObject(redisKey); // redisCache.deleteObject(redisKey);
} catch (Exception e) { // } catch (Exception e) {
log.error("绑定优惠券 error,", e); // log.error("绑定优惠券 error,", e);
} // }
}, executor); // }, executor);
} // }
// 异步推送第三方平台订单信息 // 异步推送第三方平台订单信息
CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
try { // try {
commonService.commonPushOrderInfo(finalOrderBasicInfo); // commonService.commonPushOrderInfo(finalOrderBasicInfo);
} catch (Exception e) { // } catch (Exception e) {
log.error("推送第三方平台订单信息error, ", e); // log.error("推送第三方平台订单信息error, ", e);
e.printStackTrace(); // e.printStackTrace();
} // }
}, executor); // }, executor);
// 异步推送第三方平台订单信息V2 // 异步推送第三方平台订单信息V2
CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
try { // try {
commonService.commonPushOrderInfoV2(finalOrderBasicInfo); // commonService.commonPushOrderInfoV2(finalOrderBasicInfo);
} catch (Exception e) { // } catch (Exception e) {
log.error("推送第三方平台订单信息error, ", e); // log.error("推送第三方平台订单信息error, ", e);
e.printStackTrace(); // e.printStackTrace();
} // }
}, executor); // }, executor);
} else { } else {
// 平台没有查到订单 // 平台没有查到订单
orderBasicInfoService.saveAbnormalOrder(data); orderBasicInfoService.saveAbnormalOrder(data);

26
jsowell-netty/src/main/java/com/jsowell/netty/strategy/ykc/UploadRealTimeMonitorStrategy.java
View File

@@ -325,19 +325,19 @@ public class UploadRealTimeMonitorStrategy implements AbstractYkcStrategy {
pileBasicInfoService.saveRealTimeMonitorData2Redis(realTimeMonitorData); pileBasicInfoService.saveRealTimeMonitorData2Redis(realTimeMonitorData);
} }
// 判断该订单是否需要下发优惠券 // 判断该订单是否需要下发优惠券
String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderInfo.getOrderCode(); // String redisKey = CacheConstants.CAR_BIND_COUPON_BY_ORDER_CODE + orderInfo.getOrderCode();
Object cacheObject = redisCache.getCacheObject(redisKey); // Object cacheObject = redisCache.getCacheObject(redisKey);
if (cacheObject == null && sumChargingTime >= 10) { // if (cacheObject == null && sumChargingTime >= 10) {
// 异步绑定优惠券并设置缓存 // // 异步绑定优惠券并设置缓存
CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
try { // try {
commonService.bindCoupon(orderInfo); // commonService.bindCoupon(orderInfo);
redisCache.setCacheObject(redisKey, Boolean.TRUE, 24, TimeUnit.HOURS); // redisCache.setCacheObject(redisKey, Boolean.TRUE, 24, TimeUnit.HOURS);
} catch (Exception e) { // } catch (Exception e) {
log.error("异步绑定车辆优惠券 error,", e); // log.error("异步绑定车辆优惠券 error,", e);
} // }
}, executor); // }, executor);
} // }
} }