From dfe63f2f05645018e85e77a03627354b764b632e Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Wed, 18 Dec 2024 17:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/RateMapper.java       |  4 ++++
 src/main/java/com/example/demo/mapper/RechargeMapper.java   |  8 ++++----
 .../java/com/example/demo/serviceImpl/RateServiceImpl.java  | 13 +++++++++++--
 src/main/java/com/example/demo/sevice/RateService.java      |  3 ++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/RateMapper.java b/src/main/java/com/example/demo/mapper/RateMapper.java
index 0341139..bf8cacc 100644
--- a/src/main/java/com/example/demo/mapper/RateMapper.java
+++ b/src/main/java/com/example/demo/mapper/RateMapper.java
@@ -74,4 +74,8 @@ public interface RateMapper {
             "select * from rate where status=1 and flag=1"
     })
     List<Rate> selectByStatus(Rate rate);
+    @Select({
+            "select * from rate where currency=#{currency} and flag=1"
+    })
+    Integer selectByCurrency(String currency);
 }
diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java
index 8741439..1131f9f 100644
--- a/src/main/java/com/example/demo/mapper/RechargeMapper.java
+++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java
@@ -33,10 +33,10 @@ public interface RechargeMapper {
     @Select({
             "<script>",
             "SELECT DISTINCT user.`name` as user_name , recharge.*,activity.activity_name,audit.`status`,audit.audit_id,audit.reson, admin.name,admin.area,audit.detail_id  FROM recharge",
-                    "INNER JOIN audit ON recharge.recharge_id = audit.recharge_id",
-                    "INNER JOIN `user` ON recharge.jwcode = `user`.jwcode",
-                    "INNER JOIN activity on recharge.activity_id = activity.activity_id",
-                    "INNER JOIN `admin` on recharge.admin_id = `admin`.admin_id",
+                    "LEFT JOIN audit ON recharge.recharge_id = audit.recharge_id",
+                    "LEFT JOIN `user` ON recharge.jwcode = `user`.jwcode",
+                    "LEFT JOIN activity on recharge.activity_id = activity.activity_id",
+                    "LEFT JOIN `admin` on recharge.admin_id = `admin`.admin_id",
             "<where>",
             "flag='1'",
             "<if test='activityId!=null'>and recharge.activity_id=#{activityId}</if>",
diff --git a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
index 508cf09..ed175ef 100644
--- a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
@@ -2,6 +2,7 @@ package com.example.demo.serviceImpl;
 
 
 import com.example.demo.domain.entity.Rate;
+import com.example.demo.domain.vo.Result;
 import com.example.demo.mapper.RateMapper;
 import com.example.demo.sevice.RateService;
 import com.github.pagehelper.PageHelper;
@@ -23,8 +24,16 @@ public class RateServiceImpl implements RateService {
 
     @CacheEvict(value = "rate",allEntries = true)
     @Override
-    public int add(Rate rate) {
-        return rateMapper.insert(rate);
+    public Result add(Rate rate) throws Exception {
+            // 检查名称是否存在
+            Integer count = rateMapper.selectByCurrency(rate.getCurrency());
+            if (count!=null && count > 0) {
+                // 如果存在，抛出异常
+                throw new Exception( "该汇率已存在");
+            }
+            else
+                return Result.success(rateMapper.insert(rate));
+
     }
 
     //自动软删除数据加更新数据
diff --git a/src/main/java/com/example/demo/sevice/RateService.java b/src/main/java/com/example/demo/sevice/RateService.java
index 06857e8..96b19f6 100644
--- a/src/main/java/com/example/demo/sevice/RateService.java
+++ b/src/main/java/com/example/demo/sevice/RateService.java
@@ -2,12 +2,13 @@ package com.example.demo.sevice;
 
 
 import com.example.demo.domain.entity.Rate;
+import com.example.demo.domain.vo.Result;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
 public interface RateService {
-    int add(Rate rate) throws Exception;
+    Result add(Rate rate) throws Exception;
     int edit(Rate rate) throws Exception;
     List<Rate> selectByStatus(Rate rate) throws Exception;
     void softDelete(Integer rateId) throws Exception;