|
|
@@ -104,12 +104,15 @@ public class Mall2PointsRulesServiceImpl implements Mall2PointsRulesService {
|
|
|
if (pointsBeginTime.getTime() > pointsEndTime.getTime()){
|
|
|
return R.error("设置的开始时间和结束时间冲突");
|
|
|
}
|
|
|
- //校验 积分类型和是否启用 查询出不让增加
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
map.put("pointsType",mall2PointsRules.getPointsType());
|
|
|
map.put("isValid", Dict.isValid.item_0.getItem());
|
|
|
List<Mall2PointsRulesEntity> mall2PointsRulesEntities = mall2PointsRulesDao.queryList(map);
|
|
|
for (Mall2PointsRulesEntity mall2PointsRulesEntity : mall2PointsRulesEntities) {
|
|
|
+ if (mall2PointsRules.getMprId().equals(mall2PointsRulesEntity.getMprId())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
if (Dict.isValid.item_0.getItem().equals(mall2PointsRules.getIsValid())){
|
|
|
// 之前结束时间要小于新增得开始时间
|
|
|
Boolean aBoolean = DateUtils.IsInterSection(mall2PointsRules.getPointsBeginTime(),mall2PointsRules.getPointsEndTime(),mall2PointsRulesEntity.getPointsBeginTime(),mall2PointsRulesEntity.getPointsEndTime());
|
