商城酒店预定fix

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -294,6 +294,9 @@ public class HotelController extends WebConfig {
             if (ObjectUtils.isEmpty(coupons)) {
                 return Result.error("优惠券活动不存在");
             }
+            busMarketCouponsCashUsed.setStatus(2);
+            busMarketCouponsCashUsed.setUsedTime(DateTime.now());
+            busMarketCouponsCashUsedService.updateById(busMarketCouponsCashUsed);
             couponMoney = coupons.getCost();
         }
         mallHotelOrder.setTenantId(tenantId);
@@ -312,11 +315,11 @@ public class HotelController extends WebConfig {
         busRoomBookingOrders.setPhone(mallHotelOrder.getMobile());
 
         List<BusBookingLayoutDayPrice> layoutDayPrices = new ArrayList<>();
-        long getTime = mallHotelOrder.getStartDate().getTime() - mallHotelOrder.getEndDate().getTime();
+        long getTime = mallHotelOrder.getEndDate().getTime() - mallHotelOrder.getStartDate().getTime();
         long day = getTime / (1000 * 60 * 60 * 24);
         Calendar calendar = new GregorianCalendar();
         BigDecimal sCouponMoney = couponMoney;
-        for (Integer i = 0; i <= day; i++) {
+        for (Integer i = 0; i < day; i++) {
             calendar.setTime(mallHotelOrder.getStartDate());
             calendar.add(Calendar.DATE, i);
 
@@ -335,8 +338,6 @@ public class HotelController extends WebConfig {
         busRoomBookingOrders.setLayoutDayPrices(layoutDayPrices);
 
         BusRoomBookingOrders bookingOrders = new BusRoomBookingOrders();
-
-//        DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat formatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Date four = null;
@@ -356,6 +357,8 @@ public class HotelController extends WebConfig {
         bookingOrders.setBookingOrdersType(1);
         bookingOrders.setBreakfastNum(0);
 
+        lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(BusDictItem::getHotelId, mallHotelOrder.getHotelId());
         lambdaQueryWrapper2.eq(BusDictItem::getDictId, "1639538915239743490");
         busDictItems = busDictItemService.list(lambdaQueryWrapper2);
         if (ObjectUtils.isNotEmpty(busDictItems)) {
@@ -372,6 +375,7 @@ public class HotelController extends WebConfig {
         bookingOrders.setWarrantType(1);
         bookingOrders.setOuterOrdersNo(mallHotelOrder.getCode());
         bookingOrders.setBookingStatus(3);
+        bookingOrders.setBookingType(mallHotelOrder.getBookingType());
         busRoomBookingOrders.setOrderInfo(bookingOrders);
 
         List<BookingLayoutRoomsDto> roomIds = new ArrayList<>();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -108,8 +108,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         isTeam = isTeam != null && isTeam;
         LoginUser user = TokenUtils.getAuthUser();
         item.getOrderInfo().setCreateTime(new Date());
-        item.getOrderInfo().setCreateUser(user.getId());
-
+        if(user!=null)
+        {
+            item.getOrderInfo().setCreateUser(user.getId());
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         item.getOrderInfo().setBookingOrdersNo("YD"+sdf.format(System.currentTimeMillis()));
         // 检测是否时间安排上有冲突

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mall/entity/MallHotelOrder.java

@@ -57,16 +57,16 @@ public class MallHotelOrder implements Serializable {
     private String memberCardId;
 	/**入住时间*/
 	@Excel(name = "入住时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "入住时间")
-    private DateTime startDate;
+    private Date startDate;
 	/**离店时间*/
 	@Excel(name = "离店时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "离店时间")
-    private DateTime endDate;
+    private Date endDate;
 	/**到店时间*/
 	@Excel(name = "到店时间", width = 15)
     @ApiModelProperty(value = "到店时间")
@@ -123,4 +123,7 @@ public class MallHotelOrder implements Serializable {
 
 	@TableField(exist = false)
 	private BigDecimal dayMoney;
+
+    @TableField(exist = false)
+    private Integer bookingType;
 }