Merge remote-tracking branch 'origin/dev_point_task' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -90,7 +90,7 @@ public interface StrConstant {
     /**
      * 单位积分,积分上限，积分说明，积分事件
      */
-    String POINT_CHANGE = "将%s由%s调整为%s";
+    String POINT_CHANGE = "将%s调整为%s";
 
     /**
      * 积分规则修改的头

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -219,20 +219,20 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		Boolean appendStatus = false;
 		// 单位积分
 		if (!e.getPoint().equals(f.getPoint())){
-			String s = String.format(StrConstant.POINT_CHANGE, "单位积分", e.getPoint(), f.getPoint());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "单位积分", f.getPoint());
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 积分上限
 		if (!e.getUpLimit().equals(f.getUpLimit())){
-			String s = String.format(StrConstant.POINT_CHANGE, "积分上限", e.getUpLimit(), f.getUpLimit());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "积分上限", f.getUpLimit());
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 积分说明
 		if (!e.getRuleDesc().equals(f.getRuleDesc())){
-			String s = String.format(StrConstant.POINT_CHANGE, "积分说明", e.getRuleDesc(), f.getRuleDesc());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "积分说明", f.getRuleDesc());
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 规则启用
@@ -243,14 +243,14 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			status = true;
 		}
 		if(!status.toString().equals(f.getEnabledFlag())){
-			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", status, f.getEnabledFlag());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag());
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		// 积分事件
 		if (!e.getRuleName().equals(f.getRuleName())){
-			String s = String.format(StrConstant.POINT_CHANGE, "积分事件", e.getRuleName(), f.getRuleName());
-			sb.append(s).append(",");
+			String s = String.format(StrConstant.POINT_CHANGE, "积分事件", f.getRuleName());
+			sb.append(s).append("，");
 			appendStatus = true;
 		}
 		if (!appendStatus){