Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMemberGoodsManageController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.business.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -10,7 +11,10 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.BusMemberGoodsManage;
 import org.jeecg.modules.business.service.IBusMemberGoodsManageService;
@@ -84,6 +88,14 @@ public class BusMemberGoodsManageController extends JeecgController<BusMemberGoo
 	//@RequiresPermissions("business:bus_member_goods_manage:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusMemberGoodsManage busMemberGoodsManage) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMemberGoodsManage.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+		busMemberGoodsManage.setCreateDate(new Date());
+		busMemberGoodsManage.setCreateUser(user.getRealname());
 		busMemberGoodsManageService.save(busMemberGoodsManage);
 		return Result.OK("添加成功！");
 	}
@@ -99,6 +111,7 @@ public class BusMemberGoodsManageController extends JeecgController<BusMemberGoo
 	//@RequiresPermissions("business:bus_member_goods_manage:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody BusMemberGoodsManage busMemberGoodsManage) {
+		busMemberGoodsManage.setReceiverDate(new Date());
 		busMemberGoodsManageService.updateById(busMemberGoodsManage);
 		return Result.OK("编辑成功!");
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMemberMessageController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.business.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -9,8 +10,15 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.BusMemberMessage;
 import org.jeecg.modules.business.service.IBusMemberMessageService;
@@ -20,6 +28,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.order.entity.CesOrderLeaseGoods;
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +61,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class BusMemberMessageController extends JeecgController<BusMemberMessage, IBusMemberMessageService> {
 	@Autowired
 	private IBusMemberMessageService busMemberMessageService;
-	
+	 @Autowired
+	 private CesRoomsServiceImpl cesRoomsService;
 	/**
 	 * 分页列表查询
 	 *
@@ -66,10 +78,24 @@ public class BusMemberMessageController extends JeecgController<BusMemberMessage
 	public Result<IPage<BusMemberMessage>> queryPageList(BusMemberMessage busMemberMessage,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														 @RequestParam(name="startTime",required = false) String startTime,
+														 @RequestParam(name="endTime",required = false) String endTime,
 								   HttpServletRequest req) {
-		QueryWrapper<BusMemberMessage> queryWrapper = QueryGenerator.initQueryWrapper(busMemberMessage, req.getParameterMap());
+		LambdaQueryWrapper<BusMemberMessage> queryWrapper = QueryGenerator.initQueryWrapper(busMemberMessage, req.getParameterMap()).lambda();
+		if (ObjectUtils.isNotEmpty(startTime)) {
+			queryWrapper.ge(BusMemberMessage::getRemindDate, DateUtil.parseDate(startTime));
+		}
+		if (ObjectUtils.isNotEmpty(endTime)) {
+			queryWrapper.le(BusMemberMessage::getRemindDate, DateUtil.parseDate(endTime));
+		}
 		Page<BusMemberMessage> page = new Page<BusMemberMessage>(pageNo, pageSize);
 		IPage<BusMemberMessage> pageList = busMemberMessageService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			CesRooms rooms = cesRoomsService.getById(item.getRoomId());
+			if (rooms != null) {
+				item.setRoomNo(rooms.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
 	
@@ -84,6 +110,13 @@ public class BusMemberMessageController extends JeecgController<BusMemberMessage
 	//@RequiresPermissions("business:bus_member_message:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BusMemberMessage busMemberMessage) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMemberMessage.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+		busMemberMessage.setCreateDate(new Date());
 		busMemberMessageService.save(busMemberMessage);
 		return Result.OK("添加成功！");
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMemberGoodsManage.java

@@ -104,4 +104,9 @@ public class BusMemberGoodsManage implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "领取时间")
     private Date receiverDate;
+
+    /**房号id*/
+    @Excel(name = "房号id", width = 15)
+    @ApiModelProperty(value = "房号id")
+    private String roomId;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMemberMessage.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -82,4 +80,7 @@ public class BusMemberMessage implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
+
+    @TableField(exist = false)
+    private String roomNo;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderLeaseGoodsController.java

@@ -90,7 +90,7 @@ public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseG
 														   @RequestParam(name="startTime",required = false) String startTime,
 														   @RequestParam(name="endTime",required = false) String endTime,
 								   HttpServletRequest req) {
-		LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, req.getParameterMap()).lambda();;
+		LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, req.getParameterMap()).lambda();
 		if (ObjectUtils.isNotEmpty(startTime)) {
 			queryWrapper.ge(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(startTime));
 		}