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 { * @Date: 2020-04-29 */ List selectListPointsRule(Map 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 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 @@ - @@ -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 - -