exit

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

@@ -50,14 +50,14 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
         String nowTime = DateUtil.getNowTime();
         for (String mixId : startList) {
             GoblinMixDetailsVo vo = redisUtils.getMixDetails(mixId);
-            GoblinMixAppListVo itemVo = GoblinMixAppListVo.getNew().copy(vo,nowTime);
+            GoblinMixAppListVo itemVo = GoblinMixAppListVo.getNew().copy(vo, nowTime);
             itemVo.setStatus(6);
             voList.add(itemVo);
         }
 
         for (String mixId : stockList) {
             GoblinMixDetailsVo vo = redisUtils.getMixDetails(mixId);
-            GoblinMixAppListVo itemVo = GoblinMixAppListVo.getNew().copy(vo,nowTime);
+            GoblinMixAppListVo itemVo = GoblinMixAppListVo.getNew().copy(vo, nowTime);
             itemVo.setStatus(8);
             voList.add(itemVo);
         }
@@ -68,7 +68,7 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
     @Override
     public ResponseDto<GoblinMixAppDetailsVo> mixDetails(String mixId) {
         GoblinMixDetailsVo baseVo = redisUtils.getMixDetails(mixId);
-        if(baseVo==null){
+        if (baseVo == null) {
             return ResponseDto.failure("参数异常");
         }
         GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId());
@@ -76,7 +76,7 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
         //获取用户预约情况
         //获取udi
         String uid = CurrentUtil.getCurrentUid();
-        if (redisUtils.getReserveMixByUid(uid, mixId) != null){
+        if (vo.getReserve() == 1 && redisUtils.getReserveMixByUid(uid, mixId) != null) {
             vo.setUserReserve(1);
         }
         int stock = 0;