BUG:uid获取为空和新增加单独或去mix用户是否预约接口

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

@@ -109,4 +109,15 @@ public class GoblinGoodsAnticipateController {
         return goblinGoodsAnticipateService.reserveByMix(mixId);
     }
 
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "混合购【根据mixId查询用户是否预约该混合购】")
+    @GetMapping("reserveMixByUid")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mixId", value = "混合售id"),
+    })
+    public ResponseDto<Boolean> reserveMixByUid(@RequestParam(value = "mixId", required = true) String mixId) {
+        return goblinGoodsAnticipateService.reserveMixByUid(mixId);
+    }
+
+
 }

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

@@ -76,7 +76,7 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
         //获取用户预约情况
         //获取udi
         String uid = CurrentUtil.getCurrentUid();
-        if (vo.getReserve() == 1 && redisUtils.getReserveMixByUid(uid, mixId) != null) {
+        if (vo.getReserve() == 1 && uid != null && redisUtils.getReserveMixByUid(uid, mixId) != null) {
             vo.setUserReserve(1);
         }
         int stock = 0;