From 50ec9ddb9d88b4114ef1b41ed1eab8448ce0bbe1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 02 十一月 2024 15:23:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 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 a19fda8..003610a 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
@@ -289,6 +289,7 @@
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : dataList) {
if(!sdf.format(uploadRealTimeMonitoringData.getCreate_time()).equals(t)){
dataLists.add(uploadRealTimeMonitoringData);
+ t = sdf.format(uploadRealTimeMonitoringData.getCreate_time());
}
}
@@ -1412,7 +1413,7 @@
chargingOrderListVO.setChargingCapacity(chargingOrderListVO.getElectricity());
BigDecimal bigDecimal = new BigDecimal("0.006");
if (chargingOrderListVO.getOrderAmount()!=null){
- chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getOrderAmount().multiply(bigDecimal));
+ chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getPaymentAmount().multiply(bigDecimal));
}
chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getPaymentAmount());
chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");
@@ -1440,10 +1441,20 @@
// 获取开始SOC 结束soc
if (chargingOrderListVO.getCode()!=null){
List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
+
if (data6!=null && !data6.isEmpty()){
- // 第一条数据soc为开始 最后一条数据soc为结束soc
- chargingOrderListVO.setEndSoc(data6.get(0).getSoc().toString());
- chargingOrderListVO.setStartSoc(data6.get(data6.size()-1).getSoc().toString());
+ int min = 100;
+ int max = 0;
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data6) {
+ if (uploadRealTimeMonitoringData.getSoc()>max){
+ max = uploadRealTimeMonitoringData.getSoc();
+ }
+ if (uploadRealTimeMonitoringData.getSoc()!=0 &&uploadRealTimeMonitoringData.getSoc()<min){
+ min = uploadRealTimeMonitoringData.getSoc();
+ }
+ }
+ chargingOrderListVO.setEndSoc(max+"");
+ chargingOrderListVO.setStartSoc(min+"");
}
}
@@ -1806,7 +1817,7 @@
//获取订单的计费策略
List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
-
+ accountingStrategyDetailOrderList.get(accountingStrategyDetailOrderList.size() - 1).setEndTime("23:59");
//开始处理计费明细数据和优惠数据
chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -2083,7 +2094,7 @@
if(null != integralRule){
TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
Integer num1 = JSON.parseObject(integralRule.getChargeCredit()).getInteger("num1");
- Integer integral = payAmount.multiply(new BigDecimal(num1)).intValue();
+ Integer integral = chargingOrder.getServiceCharge().intValue() * num1;
if(null != appUser.getVipId()){
TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
Integer doubleIntegration = vip.getDoubleIntegration();
@@ -2571,15 +2582,13 @@
if (tChargingOrder.getCouponDiscountAmount()!=null){
couponDiscount = couponDiscount.add(tChargingOrder.getCouponDiscountAmount());
}
- if (tChargingOrder.getRefundStatus()!=null &&tChargingOrder.getRefundStatus() == 2){
- // 如果成功退款 那么减去退款金额
+ if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
- }else{
- if (tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
- }
}
+
}
+ tSettlementConfirm.setServiceMoney(dto.getServiceCharge().subtract(dto.getVenue()).subtract(dto.getClean())
+ .subtract(dto.getMaintain()).multiply(dto.getServicePartner()));
// 三方交易手续费 三方收费*0.6%
commissionAmount = sharingAmount.multiply(new BigDecimal("0.006"));
// 订单手续费 订单支付金额 - 退款金额*0.6%
@@ -2587,7 +2596,7 @@
tSettlementConfirm.setSharingAmount(sharingAmount.setScale(2, RoundingMode.HALF_DOWN));
tSettlementConfirm.setCommissionAmount(commissionAmount.setScale(2, RoundingMode.HALF_DOWN));
tSettlementConfirm.setElectrovalence(electrovalence.setScale(2, RoundingMode.HALF_DOWN));
- tSettlementConfirm.setServiceCharge(serviceCharge.setScale(2, RoundingMode.HALF_DOWN));
+ tSettlementConfirm.setServiceCharge(serviceCharge.subtract(commissionAmount).setScale(2, RoundingMode.HALF_DOWN));
tSettlementConfirm.setOrderCommission(orderCommission);
tSettlementConfirm.setVipDiscount(vipDiscount);
tSettlementConfirm.setCouponDiscount(couponDiscount);
@@ -2613,7 +2622,6 @@
tSettlementConfirm.setTotalService(dto.getTotalService());
tSettlementConfirm.setRemark(dto.getRemark());
tSettlementConfirm.setServicePartner(dto.getServicePartner());
- tSettlementConfirm.setServiceMoney(dto.getServiceMoney());
BigDecimal subtract = new BigDecimal("1").subtract(dto.getProportionPartner().multiply(new BigDecimal("0.01")));
// 总电损费用
BigDecimal divide = tSettlementConfirm.getProportionMoney().divide(subtract, 2, RoundingMode.HALF_DOWN);
@@ -2627,9 +2635,12 @@
tSettlementConfirm.setServiceRemark(dto.getServiceRemark());
tSettlementConfirm.setDistribution(dto.getDistribution());
tSettlementConfirm.setIncome(dto.getElectrovalence().add(dto.getServiceCharge()));
- tSettlementConfirm.setCost(dto.getVenue().add(dto.getClean()).add(dto.getMaintain()).add(dto.getMetering()));
- tSettlementConfirm.setProfitMoney(chargingElectronic.add(serviceCharge).subtract(tSettlementConfirm.getCost()));
+ tSettlementConfirm.setCost(dto.getVenue().add(dto.getClean()).add(dto.getMaintain()).add(dto.getSupplyElectronic()));
+ BigDecimal divide1 = tSettlementConfirm.getProportionMoney().divide(tSettlementConfirm.getProportionPartner(), 2, RoundingMode.HALF_DOWN);
+ tSettlementConfirm.setProfitMoney(tSettlementConfirm.getServiceMoney().multiply(tSettlementConfirm.getServicePartner())
+ .subtract(divide1));
tSettlementConfirm.setNewSettlement(subtract2.subtract(tSettlementConfirm.getCost()));
+
tSettlementConfirmMapper.insert(tSettlementConfirm);
}
@@ -2638,18 +2649,22 @@
@Override
public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) {
+ String startTime = null;
+ String endTime = null;
if (StringUtils.hasLength(dto.getStartTime())){
dto.setType(1);
String[] split = dto.getStartTime().split(" - ");
- dto.setStartTime(split[0]);
- dto.setEndTime(split[1]);
+ startTime = split[0];
+ endTime = split[1];
}
if (StringUtils.hasLength(dto.getEndTime())){
dto.setType(2);
- String[] split = dto.getStartTime().split(" - ");
- dto.setStartTime(split[0]);
- dto.setEndTime(split[1]);
+ String[] split = dto.getEndTime().split(" - ");
+ startTime = split[0];
+ endTime = split[1];
}
+ dto.setStartTime(startTime);
+ dto.setEndTime(endTime);
PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
for (TSettlementConfirm tSettlementConfirm : list) {
@@ -3021,11 +3036,8 @@
if(null != order.getAppUserId()){
queryWrapper.eq(TChargingOrder::getAppUserId, order.getAppUserId());
}
- if(null != order.getAppUserId()){
- queryWrapper.eq(TChargingOrder::getAppUserId, order.getAppUserId());
- }
if(null != order.getStatusList()){
- queryWrapper.in(TChargingOrder::getAppUserId, order.getStatusList());
+ queryWrapper.in(TChargingOrder::getStatus, order.getStatusList());
}
if(null != order.getEndMode()){
queryWrapper.eq(TChargingOrder::getEndMode, order.getEndMode());
--
Gitblit v1.7.1