From 2188a27e0b6aa532406deb3eb66d6d1b5cfe00b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Sat, 28 Sep 2024 18:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/ss/device/domain/Device.java | 5 +++++
 .../main/java/com/ruoyi/ss/device/domain/DeviceBO.java   | 2 ++
 .../java/com/ruoyi/ss/device/domain/DeviceQuery.java     | 3 +++
 .../java/com/ruoyi/ss/device/domain/vo/DeviceVO.java     | 3 +++
 .../java/com/ruoyi/ss/device/mapper/DeviceMapper.xml     | 9 ++++++++-
 .../service/impl/TransactionBillServiceImpl.java         | 2 +-
 .../web/controller/app/AppTransactionBillController.java | 2 +-
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
index 770b503a..519cbe35 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
@@ -225,4 +225,9 @@ public class Device extends BaseEntity
     @Excel(name = "服务模式：1-直营模式，2-代理模式")
     @ApiModelProperty("服务模式")
     private String serviceMode;
+
+    @Excel(name = "月费", readConverterExp = "元=")
+    @ApiModelProperty("月费")
+    @Min(value = 0, message = "月费不允许小于0")
+    private BigDecimal monthFee;
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
index 096677a9..5abecbfa 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
@@ -40,6 +40,7 @@ public class DeviceBO extends Device {
         bo.setServiceMode(getServiceMode());
         bo.setAgentServiceRate(getAgentServiceRate());
         bo.setAgentId(getAgentId());
+        bo.setMonthFee(getMonthFee());
         return bo;
     }
 
@@ -68,6 +69,7 @@ public class DeviceBO extends Device {
         bo.setServiceMode(getServiceMode());
         bo.setAgentServiceRate(getAgentServiceRate());
         bo.setAgentId(getAgentId());
+        bo.setMonthFee(getMonthFee());
         return bo;
     }
 
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java
index 1919c94e..b01112ed 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java
@@ -79,4 +79,7 @@ public class DeviceQuery extends Device {
 
     @ApiModelProperty("模糊查询任意MAC")
     private String likeAnyMac;
+
+    @ApiModelProperty("代理名称")
+    private String agentName;
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
index a2bd0c91..d1eff81c 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
@@ -81,6 +81,9 @@ public class DeviceVO extends Device implements IotDevice {
     @ApiModelProperty("最终生效的服务费率")
     private BigDecimal realServiceRate;
 
+    @ApiModelProperty("代理名称")
+    private String agentName;
+
     @Override
     public String iotMac1() {
         return getMac();
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
index 69334bf8..6a5bf585 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deviceNo != null"> and sd.device_no like concat('%', #{deviceNo}, '%')</if>
         <if test="lockUserId != null"> and sd.lock_user_id = #{lockUserId}</if>
         <if test="agentId != null "> and agent_id = #{agentId}</if>
+        <if test="agentName != null  and agentName != ''"> and sua.user_name like concat('%', #{agentName}, '%')</if>
         <if test="serviceMode != null  and serviceMode != ''"> and service_mode = #{serviceMode}</if>
         <if test="isArrears != null">
             <if test="isArrears">
@@ -145,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sd.agent_service_rate,
             sd.agent_id,
             sd.service_mode,
+            sd.month_fee,
             sm.model_name as model,
             sm.picture as picture,
             sm.tags as  model_tags,
@@ -154,11 +156,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ss.contact_mobile as store_contact_mobile,
             su.phonenumber as user_mobile,
             su.user_name as user_name,
-            su.service_rate as user_service_rate
+            su.service_rate as user_service_rate,
+            sua.user_name as agent_name
         from sm_device sd
             left join sm_model sm on sm.model_id = sd.model_id
             left join sm_store ss on ss.store_id = sd.store_id
             left join sm_user su on su.user_id = sd.user_id
+            left join sm_user sua on sua.user_id = sd.agent_id
     </sql>
 
     <select id="selectSmDeviceList" parameterType="DeviceQuery" resultMap="SmDeviceResult">
@@ -322,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agentServiceRate != null">agent_service_rate,</if>
             <if test="agentId != null">agent_id,</if>
             <if test="serviceMode != null">service_mode,</if>
+            <if test="monthFee != null">month_fee,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storeId != null">#{storeId},</if>
@@ -369,6 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agentServiceRate != null">#{agentServiceRate},</if>
             <if test="agentId != null">#{agentId},</if>
             <if test="serviceMode != null">#{serviceMode},</if>
+            <if test="monthFee != null">#{monthFee},</if>
          </trim>
     </insert>
 
@@ -437,6 +443,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agentServiceRate != null">agent_service_rate = #{agentServiceRate},</if>
             <if test="agentId != null">agent_id = #{agentId},</if>
             <if test="serviceMode != null">service_mode = #{serviceMode},</if>
+            <if test="monthFee != null">month_fee = #{monthFee},</if>
         </trim>
         where device_id = #{deviceId}
     </update>
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
index b0064758..01e65ce0 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
@@ -492,7 +492,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
                 LocalDateTime limitWithdrawTime = user.getLimitWithdrawTime();
                 if (limitWithdrawTime == null) {
                     throw new ServiceException("您被永久限制提现：" +  user.getLimitWithdrawReason());
-                } else {
+                } else if (limitWithdrawTime.isAfter(LocalDateTime.now())){
                     throw new ServiceException("您被限制提现至" + DateUtils.format(limitWithdrawTime, DateUtils.YYYY_MM_DD_HH_MM_SS) + ":" + user.getLimitWithdrawReason() );
                 }
             }
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
index 3db8505a..94fd39a8 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
@@ -254,7 +254,7 @@ public class AppTransactionBillController extends BaseController
             LocalDateTime limitRefundTime = user.getLimitRefundTime();
             if (limitRefundTime == null) {
                 throw new ServiceException("您被永久限制退款：" +  user.getLimitRefundReason());
-            } else {
+            } else if (limitRefundTime.isAfter(LocalDateTime.now())){
                 throw new ServiceException("您被限制退款至" + DateUtils.format(limitRefundTime, DateUtils.YYYY_MM_DD_HH_MM_SS) + ":" + user.getLimitRefundReason() );
             }
         }