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

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

@@ -324,7 +324,9 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             GoblinMixDetailsVo mixDetails = goblinRedisUtils.getMixDetails(mixId);
             //组合购开启预约且当前时间大于预约购开始时间或者上架时间才可预约
             if (mixDetails.getReserve() != 0 && DateUtil.compareStrDay(nowTime, mixDetails.getTimeStart()) <= 0) {
+                String mid = IDGenerator.nextTimeId2();
                 GoblinMixReserveVo goblinMixReserveVo = GoblinMixReserveVo.getNew();
+                goblinMixReserveVo.setMid(mid);
                 goblinMixReserveVo.setMixId(mixId);
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtil.DATE_FULL_STR);
                 goblinMixReserveVo.setCreatedDate(LocalDateTime.parse(nowTime,formatter));
@@ -334,7 +336,6 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
                 //redis保存用户预约组合购记录
                 goblinRedisUtils.setReserveMixByUid(goblinMixReserveVo);
                 //发送redis消息修改mysql记录用户预约
-                String mid = IDGenerator.nextTimeId2();
                 LinkedList<Object[]> sqlValue = CollectionUtil.linkedListObjectArr();
                 sqlValue.add(new Object[]{
                         mid,
@@ -345,7 +346,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
                 sendRedis("goblin_goods_anticipate_mix", sqlValue);
             }
         }
-        return ResponseDto.success();
+        return ResponseDto.success(true);
     }
 
     @Override