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

Skip to content

L
liquidnet-bus-v1
Commit d5984c49 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

style

parent 0d30017f
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 62 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRecommendActiveController.java
View file @ d5984c49
......@@ -37,32 +37,34 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation(value = "增加活动")
@ResponseBody
public AjaxResult addKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
KylinRecommendActive kylinRecommendActive=new KylinRecommendActive();
KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if(kylinRecommendActiveService.validateTime(kylinRecommendActive)==0){
List<KylinRecommendActiveRelation> list=new ArrayList<KylinRecommendActiveRelation>();
if(kylinRecommendActiveParam.getList()!=null){
kylinRecommendActiveParam.getList().forEach(r->{
KylinRecommendActiveRelation kylinRecommendActiveRelation=new KylinRecommendActiveRelation();
if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
List<KylinRecommendActiveRelation> list = new ArrayList<KylinRecommendActiveRelation>();
if (kylinRecommendActiveParam.getList() != null) {
kylinRecommendActiveParam.getList().forEach(r -> {
KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
BeanUtils.copyProperties(r, kylinRecommendActiveRelation);
list.add(kylinRecommendActiveRelation);
});
}
kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive,list);
kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive, list);
return AjaxResult.success("操作成功", "");
}else{
} else {
return AjaxResult.error("该时间段已经重复，请重新选择");
}
}
@PostMapping("addKylinRecommendActiveRelation")
@ApiOperation(value = "增加活动推荐")
@ResponseBody
public AjaxResult addKylinRecommendActiveRelation(@RequestBody KylinRecommendActiveRelationParam kylinRecommendActiveParam) {
KylinRecommendActiveRelation kylinRecommendActiveRelation=new KylinRecommendActiveRelation();
BeanUtils.copyProperties(kylinRecommendActiveParam , kylinRecommendActiveRelation);
KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActiveRelation);
kylinRecommendActiveRelationService.addKylinRecommendActiveRelation(kylinRecommendActiveRelation);
return AjaxResult.success("操作成功", "");
}
@PostMapping("delKylinRecommendActiveRelation")
@ApiOperation(value = "删除活动推荐(传入互动推荐里面的mid)")
@ResponseBody
......@@ -76,27 +78,29 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation(value = "修改活动")
@ResponseBody
public AjaxResult updateKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
KylinRecommendActive kylinRecommendActive=new KylinRecommendActive();
KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if(kylinRecommendActiveService.validateTime(kylinRecommendActive)==0){
if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
kylinRecommendActiveService.updateKylinRecommendActive(kylinRecommendActive);
return AjaxResult.success("操作成功", "");
}else{
} else {
return AjaxResult.error("该时间段已经重复，请重新选择");
}
}
@PostMapping("pageActive")
@ApiOperation(value = "分页活动")
@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 getDataTable( kylinRecommendActiveService.pageKylinAcitve(pageSize,pageNum));
return getDataTable(kylinRecommendActiveService.pageKylinAcitve(pageSize, pageNum));
}
@PostMapping("getActiveById")
@ApiOperation(value = "通过id获得活动")
@ResponseBody
public KylinRecommendActive getActiveById(@RequestParam(name = "mid", required = true) int mid) {
return kylinRecommendActiveService.getKylinRecommendActiveById(mid);
return kylinRecommendActiveService.getKylinRecommendActiveById(mid);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRecommendActiveServiceImpl.java
View file @ d5984c49
......@@ -57,7 +57,7 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
kylinRecommendActive.setDelTag(0);
kylinRecommendActiveMapper.insert(kylinRecommendActive);
//保存推荐活动关系
kylinRecommendActiveRelations.forEach(r->{
kylinRecommendActiveRelations.forEach(r -> {
r.setCreatedAt(LocalDateTime.now());
r.setUpdatedAt(LocalDateTime.now());
r.setDelTag(0);
......@@ -82,29 +82,29 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
public List<KylinRecommendActive> pageKylinAcitve(int pageSize, int pageNumber) {
PageHelper.startPage(pageNumber, pageSize);
LambdaQueryWrapper<KylinRecommendActive> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActive.class);
queryWrapper.eq(KylinRecommendActive::getDelTag,0);
List<KylinRecommendActive> list=kylinRecommendActiveMapper.selectList(queryWrapper);
list.forEach(r->{
queryWrapper.eq(KylinRecommendActive::getDelTag, 0);
List<KylinRecommendActive> list = kylinRecommendActiveMapper.selectList(queryWrapper);
list.forEach(r -> {
//1NFT2组合购3演出4商品
if(r.getActiveType()==1||r.getActiveType()==4){
if (r.getActiveType() == 1 || r.getActiveType() == 4) {
LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
queryWrapperg.eq(GoblinGoods::getSpuId,r.getActiveBindId());
queryWrapperg.eq(GoblinGoods::getSpuId, r.getActiveBindId());
GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
if(null!=goblinGoods){
if (null != goblinGoods) {
r.setName(goblinGoods.getName());
}
}else if(r.getActiveType()==2){
} else if (r.getActiveType() == 2) {
LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
queryWrapperm.eq(GoblinMix::getMixId,r.getActiveBindId());
queryWrapperm.eq(GoblinMix::getMixId, r.getActiveBindId());
GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm);
if(null!=goblinMix){
if (null != goblinMix) {
r.setName(goblinMix.getName());
}
}else if(r.getActiveType()==3){
} else if (r.getActiveType() == 3) {
LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class);
queryWrapperp.eq(KylinPerformances::getPerformancesId,r.getActiveBindId());
KylinPerformances kylinPerformances= performancesMapper.selectOne(queryWrapperp);
if(null!=kylinPerformances){
queryWrapperp.eq(KylinPerformances::getPerformancesId, r.getActiveBindId());
KylinPerformances kylinPerformances = performancesMapper.selectOne(queryWrapperp);
if (null != kylinPerformances) {
r.setName(kylinPerformances.getTitle());
}
}
......@@ -115,55 +115,55 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
@Override
public KylinRecommendActive getKylinRecommendActiveById(int mid) {
//获得推荐活动
KylinRecommendActive kylinRecommendActive=kylinRecommendActiveMapper.selectById(mid);
if(kylinRecommendActive.getActiveType()==1||kylinRecommendActive.getActiveType()==4){
KylinRecommendActive kylinRecommendActive = kylinRecommendActiveMapper.selectById(mid);
if (kylinRecommendActive.getActiveType() == 1 || kylinRecommendActive.getActiveType() == 4) {
LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
queryWrapperg.eq(GoblinGoods::getSpuId,kylinRecommendActive.getActiveBindId());
queryWrapperg.eq(GoblinGoods::getSpuId, kylinRecommendActive.getActiveBindId());
GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
if(null!=goblinGoods){
if (null != goblinGoods) {
kylinRecommendActive.setName(goblinGoods.getName());
}
}else if(kylinRecommendActive.getActiveType()==2){
} else if (kylinRecommendActive.getActiveType() == 2) {
LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
queryWrapperm.eq(GoblinMix::getMixId,kylinRecommendActive.getActiveBindId());
queryWrapperm.eq(GoblinMix::getMixId, kylinRecommendActive.getActiveBindId());
GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm);
if(null!=goblinMix){
if (null != goblinMix) {
kylinRecommendActive.setName(goblinMix.getName());
}
}else if(kylinRecommendActive.getActiveType()==3){
} else if (kylinRecommendActive.getActiveType() == 3) {
LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class);
queryWrapperp.eq(KylinPerformances::getPerformancesId,kylinRecommendActive.getActiveBindId());
KylinPerformances kylinPerformances= performancesMapper.selectOne(queryWrapperp);
if(null!=kylinPerformances){
queryWrapperp.eq(KylinPerformances::getPerformancesId, kylinRecommendActive.getActiveBindId());
KylinPerformances kylinPerformances = performancesMapper.selectOne(queryWrapperp);
if (null != kylinPerformances) {
kylinRecommendActive.setName(kylinPerformances.getTitle());
}
}
//获得推荐商品
LambdaQueryWrapper<KylinRecommendActiveRelation> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActiveRelation.class);
queryWrapper.eq(KylinRecommendActiveRelation::getRecommendActiveId,kylinRecommendActive.getRecommendId());
queryWrapper.eq(KylinRecommendActiveRelation::getDelTag,0);
queryWrapper.eq(KylinRecommendActiveRelation::getRecommendActiveId, kylinRecommendActive.getRecommendId());
queryWrapper.eq(KylinRecommendActiveRelation::getDelTag, 0);
List<KylinRecommendActiveRelation> kylinRecommendActiveRelations = kylinRecommendActiveRelationMapper.selectList(queryWrapper);
for(KylinRecommendActiveRelation r:kylinRecommendActiveRelations){
for (KylinRecommendActiveRelation r : kylinRecommendActiveRelations) {
//1NFT2组合购3演出4商品
if(r.getType()==1||r.getType()==4){
if (r.getType() == 1 || r.getType() == 4) {
LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
queryWrapperg.eq(GoblinGoods::getSpuId,r.getRecommendBindId());
queryWrapperg.eq(GoblinGoods::getSpuId, r.getRecommendBindId());
GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
if(null!=goblinGoods){
if (null != goblinGoods) {
r.setName(goblinGoods.getName());
}
}else if(r.getType()==2){
} else if (r.getType() == 2) {
LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
queryWrapperm.eq(GoblinMix::getMixId,r.getRecommendBindId());
queryWrapperm.eq(GoblinMix::getMixId, r.getRecommendBindId());
GoblinMix goblinMix = goblinMixMapper.selectOne(queryWrapperm);
if(null!=goblinMix){
if (null != goblinMix) {
r.setName(goblinMix.getName());
}
}else if(r.getType()==3){
} else if (r.getType() == 3) {
LambdaQueryWrapper<KylinPerformances> queryWrapperp = Wrappers.lambdaQuery(KylinPerformances.class);
queryWrapperp.eq(KylinPerformances::getPerformancesId,r.getRecommendBindId());
KylinPerformances kylinPerformances= performancesMapper.selectOne(queryWrapperp);
if(null!=kylinPerformances){
queryWrapperp.eq(KylinPerformances::getPerformancesId, r.getRecommendBindId());
KylinPerformances kylinPerformances = performancesMapper.selectOne(queryWrapperp);
if (null != kylinPerformances) {
r.setName(kylinPerformances.getTitle());
}
}
......@@ -175,24 +175,24 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
@Override
public KylinRecommendActive getByRecommendId(String id) {
LambdaQueryWrapper<KylinRecommendActive> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActive.class);
queryWrapper.eq(KylinRecommendActive::getRecommendId,id);
return kylinRecommendActiveMapper.selectOne(queryWrapper);
queryWrapper.eq(KylinRecommendActive::getRecommendId, id);
return kylinRecommendActiveMapper.selectOne(queryWrapper);
}
@Override
public int validateTime(KylinRecommendActive kylinRecommendActive) {
return kylinRecommendActiveMapper.validateTime(kylinRecommendActive);
return kylinRecommendActiveMapper.validateTime(kylinRecommendActive);
}
@Override
public void updateRedis(KylinRecommendActive kylinRecommendActive) {
//查出这个类型， 这个演出 对应配置的数据
List<KylinRecommendActive> list= kylinRecommendActiveMapper.getBybindId(kylinRecommendActive.getActiveType(),kylinRecommendActive.getActiveBindId());
List<KylinRecommendActive> redisList=new ArrayList<>();
list.forEach(r->{
List<KylinRecommendActive> list = kylinRecommendActiveMapper.getBybindId(kylinRecommendActive.getActiveType(), kylinRecommendActive.getActiveBindId());
List<KylinRecommendActive> redisList = new ArrayList<>();
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);
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRecommendActive.java
View file @ d5984c49
......@@ -84,6 +84,7 @@ public class KylinRecommendActive implements Serializable {
private String name;
private static final KylinRecommendActive obj = new KylinRecommendActive();
public static KylinRecommendActive getNew() {
try {
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