From 10da3043981a8b3c834cbb5b5edf5f12981232ad Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 8 May 2020 16:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2-=E5=8A=A8=E4=BD=9C=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=81=9A=E5=94=AF=E4=B8=80=E6=80=A7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dao/PointsRuleDao.java    | 11 +++++-
 .../service/impl/PointsRuleServiceImpl.java   | 34 +++++++++++++++++--
 .../main/resources/mapper/PointsRuleDao.xml   | 10 ++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java
index bd4012b6..cbd35e1f 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java
@@ -61,4 +61,13 @@ public interface PointsRuleDao extends BaseDao<PointsRuleEntity> {
      * @Date: 2020-04-29
      */
     List<PointsRuleDTO> selectListPointsRule(Map<String, Object> params);
-}
\ No newline at end of file
+
+    /**
+     * 查询积分规则表 动作编码是否存在
+     * @param behaviorCode  动作编码
+     * @return int
+     * @Author zhangyong
+     * @Date 15:48 2020-05-08
+     **/
+    int selectBehaviorCodeDoestItExist(String behaviorCode);
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java
index 669a89fa..cdafb109 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsRuleAvailableEnum;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -96,10 +97,17 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result save(PointsRuleDTO dto) {
+        // 判断积分规则编码是否重复
         Result checkRuleCode = this.checkRuleCodeIsExist(dto.getRuleCode());
         if (checkRuleCode.getCode() == ErrorCode.INTERNAL_SERVER_ERROR) {
             return checkRuleCode;
         }
+        // 判断所选动作是否重复
+        Result checkBehaviorCode = this.checkBehaviorCodeIsExist(dto.getBehaviorCode());
+        if (checkBehaviorCode.getCode() == ErrorCode.INTERNAL_SERVER_ERROR) {
+            return checkBehaviorCode;
+        }
+
         PointsRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointsRuleEntity.class);
         insert(entity);
         // 存入redis
@@ -125,7 +133,7 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result update(PointsRuleDTO dto) {
-        // 查询之前的动作编码
+        // 查询之前的积分规则编码、动作编码
         PointsRuleEntity queryEntity = baseDao.selectById(dto.getId());
         // 判断本次修改操作是否修改了积分规则编码, 如果改动了，查询新的积分规则编码是否已存在
         if (!(queryEntity.getRuleCode().equals(dto.getRuleCode()))) {
@@ -134,6 +142,14 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
                 return checkRuleCode;
             }
         }
+        // 判断本次修改操作是否修改了动作编码, 如果改动了，查询新的动作编码是否在表中已存在
+        if (!(queryEntity.getBehaviorCode().equals(dto.getBehaviorCode()))) {
+            Result checkBehaviorCode = this.checkBehaviorCodeIsExist(dto.getBehaviorCode());
+            if (checkBehaviorCode.getCode() == ErrorCode.INTERNAL_SERVER_ERROR) {
+                return checkBehaviorCode;
+            }
+        }
+
         PointsRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointsRuleEntity.class);
         updateById(entity);
         // 删除redis中的存储信息
@@ -209,4 +225,18 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
         return new Result();
     }
 
-}
\ No newline at end of file
+    /**
+     * @Description: 查询积动作是否存在
+     * @Param: [behaviorCode]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: zy
+     * @Date: 2020-05-08
+     */
+    private Result checkBehaviorCodeIsExist(String behaviorCode) {
+        int behaviorCodeNum = baseDao.selectBehaviorCodeDoestItExist(behaviorCode);
+        if (behaviorCodeNum > NumConstant.ZERO) {
+            return new Result().error("动作已存在，请选择其他动作");
+        }
+        return new Result();
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsRuleDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsRuleDao.xml
index aa4bc838..e365da47 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsRuleDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsRuleDao.xml
@@ -63,4 +63,14 @@
         ORDER BY
         CREATED_TIME DESC
     </select>
+
+    <select id="selectBehaviorCodeDoestItExist" resultType="int">
+        SELECT
+            count(1)
+        FROM
+            epdc_points_rule r
+        WHERE
+            DEL_FLAG = 0
+        AND BEHAVIOR_CODE = #{behaviorCode}
+    </select>
 </mapper>