|
@@ -20,10 +20,7 @@ import com.kym.service.cache.KymCache;
|
|
|
import com.kym.service.enplus.EnNotifyService;
|
|
import com.kym.service.enplus.EnNotifyService;
|
|
|
import com.kym.service.enplus.EnPlusService;
|
|
import com.kym.service.enplus.EnPlusService;
|
|
|
import com.kym.service.factory.DiscountStrategyFactory;
|
|
import com.kym.service.factory.DiscountStrategyFactory;
|
|
|
-import com.kym.service.miniapp.AccountService;
|
|
|
|
|
-import com.kym.service.miniapp.ChargeOrderService;
|
|
|
|
|
-import com.kym.service.miniapp.ChargeService;
|
|
|
|
|
-import com.kym.service.miniapp.WalletDetailService;
|
|
|
|
|
|
|
+import com.kym.service.miniapp.*;
|
|
|
import jakarta.annotation.PostConstruct;
|
|
import jakarta.annotation.PostConstruct;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -56,13 +53,16 @@ public class EnNotifyServiceImpl implements EnNotifyService {
|
|
|
private final MonitorLogService monitorLogService;
|
|
private final MonitorLogService monitorLogService;
|
|
|
private final EquipmentInfoService equipmentInfoService;
|
|
private final EquipmentInfoService equipmentInfoService;
|
|
|
private final ConnectorInfoService connectorInfoService;
|
|
private final ConnectorInfoService connectorInfoService;
|
|
|
|
|
+
|
|
|
|
|
+ private final UserStationService userStationService;
|
|
|
|
|
+
|
|
|
@Value("${kym.notify-email}")
|
|
@Value("${kym.notify-email}")
|
|
|
private String notifyEmail;
|
|
private String notifyEmail;
|
|
|
|
|
|
|
|
public EnNotifyServiceImpl(EnPlusService enPlusService, ChargeOrderService chargeOrderService,
|
|
public EnNotifyServiceImpl(EnPlusService enPlusService, ChargeOrderService chargeOrderService,
|
|
|
ChargeService chargeService, AccountService accountService, WalletDetailService walletDetailService,
|
|
ChargeService chargeService, AccountService accountService, WalletDetailService walletDetailService,
|
|
|
MonitorLogService monitorLogService, EquipmentInfoService equipmentInfoService,
|
|
MonitorLogService monitorLogService, EquipmentInfoService equipmentInfoService,
|
|
|
- ConnectorInfoService connectorInfoService, StringRedisTemplate redisTemplate) {
|
|
|
|
|
|
|
+ ConnectorInfoService connectorInfoService, StringRedisTemplate redisTemplate, UserStationService userStationService) {
|
|
|
this.enPlusService = enPlusService;
|
|
this.enPlusService = enPlusService;
|
|
|
this.chargeOrderService = chargeOrderService;
|
|
this.chargeOrderService = chargeOrderService;
|
|
|
this.chargeService = chargeService;
|
|
this.chargeService = chargeService;
|
|
@@ -72,6 +72,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
|
|
|
this.equipmentInfoService = equipmentInfoService;
|
|
this.equipmentInfoService = equipmentInfoService;
|
|
|
this.connectorInfoService = connectorInfoService;
|
|
this.connectorInfoService = connectorInfoService;
|
|
|
this.redisTemplate = redisTemplate;
|
|
this.redisTemplate = redisTemplate;
|
|
|
|
|
+ this.userStationService = userStationService;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostConstruct
|
|
@PostConstruct
|
|
@@ -301,6 +302,9 @@ public class EnNotifyServiceImpl implements EnNotifyService {
|
|
|
deductions(chargeOrder, account, endTime);
|
|
deductions(chargeOrder, account, endTime);
|
|
|
// redis删除缓存订单信息(订单结算完调用)
|
|
// redis删除缓存订单信息(订单结算完调用)
|
|
|
redisTemplate.opsForHash().delete(RedisKeys.CHARGE_ORDER_EQUIP_CHARGE_STATUS, startChargeSeq);
|
|
redisTemplate.opsForHash().delete(RedisKeys.CHARGE_ORDER_EQUIP_CHARGE_STATUS, startChargeSeq);
|
|
|
|
|
+
|
|
|
|
|
+ // 更新用户站点数据
|
|
|
|
|
+ userStationService.updateUserStation(chargeOrder);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return """
|
|
return """
|
|
@@ -344,4 +348,4 @@ public class EnNotifyServiceImpl implements EnNotifyService {
|
|
|
walletDetailService.save(walletDetail);
|
|
walletDetailService.save(walletDetail);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
-}
|
|
|
|
|
|
|
+}
|