From 9e43c32ad97ad39a1b9aa2852d788ca1c566e982 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:10 +0800
Subject: [PATCH] 对账
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 5 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 79 +++++++++++++++++----------------------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 15 +++----
3 files changed, 43 insertions(+), 56 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
index 8f1cde2..c92b0db 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -189,16 +189,13 @@
String from = "13281306557@163.com";
// 指定发送邮件的主机为
String host = "smtp.163.com";
- // 获取系统属性
Properties properties = new Properties();
- // 设置邮件服务器
- properties.setProperty("mail.smtp.host", host);
- properties.setProperty("mail.smtp.port", "465"); // 使用SSL端口
- // 邮件发送协议
- properties.setProperty("mail.transport.protocol", "smtp");
- //是否启用调试模式（启用调试模式可打印客户端与服务器交互过程时一问一答的响应消息）
- properties.setProperty("mail.debug","true");
- properties.setProperty("mail.smtp.auth", "true");
+ properties.put("mail.smtp.host", "smtp.163.com");
+ properties.put("mail.smtp.socketFactory.port", "465");
+ properties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ properties.put("mail.smtp.auth", "true");
+ properties.put("mail.smtp.port", "465");
+ properties.put("mail.smtp.ssl.enable", "true"); // 明确开启SSL
// 获取默认session对象
Session session = Session.getDefaultInstance(properties,new Authenticator(){
@Override
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 0b4ffa7..76f11e3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -88,13 +88,7 @@
@Override
public ChargingBillVO chargingBillList1(ChargingListQuery dto) {
- if (dto.getState()!=null){
- if (dto.getState()==1){
- dto.setState(2);
- }else {
- dto.setState(1);
- }
- }
+
ChargingBillVO chargingBillVO = new ChargingBillVO();
List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
String startTime1 = null;
@@ -117,36 +111,35 @@
List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list();
Integer roleType = sysUser.getRoleType();
List<Integer> siteIds = new ArrayList<>();
- //如果没传siteId,获取当前登陆人所有的siteIds
- if (dto.getSiteId()==null){
- if (userId != null){
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ if (dto.getSiteId()==null){
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
}
- }else {
- siteIds.add(dto.getSiteId());
}
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }else{
- if (roleType == 2){
- List<Integer> integers = new ArrayList<>();
- for (Integer siteId : siteIds) {
- // 校验有没有这个站点的权限
- List<Boolean> t1= partnerClient.getAccountMenu(sysUser.getObjectId(),siteId).getData();
+ }else {
+ siteIds.add(dto.getSiteId());
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }else{
+ if (roleType == 2){
+ List<Integer> integers = new ArrayList<>();
+ for (Integer siteId : siteIds) {
+ // 校验有没有这个站点的权限
+ List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData();
- Boolean b = t1.get(1);
- if (b){
- integers.add(siteId);
- }
+ Boolean b = t1.get(1);
+ if (b){
+ integers.add(siteId);
}
- siteIds = integers;
}
+ siteIds = integers;
}
- if (siteIds.isEmpty())siteIds.add(-1);
- dto.setSiteIds(siteIds);
+ }
+ dto.setSiteIds(siteIds);
PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
@@ -162,7 +155,6 @@
BigDecimal sharingAmountTotal = new BigDecimal("0");
BigDecimal chargingCapacityTotal = new BigDecimal("0");
BigDecimal discountTotal = new BigDecimal("0");
- int orderCount = 0;
for (ChargingBillListVO chargingBillListVO : list) {
@@ -223,7 +215,6 @@
BigDecimal sharingAmount = new BigDecimal("0");
BigDecimal chargingCapacity = new BigDecimal("0");
BigDecimal refundAmount = new BigDecimal("0");
- orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
@@ -330,12 +321,12 @@
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付结算金额
- if (tChargingOrder.getChargeAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount());
+ if (tChargingOrder.getRechargeAmount()!=null){
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}
// 总金额
if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
+ orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -378,8 +369,8 @@
chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
}
- chargingBillListVO.setPaymentAmount(rechargeAmount);
- chargingBillListVO.setOrderAmount(paymentAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
+ chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount));
+ chargingBillListVO.setOrderAmount(paymentAmount);
chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
@@ -435,17 +426,16 @@
e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
&& e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
tChargingOrders1.addAll(tChargingOrders);
- orderCount+=tChargingOrders.size();
chargingBillVO.setCategory("");
chargingBillVO.setExportList(tChargingOrders);
for (TChargingOrder tChargingOrder : tChargingOrders) {
if (tChargingOrder.getOrderAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getRechargeAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加订单金额
if (tChargingOrder.getOrderAmount()!=null){
- orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
+ orderAmountTotal = orderAmountTotal.add(tChargingOrder.getPaymentAmount());
}
// 累加累计电费
if (tChargingOrder.getElectrovalence()!=null){
@@ -489,11 +479,10 @@
}
chargingBillVO.setOrderCount(i);
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(paymentAmountTotal);
- chargingBillVO.setOrderAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal));
+ chargingBillVO.setPaymentAmount(paymentAmountTotal.subtract(sharingAmountTotal));
+ chargingBillVO.setOrderAmount(orderAmountTotal);
chargingBillVO.setElectrovalence(electrovalenceTotal);
chargingBillVO.setServiceCharge(serviceChargeTotal);
- chargingBillVO.setOrderCount(orderCount);
chargingBillVO.setCommissionAmount(commissionAmountTotal);
chargingBillVO.setSharingAmount(sharingAmountTotal);
chargingBillVO.setDiscount(discountTotal);
@@ -801,7 +790,7 @@
chargingBillVO.setChargingTime(timeString);
chargingBillListVO.setOrderAmount(paymentAmount);
- chargingBillListVO.setPaymentAmount(paymentAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
+ chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setElectrovalence(electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,BigDecimal.ROUND_DOWN));
chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
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 228f069..f8ee479 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
@@ -1378,7 +1378,9 @@
for (ChargingOrderVO chargingOrderVO : list1) {
paymentMoney= paymentMoney.add(chargingOrderVO.getPaymentAmount()!=null?chargingOrderVO.getPaymentAmount():new BigDecimal("0"));
- commissionMoney = commissionMoney.add(chargingOrderVO.getRechargeAmount()!=null?chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ if (chargingOrderVO.getRechargeAmount()!=null){
+ commissionMoney = commissionMoney.add(chargingOrderVO.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
+ }
if (chargingOrderVO.getChargingCapacity()!=null){
total = total.add(chargingOrderVO.getElectricity()!=null?chargingOrderVO.getElectricity():new BigDecimal("0"));
}
@@ -1399,7 +1401,6 @@
}
tCharingOrderVO.setTotal(total);
tCharingOrderVO.setTime(time);
- // todo 临时只累加
// tCharingOrderVO.setIncome(paymentMoney.subtract(commissionMoney));
tCharingOrderVO.setIncome(paymentMoney);
tCharingOrderVO.setElectronicMoney(electronicMoney);
--
Gitblit v1.7.1