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

Commit ff996272 authored by GaoHu's avatar GaoHu

exit

parent f3f7bc0b
...@@ -67,7 +67,7 @@ public class GoblinGoodsAnticipateController { ...@@ -67,7 +67,7 @@ public class GoblinGoodsAnticipateController {
@ApiOperation("创建预约关联sku") @ApiOperation("创建预约关联sku")
@PostMapping("/addAnticipateValues") @PostMapping("/addAnticipateValues")
public ResponseDto<Object> addAnticipateValues(List<GoblinGoodsAnticipateValueParam> list) { public ResponseDto<Object> addAnticipateValues(@RequestBody List<GoblinGoodsAnticipateValueParam> list) {
return goblinGoodsAnticipateService.addAnticipateValues(list); return goblinGoodsAnticipateService.addAnticipateValues(list);
} }
...@@ -90,7 +90,7 @@ public class GoblinGoodsAnticipateController { ...@@ -90,7 +90,7 @@ public class GoblinGoodsAnticipateController {
@ApiOperation("根据spuId查询出所有的sku") @ApiOperation("根据spuId查询出所有的sku")
@PostMapping("") @PostMapping("")
public ResponseDto<Object> getSkus(@RequestParam(name = "apuId") String SpuId) { public ResponseDto<Object> getSkus(@RequestParam(name = "apuId") String spuId) {
return goblinGoodsAnticipateService.getSkus(SpuId); return goblinGoodsAnticipateService.getSkus(spuId);
} }
} }
...@@ -209,6 +209,9 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS ...@@ -209,6 +209,9 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
@Override @Override
public ResponseDto<Object> addAnticipateValues(List<GoblinGoodsAnticipateValueParam> list) { public ResponseDto<Object> addAnticipateValues(List<GoblinGoodsAnticipateValueParam> list) {
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
for (GoblinGoodsAnticipateValueParam vo : list){
if (goblinRedisUtils.getAnticipate(vo.getAntId(),vo.getSkuId())) return ResponseDto.failure("该预约已选择该sku");
}
list.forEach(item -> { list.forEach(item -> {
GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = new GoblinGoodsAnticipateValueVo(); GoblinGoodsAnticipateValueVo goodsAnticipateValueVo = new GoblinGoodsAnticipateValueVo();
BeanUtils.copyProperties(item, goodsAnticipateValueVo); BeanUtils.copyProperties(item, goodsAnticipateValueVo);
...@@ -217,7 +220,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS ...@@ -217,7 +220,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
goodsAnticipateValueVo.setDelTag(0); goodsAnticipateValueVo.setDelTag(0);
//redis消息 //redis消息
//redis标识存入该sku处于预约列表 //redis标识存入该sku处于预约列表
goblinRedisUtils.setAnticipate(goodsAnticipateValueVo.getSkuId()); goblinRedisUtils.setAnticipate(goodsAnticipateValueVo.getAntId(),goodsAnticipateValueVo.getSkuId());
//保存mysql中间表 //保存mysql中间表
LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
...@@ -249,7 +252,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS ...@@ -249,7 +252,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
BeanUtils.copyProperties(item, goodsAnticipateValueVo); BeanUtils.copyProperties(item, goodsAnticipateValueVo);
//redis消息 //redis消息
//redis标识存入该sku处于预约列表 //redis标识存入该sku处于预约列表
goblinRedisUtils.setAnticipate(goodsAnticipateValueVo.getSkuId()); goblinRedisUtils.setAnticipate(goodsAnticipateValueVo.getAntId(),goodsAnticipateValueVo.getSkuId());
//保存mysql中间表 //保存mysql中间表
LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
......
...@@ -47,8 +47,15 @@ public class GoblinRedisUtils { ...@@ -47,8 +47,15 @@ public class GoblinRedisUtils {
/** /**
* 该skuId已开启预约 * 该skuId已开启预约
*/ */
public void setAnticipate(String skuId){ public void setAnticipate(String antId, String skuId){
redisUtil.set(GoblinRedisConst.ANTICIPATE_SKUID.concat(skuId),1); redisUtil.set(GoblinRedisConst.ANTICIPATE_SKUID.concat(antId).concat(skuId),1);
}
/**
* 获取关联
*/
public boolean getAnticipate(String antId, String skuId){
return redisUtil.get(GoblinRedisConst.ANTICIPATE_SKUID.concat(antId).concat(skuId)) != null;
} }
public GoblinGoodAnticipateUserVo getUserAboutAut(String skuId, String uid) { public GoblinGoodAnticipateUserVo getUserAboutAut(String skuId, String uid) {
......
...@@ -140,7 +140,7 @@ goblin_goods_anticipate_update_actual_reduce_people=UPDATE goblin_goods_anticipa ...@@ -140,7 +140,7 @@ goblin_goods_anticipate_update_actual_reduce_people=UPDATE goblin_goods_anticipa
goblin_goods_anticipate_delete=UPDATE goblin_goods_anticipate SET `del_tag` = 1 WHERE ant_id = ? goblin_goods_anticipate_delete=UPDATE goblin_goods_anticipate SET `del_tag` = 1 WHERE ant_id = ?
goblin_goods_anticipate_value=INSERT INTO goblin_goods_anticipate_value (ant_id,sku_name,sku_id,spu_id,about_start_date,about_end_date,created_date,del_tag) VALUES(?,?,?,?,?,?,?,?) goblin_goods_anticipate_value=INSERT INTO goblin_goods_anticipate_value (ant_id,sku_name,sku_id,spu_id,about_start_date,about_end_date,created_date,del_tag) VALUES(?,?,?,?,?,?,?,?)
goblin_goods_anticipate_value_update=UPDATE goblin_goods_anticipate_value SET `about_start_date` = ?,`about_end_date`= ?,update_date = NOW() WHERE ant_id = ? AND sku_id = ? AND spu_id = ? goblin_goods_anticipate_value_update=UPDATE goblin_goods_anticipate_value SET `about_start_date` = ?,`about_end_date`= ?,update_date = NOW() WHERE ant_id = ? AND sku_id = ? AND spu_id = ?
goblin_goods_anticipate_value_delete=UPDATE goblin_goods_anticipate_value SET `del_tag` = 1 WHERE ant_id = ? goblin_goods_anticipate_value_delete=UPDATE goblin_goods_anticipate_value SET `del_tag` = 1,update_date = NOW() WHERE ant_id = ?
goblin_goods_anticipate_update=UPDATE goblin_goods_anticipate SET `name` = ?,`rule`= ? WHERE ant_id = ? goblin_goods_anticipate_update=UPDATE goblin_goods_anticipate SET `name` = ?,`rule`= ? WHERE ant_id = ?
goblin_goods_anticipate_update_proper=UPDATE goblin_goods_anticipate SET about_people = ? WHERE ant_id = ? goblin_goods_anticipate_update_proper=UPDATE goblin_goods_anticipate SET about_people = ? WHERE ant_id = ?
goblin_goods_anticipate_user=INSERT INTO goblin_goods_anticipate_user(uid,sku_id,phone,state) VALUES(?,?,?,?) goblin_goods_anticipate_user=INSERT INTO goblin_goods_anticipate_user(uid,sku_id,phone,state) VALUES(?,?,?,?)
......
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