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

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinGoodsAnticipateMgServiceImpl.java

@@ -148,13 +148,13 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
             //查询真实预约人数
             BigInteger autIdPeople = goblinRedisUtils.getSkuIdPeople(anticipateValueVo.getSkuId());
             autIdPeople = autIdPeople != null ? autIdPeople : BigInteger.valueOf(0);
-            //预约人数   设置预约数+实际预约数
-            anticipateValueVo.setAboutPeople(anticipateValueVo.getAboutPeople().add(autIdPeople));
+            //预约人数   读取缓存的预约人数
+            GoblinGoodsAnticipateValueVo aboutPeople = goblinRedisUtils.getValueBySkuId(anticipateValueVo.getSkuId());
+            anticipateValueVo.setAboutPeople(aboutPeople!=null?aboutPeople.getAboutPeople():BigInteger.valueOf(0));
             //实际预约人数
             anticipateValueVo.setActualPeople(autIdPeople);
             //设置预约状态
             anticipateValueVo.setState(GoblinAnticipateUtils.setState(anticipateValueVo.getAboutStartDate(), anticipateValueVo.getAboutEndDate()));
-
         }
         pageInfo.setPageNum(goodsAnticipateValueParam.getPageNum());
         pageInfo.setPageSize(20);
@@ -189,24 +189,21 @@ public class GoblinGoodsAnticipateMgServiceImpl implements IGoblinGoodsAnticipat
         if (!goodsAnticipateValueVo.getUid().equals(uid)){
             return ResponseDto.failure("无权限删除");
         }
-        if (goodsAnticipateValueVo != null) {
-            goodsAnticipateValueVo.setState(GoblinAnticipateUtils.setState(goodsAnticipateValueVo.getAboutStartDate(), goodsAnticipateValueVo.getAboutEndDate()));
-            //没有开启则可以删除预约
-            if (!goodsAnticipateValueVo.getState().equals(0)) {
-                return ResponseDto.failure("预约状态为已开启或已结束，不可删除！");
-            }
-            //mysql删除
-            LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
-            sqlValue.add(new Object[]{
-                    skuId
-            });
-            //预约库删除
-            sendRedis("goblin_goods_anticipate_value_delete", sqlValue);
-            //删除mongodb
-            goblinMongoUtils.delGoodsAnticipateValueVo(skuId);
-            return ResponseDto.success();
+        goodsAnticipateValueVo.setState(GoblinAnticipateUtils.setState(goodsAnticipateValueVo.getAboutStartDate(), goodsAnticipateValueVo.getAboutEndDate()));
+        //没有开启则可以删除预约
+        if (!goodsAnticipateValueVo.getState().equals(0)) {
+            return ResponseDto.failure("预约状态为已开启或已结束，不可删除！");
         }
-        return ResponseDto.failure("该预约不存在");
+        //mysql删除
+        LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
+        sqlValue.add(new Object[]{
+                skuId
+        });
+        //预约库删除
+        sendRedis("goblin_goods_anticipate_value_delete", sqlValue);
+        //删除mongodb
+        goblinMongoUtils.delGoodsAnticipateValueVo(skuId);
+        return ResponseDto.success();
     }
 
     @Override