diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java index 441bf8d353..b9fd87d5b2 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java @@ -30,6 +30,12 @@ public class List4applyFormDTO implements Serializable { */ private String type; + /** + *积分奖励point_reward;积分扣罚point_fine + */ + @NotNull(message = "奖罚编码不可为空") + private String businessCode; + private String customerId; 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 229184ac62..5bfb46e1d4 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 @@ -53,12 +53,19 @@ and CATEGORY_CODE=#{categoryCode} and APPLY_FLAG= #{applyFlag} + + + and (( type='rule' and POINT_VALUE < 0 )or TYPE='category') + + + and (( type='rule' and POINT_VALUE > 0 )or TYPE='category') and CUSTOMER_ID=#{customerId} order by UPDATED_TIME desc