From c0a5d6a40520cf89b9989cff58c1c64fbed47c2a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 20:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 1 -
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 10 +++++-----
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml | 4 +---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 3 ++-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 1 -
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 5 +++++
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 8c10da3..191076b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -390,7 +390,6 @@
TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData();
for (TChargingOrder chargingOrder : data.getList()) {
SettlementExportVO settlementExportVO = new SettlementExportVO();
-
BeanUtils.copyProperties(data, settlementExportVO);
List<Site> data3 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData();
if (data3!=null && (!data3.isEmpty())){
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index a89d01e..4fa0440 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -74,7 +74,8 @@
ChargingBillVO res = chargingBillService.chargingBillList1(dto);
List<ChargingBillListVO> records = res.getList().getRecords();
accountListVO.setBillCount(records.size());
- accountListVO.setTotalAmount(res.getOrderAmount());
+ accountListVO.setTotalAmount(res.getOrderAmount().subtract(res.getRefundAmount())
+ .subtract(res.getCommissionAmount()).subtract(res.getSharingAmount()));
accountListVO.setPaymentAmount(res.getPaymentAmount());
accountListVO.setRefundAmount(res.getRefundAmount());
accountListVO.setCommissionAmount(res.getCommissionAmount());
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 22f1e35..9d59216 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
@@ -248,11 +248,11 @@
}
}
if (data3!=null)tChargingOrder.setUserName(data3.getName());
- // 累加实收金额
+ // 累加实收金额 支付结算金额
if (tChargingOrder.getOrderAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
}
- // 累加订单金额
+ // 入账金额
if (tChargingOrder.getOrderAmount()!=null){
orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
}
@@ -263,7 +263,7 @@
List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
.eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list();
for (TChargingOrderRefund tChargingOrderRefund : list2) {
- refundAmount = refundAmount.add(tChargingOrderRefund.getRefundAmount());
+ refundAmount = refundAmount.add(tChargingOrderRefund.getRefundTotalAmount());
}
// 累加累计服务费
if (tChargingOrder.getServiceCharge()!=null){
@@ -298,8 +298,8 @@
.subtract(chargingBillVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillVO.getCommissionAmount())
.subtract(chargingBillVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillVO.getSharingAmount()));
chargingBillListVO.setPaymentAmount(paymentAmount == null?BigDecimal.ZERO:paymentAmount);
- chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount);
- chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:orderAmount);
+ chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount.subtract(refundAmount).subtract(commissionAmount).subtract(sharingAmount));
+ chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2, RoundingMode.HALF_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 c8a46bd..ff9c554 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
@@ -1693,7 +1693,6 @@
chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
- chargingOrderListInfoVO.setCommissionAmount(chargingOrder.getCommissionAmount());
// 查询费用明细列表
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery()
.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId())
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
index 2a71016..31e9d7b 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
@@ -152,9 +152,7 @@
<if test="null != req.code and req.code!=''">
and t3.code LIKE CONCAT('%',#{req.code},'%')
</if>
- <if test="req.type == null ">
- and t3.discount_amount > 0
- </if>
+ and t3.discount_amount > 0
<if test="null != req.userIds and req.userIds.size()>0" >
and t3.app_user_id in
<foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index 9a00b7d..f666844 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -118,7 +118,12 @@
for (ExchangeRecordVO record : data) {
TCoupon byId = tCouponService.getById(record.getCouponId());
if (byId!=null){
+ if (byId.getDiscountAmount()!=null){
record.setDiscountAmount("￥"+byId.getDiscountAmount());
+
+ }else{
+ record.setDiscountAmount("￥"+byId.getMaximumDiscountAmount());
+ }
if (Objects.equals(byId.getMeetTheConditions(), BigDecimal.ZERO)){
record.setMeetTheConditions("无门槛");
}else{
--
Gitblit v1.7.1