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

Commit cc1a56b7 authored by dongchun's avatar dongchun

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents d571786d b7f2549d
...@@ -15,6 +15,8 @@ public class GoblinInsertZhengzaiParam { ...@@ -15,6 +15,8 @@ public class GoblinInsertZhengzaiParam {
private String storeId; private String storeId;
@ApiModelProperty(required = true, value = "显示时间") @ApiModelProperty(required = true, value = "显示时间")
private String showTime; private String showTime;
@ApiModelProperty(required = true, value = "是否新增[0-否|1-是]")
private Integer newTag;
@ApiModelProperty(required = true, value = "是否删除[0-否|1-是]") @ApiModelProperty(required = true, value = "是否删除[0-否|1-是]")
private Integer delTag; private Integer delTag;
} }
...@@ -113,12 +113,12 @@ public class GoblinSelfZhengzaiController extends BaseController { ...@@ -113,12 +113,12 @@ public class GoblinSelfZhengzaiController extends BaseController {
return goblinZhengzaiMarketService.zhengzaiStore(params); return goblinZhengzaiMarketService.zhengzaiStore(params);
} }
@PostMapping("zhengzai/store/update") // @PostMapping("zhengzai/store/update")
@ApiOperation("活动详情-正在下单-修改店铺") // @ApiOperation("活动详情-正在下单-修改店铺")
@ApiResponse(code = 200, message = "接口返回对象参数") // @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Boolean> purchasingStoreUpdate(@RequestBody List<GoblinInsertZhengzaiParam> params) { // public ResponseDto<Boolean> purchasingStoreUpdate(@RequestBody List<GoblinInsertZhengzaiParam> params) {
return goblinZhengzaiMarketService.zhengzaiStore(params); // return goblinZhengzaiMarketService.zhengzaiStore(params);
} // }
@PostMapping("zhengzai/store/list") @PostMapping("zhengzai/store/list")
......
...@@ -191,27 +191,61 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer ...@@ -191,27 +191,61 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Override @Override
public ResponseDto<Boolean> zhengzaiStore(List<GoblinInsertZhengzaiParam> params) { public ResponseDto<Boolean> zhengzaiStore(List<GoblinInsertZhengzaiParam> params) {
for (GoblinInsertZhengzaiParam item : params) { for (GoblinInsertZhengzaiParam item : params) {
String marketId = item.getMarketId(); if(item.getNewTag()==1){//新增
String storeId = item.getStoreId(); String marketId = item.getMarketId();
String showTime = item.getShowTime(); String storeId = item.getStoreId();
GoblinMarketingZhengzaiRelation entity = GoblinMarketingZhengzaiRelation.getNew(); String showTime = item.getShowTime();
entity.setSelfMarketId(marketId); GoblinMarketingZhengzaiRelation entity = GoblinMarketingZhengzaiRelation.getNew();
entity.setStoreId(storeId); entity.setSelfMarketId(marketId);
entity.setShowTime(LocalDateTime.parse(showTime, DTF_YMD_HMS)); entity.setStoreId(storeId);
if (goblinRedisUtils.getZhengzaiRelation(storeId).contains(marketId)) { entity.setShowTime(LocalDateTime.parse(showTime, DTF_YMD_HMS));
return ResponseDto.failure("禁止重复添加"); if (goblinRedisUtils.getZhengzaiRelation(storeId).contains(marketId)) {
return ResponseDto.failure("禁止重复添加");
}
//mysql
goblinMarketingZhengzaiRelationMapper.insert(entity);
//mongo
GoblinMarketingZhengzaiRelationVo vo = GoblinMarketingZhengzaiRelationVo.getNew();
BeanUtils.copyProperties(entity, vo);
vo.setShowTime(showTime);
vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(entity.getCreatedAt()));
goblinMongoUtils.insertZhengzaiRelation(vo);
//redis
goblinRedisUtils.setZhengzaiRelation(marketId, vo);
goblinRedisUtils.addStoreSelfRelation(marketId, storeId);
}else{//修改
int delTag = item.getDelTag();
String showTime = item.getShowTime();
String marketId = item.getMarketId();
String storeId = item.getStoreId();
if (delTag == 0) {
GoblinMarketingZhengzaiRelation entity = GoblinMarketingZhengzaiRelation.getNew();
entity.setShowTime(LocalDateTime.parse(showTime, DTF_YMD_HMS));
entity.setUpdatedAt(LocalDateTime.now());
//mysql
goblinMarketingZhengzaiRelationMapper.update(entity, Wrappers.lambdaUpdate(GoblinMarketingZhengzaiRelation.getNew()).eq(GoblinMarketingZhengzaiRelation::getSelfMarketId, marketId).eq(GoblinMarketingZhengzaiRelation::getStoreId, storeId));
//mongo
GoblinMarketingZhengzaiRelationVo vo = GoblinMarketingZhengzaiRelationVo.getNew();
BeanUtils.copyProperties(entity, vo);
vo.setShowTime(showTime);
goblinMongoUtils.updateZhengzaiRelation(marketId, storeId, vo);
//redis
goblinRedisUtils.setZhengzaiRelation(marketId, vo);
goblinRedisUtils.addStoreSelfRelation(marketId, storeId);
} else if (delTag == 1) {
GoblinMarketingZhengzaiRelation entity = GoblinMarketingZhengzaiRelation.getNew();
entity.setDelTag(1);
entity.setUpdatedAt(LocalDateTime.now());
//mysql
goblinMarketingZhengzaiRelationMapper.update(entity, Wrappers.lambdaUpdate(GoblinMarketingZhengzaiRelation.getNew()).eq(GoblinMarketingZhengzaiRelation::getSelfMarketId, marketId).eq(GoblinMarketingZhengzaiRelation::getStoreId, storeId));
//mongo
goblinMongoUtils.delZhengzaiRelation(marketId, storeId);
//redis
goblinRedisUtils.delZhengzaiRelation(marketId, storeId);
goblinRedisUtils.delStoreSelfRelation(marketId, storeId);
}
} }
//mysql
goblinMarketingZhengzaiRelationMapper.insert(entity);
//mongo
GoblinMarketingZhengzaiRelationVo vo = GoblinMarketingZhengzaiRelationVo.getNew();
BeanUtils.copyProperties(entity, vo);
vo.setShowTime(showTime);
vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(entity.getCreatedAt()));
goblinMongoUtils.insertZhengzaiRelation(vo);
//redis
goblinRedisUtils.setZhengzaiRelation(marketId, vo);
goblinRedisUtils.addStoreSelfRelation(marketId, storeId);
} }
return ResponseDto.success(); return ResponseDto.success();
} }
......
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