From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 118 insertions(+), 52 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 780c63f..46e04b6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -65,6 +65,7 @@
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -146,9 +147,6 @@
@Resource
private AccountingStrategyDetailOrderClient accountingStrategyDetailOrderClient;
-
- @Resource
- private AccountingStrategyOrderClient accountingStrategyOrderClient;
@Resource
private AccountingStrategyClient accountingStrategyClient;
@@ -434,6 +432,7 @@
chargingOrder.setAppUserId(userId);
chargingOrder.setAppUserCarId(addChargingOrder.getAppUserCarId());
TChargingGun tChargingGun = chargingGunClient.getChargingGunById(addChargingOrder.getId()).getData();
+ TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
chargingOrder.setSiteId(tChargingGun.getSiteId());
chargingOrder.setChargingPileId(tChargingGun.getChargingPileId());
chargingOrder.setChargingGunId(addChargingOrder.getId());
@@ -443,6 +442,8 @@
chargingOrder.setAppCouponId(addChargingOrder.getAppUserCouponId());
chargingOrder.setVipDiscount(new BigDecimal(10));
chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
+ chargingOrder.setOrderSource(0);
+ chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
@@ -889,13 +890,11 @@
* @return
*/
public AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time){
- if("SUCCESS".equals(tradeState)){
- TChargingOrderRefund one = chargingOrderRefundService.getOne(new LambdaQueryWrapper<TChargingOrderRefund>().eq(TChargingOrderRefund::getRefundCode, out_refund_no));
- one.setRefundSerialNumber(refund_id);
- one.setRefundStatus(2);
- one.setRefundTime(LocalDateTime.now());
- chargingOrderRefundService.updateById(one);
- }
+ TChargingOrderRefund one = chargingOrderRefundService.getOne(new LambdaQueryWrapper<TChargingOrderRefund>().eq(TChargingOrderRefund::getRefundCode, out_refund_no));
+ one.setRefundSerialNumber(refund_id);
+ one.setRefundStatus(2);
+ one.setRefundTime(LocalDateTime.now());
+ chargingOrderRefundService.updateById(one);
return AjaxResult.success();
}
@@ -965,7 +964,6 @@
return AjaxResult.error("不能重复操作");
}
chargingOrder.setEndTime(LocalDateTime.now());
- chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
@@ -987,6 +985,7 @@
for (int i = 0; i < 60; i++) {
TChargingOrder chargingOrder1 = this.getById(id);
if(chargingOrder1.getStatus() != 3){
+ stop_status = true;
break;
}
GetPlatformStopChargingReply query = new GetPlatformStopChargingReply();
@@ -1035,16 +1034,8 @@
}
}
if(stop_status){
- chargingOrder.setStatus(5);
+ chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
-
- //计算用户标签
- editUserTag(chargingOrder);
- //用户推荐奖励
- referralReward(chargingOrder);
- // 将枪状态重置为空闲
- chargingGun.setStatus(2);
- chargingGunClient.updateChargingGunById(chargingGun);
}else{
log.error(code1 + "：-------------------远程停止充电应答最终失败-------------------");
}
@@ -1210,8 +1201,11 @@
}
log.error(code1 + "：停机失败：订单号：{}，失败原因：{}", order.getCode(), failure_cause);
}else{
- order.setEndMode(1);
- this.updateById(order);
+ TChargingOrder chargingOrder = new TChargingOrder();
+ chargingOrder.setId(order.getId());
+ chargingOrder.setAppUserId(order.getAppUserId());
+ chargingOrder.setEndMode(1);
+ this.updateById(chargingOrder);
}
}
@@ -1792,8 +1786,16 @@
}
BigDecimal residualAmount = chargingOrder.getRechargeAmount().subtract(t).setScale(4, RoundingMode.HALF_EVEN);
chargingOrder.setResidualAmount(residualAmount);
- BigDecimal divide = query.getOutput_current().multiply(query.getOutput_voltage()).divide(new BigDecimal(1000));
- chargingOrder.setChargingPower(divide);
+ if(query.getOutput_current().compareTo(BigDecimal.ZERO) != 0){
+ BigDecimal divide = query.getOutput_current().multiply(query.getOutput_voltage()).divide(new BigDecimal(1000));
+ chargingOrder.setChargingPower(divide);
+ chargingOrder.setCurrent(query.getOutput_current());
+ chargingOrder.setVoltage(query.getOutput_voltage());
+ chargingOrder.setPower(query.getOutput_current().multiply(query.getOutput_voltage()));
+ chargingOrder.setNeedElec(query.getOutput_current());
+ }
+ chargingOrder.setElectricity(query.getCharging_degree());
+ chargingOrder.setTotalElectricity(new BigDecimal(100 - query.getSoc()));
this.updateById(chargingOrder);
}
}
@@ -1806,7 +1808,10 @@
@Override
@GlobalTransactional(rollbackFor = Exception.class)
public void endCharge(String orderCode, Integer endMode) {
- TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, orderCode));
+ TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, orderCode));
+ TChargingOrder chargingOrder = new TChargingOrder();
+ chargingOrder.setId(order.getId());
+ chargingOrder.setAppUserId(order.getAppUserId());
chargingOrder.setEndMode(endMode);
this.updateById(chargingOrder);
}
@@ -1842,17 +1847,68 @@
//如果使用优惠券需要判断优惠券是否满足使用条件
//根据实际的充电金额计算退款金额 退回费用=(原金额/总金额)*(总金额-实际充电金额)
//退款金额=优惠券金额+剩余充电金额
- List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
BigDecimal periodElectricPrice_total = BigDecimal.ZERO;
BigDecimal periodServicePrice_total = BigDecimal.ZERO;
BigDecimal total = BigDecimal.ZERO;
- for (TChargingOrderAccountingStrategy chargingOrderAccountingStrategy : list) {
- BigDecimal periodElectricPrice = chargingOrderAccountingStrategy.getPeriodElectricPrice();
- BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodOriginalServicePrice();
- periodElectricPrice_total = periodElectricPrice_total.add(periodElectricPrice);
- periodServicePrice_total = periodServicePrice_total.add(periodServicePrice);
- total = total.add(periodElectricPrice).add(periodServicePrice);
+
+ //获取订单的计费策略
+ List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
+ chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
+ for (int i = 0; i < 12; i++) {
+ Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
+ try {
+ String time = (String) clazz.getMethod("getTime" + (i + 1)).invoke(vo);
+ if(StringUtils.hasLength(time)){
+ //充电度数
+ Object invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
+ BigDecimal Sharp_peak_charge = new BigDecimal(invoke.toString());
+ //充电金额
+ Object invoke1 = clazz.getMethod("getSharp_peak_amount" + (i + 1)).invoke(vo);
+ BigDecimal sharp_peak_amount = new BigDecimal(invoke1.toString());
+
+ String[] split = time.split("~");
+ AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[1]) && s.getEndTime().equals(split[2])).findFirst().get();
+
+ TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
+ chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
+ chargingOrderAccountingStrategy.setAccountingStrategyDetailId(strategyDetail.getId());
+ chargingOrderAccountingStrategy.setType(strategyDetail.getType());
+ chargingOrderAccountingStrategy.setStartTime(chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")));
+ chargingOrderAccountingStrategy.setEndTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm")));
+ chargingOrderAccountingStrategy.setElectrovalence(strategyDetail.getElectrovalence());
+ chargingOrderAccountingStrategy.setServiceCharge(strategyDetail.getServiceCharge());
+ chargingOrderAccountingStrategy.setCostServiceCharge(strategyDetail.getCostServiceCharge());
+ //已充电总度数
+ BigDecimal electrovalenc = strategyDetail.getElectrovalence().multiply(Sharp_peak_charge);
+ BigDecimal originalServicePrice = strategyDetail.getServiceCharge().multiply(Sharp_peak_charge);
+ BigDecimal serviceCharge = originalServicePrice;
+ //计算优惠金额
+ if(null != chargingOrder.getVipDiscount()){
+ serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount().divide(new BigDecimal(10)));
+ }
+ chargingOrderAccountingStrategy.setChargingCapacity(Sharp_peak_charge);
+ chargingOrderAccountingStrategy.setPeriodElectricPrice(electrovalenc);
+ chargingOrderAccountingStrategy.setPeriodServicePrice(serviceCharge);
+ chargingOrderAccountingStrategy.setPeriodOriginalServicePrice(originalServicePrice);
+ chargingOrderAccountingStrategy.setCreateTime(LocalDateTime.now());
+ chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy);
+
+ BigDecimal periodElectricPrice = chargingOrderAccountingStrategy.getPeriodElectricPrice();
+ BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodOriginalServicePrice();
+ periodElectricPrice_total = periodElectricPrice_total.add(periodElectricPrice);
+ periodServicePrice_total = periodServicePrice_total.add(periodServicePrice);
+ total = total.add(periodElectricPrice).add(periodServicePrice);
+ }
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException(e);
+ } catch (NoSuchMethodException e) {
+ throw new RuntimeException(e);
+ }
}
+
+
//原金额
BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
BigDecimal vipDiscountAmount = chargingOrder.getVipDiscountAmount();
@@ -1890,15 +1946,22 @@
payAmount = payAmount.subtract(discountAmount);
}
- if(chargingOrder.getEndMode() == 2){
- chargingOrder.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3);
+ TChargingOrder order = new TChargingOrder();
+ order.setId(chargingOrder.getId());
+ order.setAppUserId(chargingOrder.getAppUserId());
+ if(null != chargingOrder.getEndMode() && chargingOrder.getEndMode() == 2){
+ order.setEndMode(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 2 : 3);
}
- chargingOrder.setEndTime(LocalDateTime.now());
- chargingOrder.setStatus(5);
- chargingOrder.setOrderAmount(orderAmount);
- chargingOrder.setVipDiscountAmount(discountAmount);
- chargingOrder.setServiceCharge(periodServicePrice_total);
- chargingOrder.setElectrovalence(periodElectricPrice_total);
+ if(null == chargingOrder.getEndMode()){
+ order.setEndMode(1);
+ }
+ order.setResidualAmount(rechargeAmount.subtract(total));
+ order.setEndTime(LocalDateTime.now());
+ order.setStatus(5);
+ order.setOrderAmount(orderAmount);
+ order.setVipDiscountAmount(discountAmount);
+ order.setServiceCharge(periodServicePrice_total);
+ order.setElectrovalence(periodElectricPrice_total);
//计算优惠券
if(null != chargingOrder.getAppCouponId()){
@@ -1911,11 +1974,11 @@
//满减
if(payAmount.compareTo(tCoupon.getMeetTheConditions()) >= 0){
refundAmount = refundAmount.add(tCoupon.getDiscountAmount());
- chargingOrder.setCouponDiscountAmount(tCoupon.getDiscountAmount());
+ order.setCouponDiscountAmount(tCoupon.getDiscountAmount());
payAmount = payAmount.subtract(tCoupon.getDiscountAmount());
}else{
- chargingOrder.setAppCouponId(null);
- chargingOrder.setCouponDiscountAmount(BigDecimal.ZERO);
+ order.setAppCouponId(null);
+ order.setCouponDiscountAmount(BigDecimal.ZERO);
appCouponClient.refund(chargingOrder.getAppCouponId().toString());
}
}
@@ -1926,17 +1989,20 @@
BigDecimal divide = payAmount.multiply(new BigDecimal(10).subtract(tCoupon.getDiscount())).divide(new BigDecimal(10));
divide = divide.compareTo(tCoupon.getMaximumDiscountAmount()) > 0 ? tCoupon.getMaximumDiscountAmount() : divide;
refundAmount = refundAmount.add(divide);
- chargingOrder.setCouponDiscountAmount(divide);
+ order.setCouponDiscountAmount(divide);
payAmount = payAmount.subtract(divide);
}else{
- chargingOrder.setAppCouponId(null);
- chargingOrder.setCouponDiscountAmount(BigDecimal.ZERO);
+ order.setAppCouponId(null);
+ order.setCouponDiscountAmount(BigDecimal.ZERO);
appCouponClient.refund(chargingOrder.getAppCouponId().toString());
}
}
}
- chargingOrder.setPaymentAmount(payAmount);
- this.updateById(chargingOrder);
+ order.setPaymentAmount(payAmount);
+ order.setRefundAmount(refundAmount);
+ order.setRefundStatus(1);
+ this.updateById(order);
+ chargingOrder = this.getById(order.getId());
// 将枪状态重置为空闲
TChargingGun chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
@@ -2010,7 +2076,7 @@
RefundReq dto = new RefundReq();
dto.setOutTradeNo(chargingOrder.getCode());
dto.setOutRequestNo(chargingOrderRefund.getCode());
- dto.setRefundAmount(rechargeAmount.toString());
+ dto.setRefundAmount(refundAmount.toString());
dto.setRefundReason("充电完成退款");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
@@ -2155,10 +2221,10 @@
RefundResp resp = aliPaymentClient.refund(dto).getData();
if(null != resp){
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
- tChargingOrder.setRefundStatus(2);
- tChargingOrder.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
+ chargingOrderRefund.setRefundStatus(2);
+ chargingOrderRefund.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
this.baseMapper.updateById(tChargingOrder);
- chargingOrderRefundService.save(chargingOrderRefund);
+ chargingOrderRefundService.save(chargingOrderRefund);
}
}
--
Gitblit v1.7.1