接口补充字段

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;

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml

@@ -53,12 +53,19 @@
 			and CATEGORY_CODE=#{categoryCode}
             <if test="applyFlag != null and applyFlag != ''">
                 and APPLY_FLAG= #{applyFlag}
+            </if>
+            <if test="businessCode != null and businessCode != '' and businessCode == 'point_fine'.toString()">
+                and (( type='rule' and POINT_VALUE &lt; 0 )or TYPE='category')
+            </if>
+            <if test="businessCode != null and businessCode != '' and businessCode == 'point_reward'.toString()">
+                and (( type='rule' and POINT_VALUE &gt; 0 )or TYPE='category')
             </if>
 			and CUSTOMER_ID=#{customerId}
         order by UPDATED_TIME desc
     </select>
     <select id="selectList4tree" resultType="com.epmet.dto.PointAdditiveRuleDTO">
         select id,
+               pid,
 			 type,
 			 CATEGORY_NAME,
 			 RULE_NAME,