记得上下班打卡 | git大法好,push需谨慎

Commit d5984c49 authored by jiangxiulong's avatar jiangxiulong

style

parent 0d30017f
...@@ -37,32 +37,34 @@ public class KylinRecommendActiveController extends BaseController { ...@@ -37,32 +37,34 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation(value = "增加活动") @ApiOperation(value = "增加活动")
@ResponseBody @ResponseBody
public AjaxResult addKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) { public AjaxResult addKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
KylinRecommendActive kylinRecommendActive=new KylinRecommendActive(); KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive); BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if(kylinRecommendActiveService.validateTime(kylinRecommendActive)==0){ if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
List<KylinRecommendActiveRelation> list=new ArrayList<KylinRecommendActiveRelation>(); List<KylinRecommendActiveRelation> list = new ArrayList<KylinRecommendActiveRelation>();
if(kylinRecommendActiveParam.getList()!=null){ if (kylinRecommendActiveParam.getList() != null) {
kylinRecommendActiveParam.getList().forEach(r->{ kylinRecommendActiveParam.getList().forEach(r -> {
KylinRecommendActiveRelation kylinRecommendActiveRelation=new KylinRecommendActiveRelation(); KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
BeanUtils.copyProperties(r, kylinRecommendActiveRelation); BeanUtils.copyProperties(r, kylinRecommendActiveRelation);
list.add(kylinRecommendActiveRelation); list.add(kylinRecommendActiveRelation);
}); });
} }
kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive,list); kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive, list);
return AjaxResult.success("操作成功", ""); return AjaxResult.success("操作成功", "");
}else{ } else {
return AjaxResult.error("该时间段已经重复,请重新选择"); return AjaxResult.error("该时间段已经重复,请重新选择");
} }
} }
@PostMapping("addKylinRecommendActiveRelation") @PostMapping("addKylinRecommendActiveRelation")
@ApiOperation(value = "增加活动推荐") @ApiOperation(value = "增加活动推荐")
@ResponseBody @ResponseBody
public AjaxResult addKylinRecommendActiveRelation(@RequestBody KylinRecommendActiveRelationParam kylinRecommendActiveParam) { public AjaxResult addKylinRecommendActiveRelation(@RequestBody KylinRecommendActiveRelationParam kylinRecommendActiveParam) {
KylinRecommendActiveRelation kylinRecommendActiveRelation=new KylinRecommendActiveRelation(); KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
BeanUtils.copyProperties(kylinRecommendActiveParam , kylinRecommendActiveRelation); BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActiveRelation);
kylinRecommendActiveRelationService.addKylinRecommendActiveRelation(kylinRecommendActiveRelation); kylinRecommendActiveRelationService.addKylinRecommendActiveRelation(kylinRecommendActiveRelation);
return AjaxResult.success("操作成功", ""); return AjaxResult.success("操作成功", "");
} }
@PostMapping("delKylinRecommendActiveRelation") @PostMapping("delKylinRecommendActiveRelation")
@ApiOperation(value = "删除活动推荐(传入互动推荐里面的mid)") @ApiOperation(value = "删除活动推荐(传入互动推荐里面的mid)")
@ResponseBody @ResponseBody
...@@ -76,23 +78,25 @@ public class KylinRecommendActiveController extends BaseController { ...@@ -76,23 +78,25 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation(value = "修改活动") @ApiOperation(value = "修改活动")
@ResponseBody @ResponseBody
public AjaxResult updateKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) { public AjaxResult updateKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
KylinRecommendActive kylinRecommendActive=new KylinRecommendActive(); KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive); BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if(kylinRecommendActiveService.validateTime(kylinRecommendActive)==0){ if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
kylinRecommendActiveService.updateKylinRecommendActive(kylinRecommendActive); kylinRecommendActiveService.updateKylinRecommendActive(kylinRecommendActive);
return AjaxResult.success("操作成功", ""); return AjaxResult.success("操作成功", "");
}else{ } else {
return AjaxResult.error("该时间段已经重复,请重新选择"); return AjaxResult.error("该时间段已经重复,请重新选择");
} }
} }
@PostMapping("pageActive") @PostMapping("pageActive")
@ApiOperation(value = "分页活动") @ApiOperation(value = "分页活动")
@ResponseBody @ResponseBody
public TableDataInfo pageActive(@RequestParam(name = "pageSize", required = true) int pageSize, @RequestParam(name = "pageNum", required = true)int pageNum) { public TableDataInfo pageActive(@RequestParam(name = "pageSize", required = true) int pageSize, @RequestParam(name = "pageNum", required = true) int pageNum) {
//return AjaxResult.success(kylinAcitveService.pageKylinAcitve(pageSize,pageNum)); //return AjaxResult.success(kylinAcitveService.pageKylinAcitve(pageSize,pageNum));
return getDataTable( kylinRecommendActiveService.pageKylinAcitve(pageSize,pageNum)); return getDataTable(kylinRecommendActiveService.pageKylinAcitve(pageSize, pageNum));
} }
@PostMapping("getActiveById") @PostMapping("getActiveById")
@ApiOperation(value = "通过id获得活动") @ApiOperation(value = "通过id获得活动")
@ResponseBody @ResponseBody
......
...@@ -57,7 +57,7 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA ...@@ -57,7 +57,7 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
kylinRecommendActive.setDelTag(0); kylinRecommendActive.setDelTag(0);
kylinRecommendActiveMapper.insert(kylinRecommendActive); kylinRecommendActiveMapper.insert(kylinRecommendActive);
//保存推荐活动关系 //保存推荐活动关系
kylinRecommendActiveRelations.forEach(r->{ kylinRecommendActiveRelations.forEach(r -> {
r.setCreatedAt(LocalDateTime.now()); r.setCreatedAt(LocalDateTime.now());
r.setUpdatedAt(LocalDateTime.now()); r.setUpdatedAt(LocalDateTime.now());
r.setDelTag(0); r.setDelTag(0);
...@@ -82,29 +82,29 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA ...@@ -82,29 +82,29 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
public List<KylinRecommendActive> pageKylinAcitve(int pageSize, int pageNumber) { public List<KylinRecommendActive> pageKylinAcitve(int pageSize, int pageNumber) {
PageHelper.startPage(pageNumber, pageSize); PageHelper.startPage(pageNumber, pageSize);
LambdaQueryWrapper<KylinRecommendActive> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActive.class); LambdaQueryWrapper<KylinRecommendActive> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActive.class);
queryWrapper.eq(KylinRecommendActive::getDelTag,0); queryWrapper.eq(KylinRecommendActive::getDelTag, 0);
List<KylinRecommendActive> list=kylinRecommendActiveMapper.selectList(queryWrapper); List<KylinRecommendActive> list = kylinRecommendActiveMapper.selectList(queryWrapper);
list.forEach(r->{ list.forEach(r -> {
//1NFT2组合购3演出4商品 //1NFT2组合购3演出4商品
if(r.getActiveType()==1||r.getActiveType()==4){ if (r.getActiveType() == 1 || r.getActiveType() == 4) {
LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class); LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
queryWrapperg.eq(GoblinGoods::getSpuId,r.getActiveBindId()); queryWrapperg.eq(GoblinGoods::getSpuId, r.getActiveBindId());
GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg); GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
if(null!=goblinGoods){ if (null != goblinGoods) {
r.setName(goblinGoods.getName()); r.setName(goblinGoods.getName());
} }
}else if(r.getActiveType()==2){ } else if (r.getActiveType() == 2) {
LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class); LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
queryWrapperm.eq(GoblinMix::getMixId,r.getActiveBindId()); queryWrapperm.eq(GoblinMix::getMixId, r.getActiveBindId());
GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm); GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm);
if(null!=goblinMix){ if (null != goblinMix) {
r.setName(goblinMix.getName()); r.setName(goblinMix.getName());
} }
}else if(r.getActiveType()==3){ } else if (r.getActiveType() == 3) {
LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class); LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class);
queryWrapperp.eq(KylinPerformances::getPerformancesId,r.getActiveBindId()); queryWrapperp.eq(KylinPerformances::getPerformancesId, r.getActiveBindId());
KylinPerformances kylinPerformances= performancesMapper.selectOne(queryWrapperp); KylinPerformances kylinPerformances = performancesMapper.selectOne(queryWrapperp);
if(null!=kylinPerformances){ if (null != kylinPerformances) {
r.setName(kylinPerformances.getTitle()); r.setName(kylinPerformances.getTitle());
} }
} }
...@@ -115,55 +115,55 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA ...@@ -115,55 +115,55 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
@Override @Override
public KylinRecommendActive getKylinRecommendActiveById(int mid) { public KylinRecommendActive getKylinRecommendActiveById(int mid) {
//获得推荐活动 //获得推荐活动
KylinRecommendActive kylinRecommendActive=kylinRecommendActiveMapper.selectById(mid); KylinRecommendActive kylinRecommendActive = kylinRecommendActiveMapper.selectById(mid);
if(kylinRecommendActive.getActiveType()==1||kylinRecommendActive.getActiveType()==4){ if (kylinRecommendActive.getActiveType() == 1 || kylinRecommendActive.getActiveType() == 4) {
LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class); LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
queryWrapperg.eq(GoblinGoods::getSpuId,kylinRecommendActive.getActiveBindId()); queryWrapperg.eq(GoblinGoods::getSpuId, kylinRecommendActive.getActiveBindId());
GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg); GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
if(null!=goblinGoods){ if (null != goblinGoods) {
kylinRecommendActive.setName(goblinGoods.getName()); kylinRecommendActive.setName(goblinGoods.getName());
} }
}else if(kylinRecommendActive.getActiveType()==2){ } else if (kylinRecommendActive.getActiveType() == 2) {
LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class); LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
queryWrapperm.eq(GoblinMix::getMixId,kylinRecommendActive.getActiveBindId()); queryWrapperm.eq(GoblinMix::getMixId, kylinRecommendActive.getActiveBindId());
GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm); GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm);
if(null!=goblinMix){ if (null != goblinMix) {
kylinRecommendActive.setName(goblinMix.getName()); kylinRecommendActive.setName(goblinMix.getName());
} }
}else if(kylinRecommendActive.getActiveType()==3){ } else if (kylinRecommendActive.getActiveType() == 3) {
LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class); LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class);
queryWrapperp.eq(KylinPerformances::getPerformancesId,kylinRecommendActive.getActiveBindId()); queryWrapperp.eq(KylinPerformances::getPerformancesId, kylinRecommendActive.getActiveBindId());
KylinPerformances kylinPerformances= performancesMapper.selectOne(queryWrapperp); KylinPerformances kylinPerformances = performancesMapper.selectOne(queryWrapperp);
if(null!=kylinPerformances){ if (null != kylinPerformances) {
kylinRecommendActive.setName(kylinPerformances.getTitle()); kylinRecommendActive.setName(kylinPerformances.getTitle());
} }
} }
//获得推荐商品 //获得推荐商品
LambdaQueryWrapper<KylinRecommendActiveRelation> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActiveRelation.class); LambdaQueryWrapper<KylinRecommendActiveRelation> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActiveRelation.class);
queryWrapper.eq(KylinRecommendActiveRelation::getRecommendActiveId,kylinRecommendActive.getRecommendId()); queryWrapper.eq(KylinRecommendActiveRelation::getRecommendActiveId, kylinRecommendActive.getRecommendId());
queryWrapper.eq(KylinRecommendActiveRelation::getDelTag,0); queryWrapper.eq(KylinRecommendActiveRelation::getDelTag, 0);
List<KylinRecommendActiveRelation> kylinRecommendActiveRelations = kylinRecommendActiveRelationMapper.selectList(queryWrapper); List<KylinRecommendActiveRelation> kylinRecommendActiveRelations = kylinRecommendActiveRelationMapper.selectList(queryWrapper);
for(KylinRecommendActiveRelation r:kylinRecommendActiveRelations){ for (KylinRecommendActiveRelation r : kylinRecommendActiveRelations) {
//1NFT2组合购3演出4商品 //1NFT2组合购3演出4商品
if(r.getType()==1||r.getType()==4){ if (r.getType() == 1 || r.getType() == 4) {
LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class); LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
queryWrapperg.eq(GoblinGoods::getSpuId,r.getRecommendBindId()); queryWrapperg.eq(GoblinGoods::getSpuId, r.getRecommendBindId());
GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg); GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
if(null!=goblinGoods){ if (null != goblinGoods) {
r.setName(goblinGoods.getName()); r.setName(goblinGoods.getName());
} }
}else if(r.getType()==2){ } else if (r.getType() == 2) {
LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class); LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
queryWrapperm.eq(GoblinMix::getMixId,r.getRecommendBindId()); queryWrapperm.eq(GoblinMix::getMixId, r.getRecommendBindId());
GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm); GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm);
if(null!=goblinMix){ if (null != goblinMix) {
r.setName(goblinMix.getName()); r.setName(goblinMix.getName());
} }
}else if(r.getType()==3){ } else if (r.getType() == 3) {
LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class); LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class);
queryWrapperp.eq(KylinPerformances::getPerformancesId,r.getRecommendBindId()); queryWrapperp.eq(KylinPerformances::getPerformancesId, r.getRecommendBindId());
KylinPerformances kylinPerformances= performancesMapper.selectOne(queryWrapperp); KylinPerformances kylinPerformances = performancesMapper.selectOne(queryWrapperp);
if(null!=kylinPerformances){ if (null != kylinPerformances) {
r.setName(kylinPerformances.getTitle()); r.setName(kylinPerformances.getTitle());
} }
} }
...@@ -175,7 +175,7 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA ...@@ -175,7 +175,7 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
@Override @Override
public KylinRecommendActive getByRecommendId(String id) { public KylinRecommendActive getByRecommendId(String id) {
LambdaQueryWrapper<KylinRecommendActive> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActive.class); LambdaQueryWrapper<KylinRecommendActive> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActive.class);
queryWrapper.eq(KylinRecommendActive::getRecommendId,id); queryWrapper.eq(KylinRecommendActive::getRecommendId, id);
return kylinRecommendActiveMapper.selectOne(queryWrapper); return kylinRecommendActiveMapper.selectOne(queryWrapper);
} }
...@@ -187,12 +187,12 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA ...@@ -187,12 +187,12 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
@Override @Override
public void updateRedis(KylinRecommendActive kylinRecommendActive) { public void updateRedis(KylinRecommendActive kylinRecommendActive) {
//查出这个类型, 这个演出 对应配置的数据 //查出这个类型, 这个演出 对应配置的数据
List<KylinRecommendActive> list= kylinRecommendActiveMapper.getBybindId(kylinRecommendActive.getActiveType(),kylinRecommendActive.getActiveBindId()); List<KylinRecommendActive> list = kylinRecommendActiveMapper.getBybindId(kylinRecommendActive.getActiveType(), kylinRecommendActive.getActiveBindId());
List<KylinRecommendActive> redisList=new ArrayList<>(); List<KylinRecommendActive> redisList = new ArrayList<>();
list.forEach(r->{ list.forEach(r -> {
//查推荐商品 //查推荐商品
redisList.add( this.getKylinRecommendActiveById(r.getMid().intValue())); redisList.add(this.getKylinRecommendActiveById(r.getMid().intValue()));
}); });
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.RECOMMEND_ACTIVE+kylinRecommendActive.getActiveBindId(), redisList); redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.RECOMMEND_ACTIVE + kylinRecommendActive.getActiveBindId(), redisList);
} }
} }
...@@ -84,6 +84,7 @@ public class KylinRecommendActive implements Serializable { ...@@ -84,6 +84,7 @@ public class KylinRecommendActive implements Serializable {
private String name; private String name;
private static final KylinRecommendActive obj = new KylinRecommendActive(); private static final KylinRecommendActive obj = new KylinRecommendActive();
public static KylinRecommendActive getNew() { public static KylinRecommendActive getNew() {
try { try {
return (KylinRecommendActive) obj.clone(); return (KylinRecommendActive) obj.clone();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment