From c9a258210e2c65e3915d21ba54d01ca35adb9a04 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 25 Nov 2024 14:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/pay/tm/TmPayService.java   | 3 +--
 .../src/main/java/com/ruoyi/system/domain/EtArticle.java      | 4 ++++
 .../com/ruoyi/system/service/impl/EtOrderServiceImpl.java     | 3 +++
 .../src/main/resources/mapper/system/AsArticleMapper.xml      | 2 +-
 .../src/main/resources/mapper/system/EtCapitalFlowMapper.xml  | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java b/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java
index 07a61f6..02627b2 100644
--- a/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java
+++ b/electripper-common/src/main/java/com/ruoyi/common/pay/tm/TmPayService.java
@@ -60,8 +60,7 @@ public class TmPayService {
             JSONObject jsonResponse = JSON.parseObject(response);
             if (jsonResponse.getInteger("errCode") == 0 && "退款成功".equals(jsonResponse.getString("errMsg"))) {
                 JSONObject tradeInfo = jsonResponse.getJSONObject("refundInfo");
-                RefundInfo refundInfo = tradeInfo.toJavaObject(RefundInfo.class);
-                return refundInfo;
+                return tradeInfo.toJavaObject(RefundInfo.class);
             } else {
                 throw new ServiceException("退款失败: " + jsonResponse.getString("errMsg"));
             }
diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtArticle.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtArticle.java
index dcea6d0..526a681 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtArticle.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtArticle.java
@@ -31,6 +31,10 @@ public class EtArticle extends BaseEntity
     @Excel(name = "运营区id")
     private Long areaId;
 
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private String deptId;
+
     /** 运营区 */
     @Excel(name = "运营区")
     private String areaName;
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
index 42413ac..b499ce0 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
@@ -1994,6 +1994,9 @@ public class EtOrderServiceImpl implements IEtOrderService
         if(ObjectUtil.isNotNull(ridingFee) && !ridingFee.equals(BigDecimal.ZERO)){
             refundAmount = refundAmount.add(ridingFee);
         }
+        if(refundAmount.compareTo(BigDecimal.ZERO) == 0){
+            throw new ServiceException("退款失败，退款金额不能为0");
+        }
         BigDecimal refundPercentage = refundAmount.divide(etOrder1.getPayFee(), 2, RoundingMode.HALF_UP);// 0.33
         // 合伙人退款
         BigDecimal totalPartnerDividend = partnerRefund(etOrder, etOrder1, refundPercentage);
diff --git a/electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml b/electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml
index 95572fc..d35aefd 100644
--- a/electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml
@@ -48,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.tag,
             a.is_hot,
             a.introduction,
---             a.content,
             a.author,
             a.create_by,
             a.create_time,
@@ -66,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="title != null  and title != ''"> and a.title like concat('%', #{title}, '%')</if>
         <if test="isHot != null  and isHot != ''"> and a.is_hot = #{isHot}</if>
         <if test="areaId != null  and areaId != ''"> and a.area_id = #{areaId}</if>
+        <if test="deptId != null  and deptId != ''"> and d.dept_id = #{deptId}</if>
         <if test="tag != null  and tag != ''"> and a.tag = #{tag}</if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}) or ac.parent_id = 111 or ac.classify_id = 111
diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
index 2c06ee9..afb8898 100644
--- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
@@ -80,10 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="modelId != null "> and cf.model_id = #{modelId}</if>
         <if test="payType != null  and payType != ''"> and cf.pay_type = #{payType}</if>
         <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-            AND cf.create_time &gt;= #{params.beginTime}
+            AND DATE(cf.create_time) &gt;= #{params.beginTime}
         </if>
         <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-            AND cf.create_time &lt;= #{params.endTime}
+            AND DATE(cf.create_time) &lt;= #{params.endTime}
         </if>
         <if test="typeList != null">
             AND cf.bus_type IN