From db80b2a401b96d48911a8e069fba45e216fd0652 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 17 Jun 2022 10:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/PointAdditiveRuleDao.java     | 11 +++++++++++
 .../service/impl/PointAdditiveRuleServiceImpl.java   | 10 +++++++++-
 .../main/resources/mapper/PointAdditiveRuleDao.xml   | 12 ++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java
index 7ac3325052..187a8b24ce 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java
@@ -65,4 +65,15 @@ public interface PointAdditiveRuleDao extends BaseDao<PointAdditiveRuleEntity> {
     * @return java.lang.Integer
     */
     Integer selectPointTotalByIds(SubmitRewardFormDTO dto);
+
+    /**
+    * @describe: 通过名称查询
+    * @author wangtong
+    * @date 2022/6/17 9:37
+    * @params [customerId, categoryName]
+    * @return com.epmet.entity.PointAdditiveRuleEntity
+    */
+    PointAdditiveRuleEntity selectEntityByName(@Param("customerId") String customerId,
+                                               @Param("categoryName")  String categoryName,
+                                               @Param("ruleName")  String ruleName);
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
index daffeca2fc..2c6f51d850 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java
@@ -108,6 +108,10 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
 
     @Override
     public Result addcategory(AddcategoryFormDTO dto) {
+        PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null);
+        if(isExist != null){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
+        }
         PointAdditiveRuleEntity entity = new PointAdditiveRuleEntity();
         entity.setCustomerId(dto.getCustomerId());
         entity.setType(PointAddRuleEnum.CATEGORY_TYPE.getCode());
@@ -132,6 +136,10 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
 
     @Override
     public Result addrule(AddruleFormDTO dto) {
+        PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName());
+        if(isExist != null){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在");
+        }
         PointAdditiveRuleEntity entity = new PointAdditiveRuleEntity();
         entity.setCustomerId(dto.getCustomerId());
         entity.setType(PointAddRuleEnum.RULE_TYPE.getCode());
@@ -157,7 +165,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR
 
     @Override
     public Result<List<PointAdditiveRuleDTO>> list4apply(List4applyFormDTO dto) {
-        dto.setType(PointAddRuleEnum.CATEGORY_TYPE.getCode());
+        dto.setType(PointAddRuleEnum.RULE_TYPE.getCode());
         List<PointAdditiveRuleDTO> result = baseDao.selectList4apply(dto);
         return new Result<List<PointAdditiveRuleDTO>>().ok(result);
     }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
index e07cd82e5f..d5324372a2 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml
@@ -87,6 +87,18 @@
                 </foreach>
             </if>
     </select>
+    <select id="selectEntityByName" resultType="com.epmet.entity.PointAdditiveRuleEntity">
+        select *
+        FROM `point_additive_rule`
+        where DEL_FLAG='0'
+              and CUSTOMER_ID=#{customerId}
+            <if test="categoryName != null and categoryName != ''">
+                and CATEGORY_NAME= #{categoryName}
+            </if>
+            <if test="ruleName != null and ruleName != ''">
+                and RULE_NAME= #{ruleName}
+            </if>
+    </select>
 
 
 </mapper>