修复bug

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"));
             }

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;

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);

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

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