From 08c214ea8d16db84d28d44ac1f5e92f1fa8f782f Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 11 May 2020 09:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=A1=A8=20=20=20=E5=8A=A8=E4=BD=9C=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?:behaviorCode=20=20=E5=AD=97=E6=AE=B5=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/PointsRuleDTO.java    |  4 +--
 .../elink/esua/epdc/dao/PointsRuleDao.java    |  9 -------
 .../esua/epdc/entity/PointsRuleEntity.java    |  4 +--
 .../service/impl/PointsRuleServiceImpl.java   | 27 -------------------
 .../main/resources/mapper/PointsRuleDao.xml   | 12 ---------
 5 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java
index 9ef8e530..2df3e908 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsRuleDTO.java
@@ -46,7 +46,7 @@ public class PointsRuleDTO implements Serializable {
     /**
      * 动作编码
      */
-	private String behaviorCode;
+	//private String behaviorCode;
 
     /**
      * 积分规则描述
@@ -127,4 +127,4 @@ public class PointsRuleDTO implements Serializable {
      * 虚字段 - 序号
      */
     private Integer orderNumber;
-}
\ No newline at end of file
+}
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 167f8b1e..d5a8680d 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
@@ -59,13 +59,4 @@ public interface PointsRuleDao extends BaseDao<PointsRuleEntity> {
      * @Date: 2020-04-29
      */
     List<PointsRuleDTO> selectListPointsRule(Map<String, Object> params);
-
-    /**
-     * 查询积分规则表 动作编码是否存在
-     * @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/entity/PointsRuleEntity.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsRuleEntity.java
index df8f510c..bd102ab6 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsRuleEntity.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsRuleEntity.java
@@ -46,7 +46,7 @@ public class PointsRuleEntity extends BaseEpdcEntity {
     /**
      * 动作编码
      */
-	private String behaviorCode;
+	//private String behaviorCode;
 
     /**
      * 积分规则描述
@@ -92,4 +92,4 @@ public class PointsRuleEntity extends BaseEpdcEntity {
 	 * 动作上限次数0-不限 1-一次 ....
 	 */
 	private String limitNum;
-}
\ No newline at end of file
+}
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 d2e3594a..76ef1472 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
@@ -97,11 +97,6 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
         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);
@@ -137,13 +132,6 @@ 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);
@@ -217,19 +205,4 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
         }
         return new Result();
     }
-
-    /**
-     * @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 f5045109..99b5f03d 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
@@ -6,7 +6,6 @@
     <resultMap type="com.elink.esua.epdc.entity.PointsRuleEntity" id="pointsRuleMap">
         <result property="id" column="ID"/>
         <result property="ruleCode" column="RULE_CODE"/>
-        <result property="behaviorCode" column="BEHAVIOR_CODE"/>
         <result property="ruleDesc" column="RULE_DESC"/>
         <result property="operationType" column="OPERATION_TYPE"/>
         <result property="points" column="POINTS"/>
@@ -41,7 +40,6 @@
         r.ID id,
         r.RULE_CODE ruleCode,
         r.RULE_DESC ruleDesc,
-        r.BEHAVIOR_CODE behaviorCode,
         r.OPERATION_TYPE operationType,
         r.POINTS points,
         r.LIMIT_TYPE limitType,
@@ -68,14 +66,4 @@
         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>