通过id查询酒店预定订单详情

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

@@ -524,8 +524,10 @@ public class HotelController extends WebConfig {
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest req) {
         String tenantId = TenantContextHolder.getTenantId();
+        String userId = ThirdSessionHolder.getUserId();
         LambdaQueryWrapper<MallHotelOrder> queryWrapper = QueryGenerator.initQueryWrapper(mallHotelOrder, req.getParameterMap()).lambda();
         queryWrapper.eq(MallHotelOrder::getTenantId, tenantId);
+        queryWrapper.eq(MallHotelOrder::getMallUserId, userId);
         Page<MallHotelOrder> page = new Page<MallHotelOrder>(pageNo, pageSize);
         IPage<MallHotelOrder> pageList = mallHotelOrderService.page(page, queryWrapper);
         pageList.getRecords().forEach(t -> {
@@ -588,4 +590,55 @@ public class HotelController extends WebConfig {
         mallHotelOrderService.updateById(order);
         return Result.OK("取消成功！");
     }
+
+    /**
+     * 通过id查询酒店预定订单详情
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value="通过id查询酒店预定订单详情", notes="通过id查询酒店预定订单详情")
+    @GetMapping(value = "/hotel_order-info")
+    @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
+    @ApiLogin
+    public Result<MallHotelOrder> getHotelOrderInfo(@RequestParam(name="id",required=true) String id) {
+        MallHotelOrder mallHotelOrder = mallHotelOrderService.getById(id);
+        if (mallHotelOrder == null) {
+            return Result.error("未找到对应数据");
+        }
+        log.info("mallHotelOrder--------"+mallHotelOrder.toString());
+        String userId = ThirdSessionHolder.getUserId();
+        log.info("userId--------"+userId);
+        if (!mallHotelOrder.getMallUserId().equals(userId)) {
+            return Result.error("未找到对应数据");
+        }
+        BusHotel hotel = busHotelService.getById(mallHotelOrder.getHotelId());
+        mallHotelOrder.setHotel(hotel);
+        if (mallHotelOrder.getStatus().equals(1)) {
+            mallHotelOrder.setStatusName("未付款");
+        } else if (mallHotelOrder.getStatus().equals(2)) {
+            mallHotelOrder.setStatusName("已付款");
+        } else if (mallHotelOrder.getStatus().equals(3)) {
+            mallHotelOrder.setStatusName("已取消");
+        } else if (mallHotelOrder.getStatus().equals(4)) {
+            mallHotelOrder.setStatusName("已完成");
+        } else if (mallHotelOrder.getStatus().equals(5)) {
+            mallHotelOrder.setStatusName("待入住");
+        } else if (mallHotelOrder.getStatus().equals(6)) {
+            mallHotelOrder.setStatusName("已入住");
+        } else if (mallHotelOrder.getStatus().equals(7)) {
+            mallHotelOrder.setStatusName("退款中");
+        }
+        CesRoomLayout layout = cesRoomLayoutService.getById(mallHotelOrder.getLayoutId());
+        if (layout != null) {
+            mallHotelOrder.setLayoutName(layout.getName());
+        }
+        if (StringUtils.isNotBlank(mallHotelOrder.getCouponId())) {
+            BusMarketCouponsCash busMarketCouponsCash = busMarketCouponsCashService.getById(mallHotelOrder.getCouponId());
+            if (busMarketCouponsCash != null) {
+                mallHotelOrder.setCouponName(busMarketCouponsCash.getName());
+            }
+        }
+        return Result.OK(mallHotelOrder);
+    }
 }

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

@@ -110,7 +110,7 @@ public class MallContactController extends WebConfig {
 	@ApiOperation(value="通过id删除商城联系人", notes="通过id删除商城联系人")
 	@ApiLogin
 	@ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
-	@DeleteMapping(value = "/delete")
+	@PostMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		mallContactService.removeById(id);
 		return Result.OK("删除成功!");

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

@@ -9,6 +9,7 @@ import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.business.entity.BusHotel;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -143,4 +144,10 @@ public class MallHotelOrder implements Serializable {
 
     @TableField(exist = false)
     private String layoutName;
+
+    @TableField(exist = false)
+    private BusHotel hotel;
+
+    @TableField(exist = false)
+    private String couponName;
 }