|
@ -182,8 +182,11 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul |
|
|
baseDao.updateByCustomerId(entityNew); |
|
|
baseDao.updateByCustomerId(entityNew); |
|
|
insertOperateRecord(tokenDTO, entityNew, entityDB, CommonOperateTypeEnum.EDIT.getCode()); |
|
|
insertOperateRecord(tokenDTO, entityNew, entityDB, CommonOperateTypeEnum.EDIT.getCode()); |
|
|
// 系统日志记录
|
|
|
// 系统日志记录
|
|
|
List<String> messages = disposeLog(formDTO, entityDB); |
|
|
String messages = disposeLog(formDTO, entityDB); |
|
|
// TODO add
|
|
|
if (StringUtils.isNotBlank(messages)){ |
|
|
|
|
|
// TODO add
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -193,33 +196,34 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul |
|
|
* @author zxc |
|
|
* @author zxc |
|
|
* @date 2021/6/18 3:14 下午 |
|
|
* @date 2021/6/18 3:14 下午 |
|
|
*/ |
|
|
*/ |
|
|
private List<String> disposeLog(PointRuleFormDTO f,PointRuleEntity e){ |
|
|
private String disposeLog(PointRuleFormDTO f,PointRuleEntity e){ |
|
|
List<String> result = new ArrayList<>(); |
|
|
StringBuffer sb = new StringBuffer(); |
|
|
// 单位积分
|
|
|
// 单位积分
|
|
|
if (!e.getPoint().equals(f.getPoint())){ |
|
|
if (!e.getPoint().equals(f.getPoint())){ |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getPoint(), f.getPoint()); |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getPoint(), f.getPoint()); |
|
|
result.add(s); |
|
|
sb.append(s).append(","); |
|
|
} |
|
|
} |
|
|
// 积分上限
|
|
|
// 积分上限
|
|
|
if (!e.getUpLimit().equals(f.getUpLimit())){ |
|
|
if (!e.getUpLimit().equals(f.getUpLimit())){ |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getUpLimit(), f.getUpLimit()); |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getUpLimit(), f.getUpLimit()); |
|
|
result.add(s); |
|
|
sb.append(s).append(","); |
|
|
} |
|
|
} |
|
|
// 积分说明
|
|
|
// 积分说明
|
|
|
if (!e.getRuleDesc().equals(f.getRuleDesc())){ |
|
|
if (!e.getRuleDesc().equals(f.getRuleDesc())){ |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleDesc(), f.getRuleDesc()); |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleDesc(), f.getRuleDesc()); |
|
|
result.add(s); |
|
|
sb.append(s).append(","); |
|
|
} |
|
|
} |
|
|
// 规则启用
|
|
|
// 规则启用
|
|
|
if(!e.getEnabledFlag().equals(f.getEnabledFlag())){ |
|
|
if(!e.getEnabledFlag().equals(f.getEnabledFlag())){ |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getEnabledFlag(), f.getEnabledFlag()); |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getEnabledFlag(), f.getEnabledFlag()); |
|
|
|
|
|
sb.append(s).append(","); |
|
|
} |
|
|
} |
|
|
// 积分事件
|
|
|
// 积分事件
|
|
|
if (!e.getRuleName().equals(f.getRuleName())){ |
|
|
if (!e.getRuleName().equals(f.getRuleName())){ |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleName(), f.getRuleName()); |
|
|
String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleName(), f.getRuleName()); |
|
|
result.add(s); |
|
|
sb.append(s).append(","); |
|
|
} |
|
|
} |
|
|
return result; |
|
|
return sb.substring(NumConstant.ZERO,sb.length() - NumConstant.ONE); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void validateEnableFlag(PointRuleFormDTO formDTO) { |
|
|
private void validateEnableFlag(PointRuleFormDTO formDTO) { |
|
|