Skip to content

G
gxpt_ht
Commit fdf6859e by wuwenlong
Options

Merge remote-tracking branch 'origin/main'

parents 343b08e7 8eaa3406
Showing with 209 additions and 169 deletions
share-admin/src/main/java/share/web/controller/system/PackController.java
......@@ -16,8 +16,9 @@ import org.springframework.web.bind.annotation.RestController;
import share.common.annotation.Log;
import share.common.core.controller.BaseController;
import share.common.core.domain.AjaxResult;
import share.common.core.domain.R;
import share.common.enums.BusinessType;
import share.system.domain.Pack;
import share.system.domain.SPack;
import share.system.service.IPackService;
import share.common.utils.poi.ExcelUtil;
import share.common.core.page.TableDataInfo;
......@@ -39,21 +40,30 @@ public class PackController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:pack:list')")
@GetMapping("/list")
public TableDataInfo list(Pack pack) {
public TableDataInfo list(SPack SPack) {
startPage();
List<Pack> list = packService.selectPackList(pack);
List<SPack> list = packService.selectPackList(SPack);
return getDataTable(list);
}
/**
* 查询套餐列表
*/
@PreAuthorize("@ss.hasPermi('system:pack:list')")
@GetMapping("/query")
public R<List<SPack>> query() {
return R.ok(packService.selectPackList(new SPack()));
}
/**
* 导出套餐列表
*/
@PreAuthorize("@ss.hasPermi('system:pack:export')")
@Log(title = "套餐", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Pack pack) {
List<Pack> list = packService.selectPackList(pack);
ExcelUtil<Pack> util = new ExcelUtil<Pack>(Pack.class);
public void export(HttpServletResponse response, SPack SPack) {
List<SPack> list = packService.selectPackList(SPack);
ExcelUtil<SPack> util = new ExcelUtil<SPack>(SPack.class);
util.exportExcel(response, list, "套餐数据");
}
......@@ -72,8 +82,8 @@ public class PackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:add')")
@Log(title = "套餐", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Pack pack) {
return toAjax(packService.insertPack(pack));
public AjaxResult add(@RequestBody SPack SPack) {
return toAjax(packService.insertPack(SPack));
}
/**
......@@ -82,8 +92,8 @@ public class PackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:edit')")
@Log(title = "套餐", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Pack pack) {
return toAjax(packService.updatePack(pack));
public AjaxResult edit(@RequestBody SPack SPack) {
return toAjax(packService.updatePack(SPack));
}
/**
......
share-admin/src/main/java/share/web/controller/system/RoomPackController.java
......@@ -16,8 +16,9 @@ import org.springframework.web.bind.annotation.RestController;
import share.common.annotation.Log;
import share.common.core.controller.BaseController;
import share.common.core.domain.AjaxResult;
import share.common.core.domain.R;
import share.common.enums.BusinessType;
import share.system.domain.RoomPack;
import share.system.domain.SRoomPack;
import share.system.service.IRoomPackService;
import share.common.utils.poi.ExcelUtil;
import share.common.core.page.TableDataInfo;
......@@ -39,9 +40,9 @@ public class RoomPackController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:pack:list')")
@GetMapping("/list")
public TableDataInfo list(RoomPack roomPack) {
public TableDataInfo list(SRoomPack SRoomPack) {
startPage();
List<RoomPack> list = roomPackService.selectRoomPackList(roomPack);
List<SRoomPack> list = roomPackService.selectRoomPackList(SRoomPack);
return getDataTable(list);
}
......@@ -51,9 +52,9 @@ public class RoomPackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:export')")
@Log(title = "包房套餐关系", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RoomPack roomPack) {
List<RoomPack> list = roomPackService.selectRoomPackList(roomPack);
ExcelUtil<RoomPack> util = new ExcelUtil<RoomPack>(RoomPack.class);
public void export(HttpServletResponse response, SRoomPack SRoomPack) {
List<SRoomPack> list = roomPackService.selectRoomPackList(SRoomPack);
ExcelUtil<SRoomPack> util = new ExcelUtil<SRoomPack>(SRoomPack.class);
util.exportExcel(response, list, "包房套餐关系数据");
}
......@@ -72,8 +73,8 @@ public class RoomPackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:add')")
@Log(title = "包房套餐关系", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody RoomPack roomPack) {
return toAjax(roomPackService.insertRoomPack(roomPack));
public AjaxResult add(@RequestBody SRoomPack SRoomPack) {
return toAjax(roomPackService.insertRoomPack(SRoomPack));
}
/**
......@@ -82,8 +83,8 @@ public class RoomPackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:edit')")
@Log(title = "包房套餐关系", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody RoomPack roomPack) {
return toAjax(roomPackService.updateRoomPack(roomPack));
public AjaxResult edit(@RequestBody SRoomPack SRoomPack) {
return toAjax(roomPackService.updateRoomPack(SRoomPack));
}
/**
......@@ -95,4 +96,13 @@ public class RoomPackController extends BaseController {
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(roomPackService.deleteRoomPackByIds(ids));
}
/**
* 获取包房套餐关系详细信息
*/
@PreAuthorize("@ss.hasPermi('system:pack:query')")
@GetMapping(value = "/getPackId/{id}")
public R<List<SRoomPack>> getPackId(@PathVariable("id") Long id) {
return R.ok(roomPackService.selectRoomPackByPackId(id));
}
}
share-common/src/main/java/share/common/enums/CouponTypeEnum.java
package share.common.enums;
import java.util.ArrayList;
import java.util.List;
/**
* @Author wwl
* @Date 2023/10/19 17:06
*/
public enum CouponTypeEnum {
//1：折扣券，2，团购券，3：满减券，4：核销券，5：充值送金额,6:套餐劵
DISCOUNT(1,"1","折扣券"),
CASH(2,"2","满减券（现金券）"),
DURATION(3,"3","时长券");
DURATION(3, "3", "时长券"),
VERIFICATION(4, "4", "核销券"),
RECHARGE(5, "5", "充值送金额"),
PACKAGE(6, "6", "套餐劵"),
;
private Integer code;
private String value;
......
share-front/src/main/java/share/web/controller/system/PackController.java
......@@ -9,7 +9,7 @@ import share.common.core.domain.AjaxResult;
import share.common.core.page.TableDataInfo;
import share.common.enums.BusinessType;
import share.common.utils.poi.ExcelUtil;
import share.system.domain.Pack;
import share.system.domain.SPack;
import share.system.service.IPackService;
import javax.servlet.http.HttpServletResponse;
......@@ -32,9 +32,9 @@ public class PackController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:pack:list')")
@GetMapping("/list")
public TableDataInfo list(Pack pack) {
public TableDataInfo list(SPack SPack) {
startPage();
List<Pack> list = packService.selectPackList(pack);
List<SPack> list = packService.selectPackList(SPack);
return getDataTable(list);
}
......@@ -44,9 +44,9 @@ public class PackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:export')")
@Log(title = "套餐", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Pack pack) {
List<Pack> list = packService.selectPackList(pack);
ExcelUtil<Pack> util = new ExcelUtil<Pack>(Pack.class);
public void export(HttpServletResponse response, SPack SPack) {
List<SPack> list = packService.selectPackList(SPack);
ExcelUtil<SPack> util = new ExcelUtil<SPack>(SPack.class);
util.exportExcel(response, list, "套餐数据");
}
......@@ -65,8 +65,8 @@ public class PackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:add')")
@Log(title = "套餐", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Pack pack) {
return toAjax(packService.insertPack(pack));
public AjaxResult add(@RequestBody SPack SPack) {
return toAjax(packService.insertPack(SPack));
}
/**
......@@ -75,8 +75,8 @@ public class PackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:edit')")
@Log(title = "套餐", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Pack pack) {
return toAjax(packService.updatePack(pack));
public AjaxResult edit(@RequestBody SPack SPack) {
return toAjax(packService.updatePack(SPack));
}
/**
......
share-front/src/main/java/share/web/controller/system/RoomPackController.java
......@@ -17,7 +17,7 @@ import share.common.annotation.Log;
import share.common.core.controller.BaseController;
import share.common.core.domain.AjaxResult;
import share.common.enums.BusinessType;
import share.system.domain.RoomPack;
import share.system.domain.SRoomPack;
import share.system.service.IRoomPackService;
import share.common.utils.poi.ExcelUtil;
import share.common.core.page.TableDataInfo;
......@@ -39,9 +39,9 @@ public class RoomPackController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:pack:list')")
@GetMapping("/list")
public TableDataInfo list(RoomPack roomPack) {
public TableDataInfo list(SRoomPack SRoomPack) {
startPage();
List<RoomPack> list = roomPackService.selectRoomPackList(roomPack);
List<SRoomPack> list = roomPackService.selectRoomPackList(SRoomPack);
return getDataTable(list);
}
......@@ -51,9 +51,9 @@ public class RoomPackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:export')")
@Log(title = "包房套餐关系", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RoomPack roomPack) {
List<RoomPack> list = roomPackService.selectRoomPackList(roomPack);
ExcelUtil<RoomPack> util = new ExcelUtil<RoomPack>(RoomPack.class);
public void export(HttpServletResponse response, SRoomPack SRoomPack) {
List<SRoomPack> list = roomPackService.selectRoomPackList(SRoomPack);
ExcelUtil<SRoomPack> util = new ExcelUtil<SRoomPack>(SRoomPack.class);
util.exportExcel(response, list, "包房套餐关系数据");
}
......@@ -72,8 +72,8 @@ public class RoomPackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:add')")
@Log(title = "包房套餐关系", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody RoomPack roomPack) {
return toAjax(roomPackService.insertRoomPack(roomPack));
public AjaxResult add(@RequestBody SRoomPack SRoomPack) {
return toAjax(roomPackService.insertRoomPack(SRoomPack));
}
/**
......@@ -82,8 +82,8 @@ public class RoomPackController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:pack:edit')")
@Log(title = "包房套餐关系", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody RoomPack roomPack) {
return toAjax(roomPackService.updateRoomPack(roomPack));
public AjaxResult edit(@RequestBody SRoomPack SRoomPack) {
return toAjax(roomPackService.updateRoomPack(SRoomPack));
}
/**
......
share-front/src/main/java/share/web/controller/system/SRoomController.java
......@@ -3,25 +3,19 @@ package share.web.controller.system;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import share.common.annotation.Log;
import share.common.core.controller.BaseController;
import share.common.core.domain.AjaxResult;
import share.common.core.domain.R;
import share.common.enums.BusinessType;
import share.system.domain.Pack;
import share.system.domain.SPack;
import share.system.domain.SRoom;
import share.system.domain.vo.RoomStatusVo;
import share.system.domain.vo.SRoomVo;
import share.system.service.ISRoomService;
import share.common.utils.poi.ExcelUtil;
import share.common.core.page.TableDataInfo;
import share.system.service.RoomStatusService;
......@@ -92,7 +86,7 @@ public class SRoomController extends BaseController {
*/
@ApiOperation(value = "通过房间ID查询套餐")
@RequestMapping(value = "/roomId", method = RequestMethod.GET)
public R<List<Pack>> getPackByRoomId(@RequestParam("id") Long id) {
public R<List<SPack>> getPackByRoomId(@RequestParam("id") Long id) {
return R.ok(sRoomService.getPackByRoomId(id));
}
......
share-system/src/main/java/share/system/domain/Pack.java → share-system/src/main/java/share/system/domain/SPack.java
......@@ -6,8 +6,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import share.common.annotation.Excel;
import share.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
/**
......@@ -17,7 +15,7 @@ import lombok.Data;
* @date 2023-10-31
*/
@Data
public class Pack extends BaseEntity {
public class SPack extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
......
share-system/src/main/java/share/system/domain/SRoom.java
......@@ -76,9 +76,9 @@ public class SRoom extends BaseEntity
private String params2;
/**
* 套餐ID数组
* 套餐ID
*/
@TableField(exist = false)
private Long[] packIds;
private String packIds;
}
share-system/src/main/java/share/system/domain/RoomPack.java → share-system/src/main/java/share/system/domain/SRoomPack.java
......@@ -4,8 +4,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import share.common.annotation.Excel;
import share.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
/**
......@@ -15,7 +13,7 @@ import lombok.Data;
* @date 2023-10-31
*/
@Data
public class RoomPack extends BaseEntity {
public class SRoomPack extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
......
share-system/src/main/java/share/system/domain/vo/SRoomVo.java
package share.system.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -81,6 +82,12 @@ public class SRoomVo extends BaseEntity
@ApiModelProperty(value = "其他可能硬件接入参数(备用2)")
private String params2;
/**
* 套餐ID
*/
@TableField(exist = false)
private String packIds;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
share-system/src/main/java/share/system/mapper/PackMapper.java
......@@ -3,7 +3,7 @@ package share.system.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import share.system.domain.Pack;
import share.system.domain.SPack;
/**
* 套餐Mapper接口
......@@ -11,38 +11,38 @@ import share.system.domain.Pack;
* @author wuwenlong
* @date 2023-10-31
*/
public interface PackMapper extends BaseMapper<Pack> {
public interface PackMapper extends BaseMapper<SPack> {
/**
* 查询套餐
*
* @param id 套餐主键
* @return 套餐
*/
public Pack selectPackById(Long id);
public SPack selectPackById(Long id);
/**
* 查询套餐列表
*
* @param pack 套餐
* @param SPack 套餐
* @return 套餐集合
*/
public List<Pack> selectPackList(Pack pack);
public List<SPack> selectPackList(SPack SPack);
/**
* 新增套餐
*
* @param pack 套餐
* @param SPack 套餐
* @return 结果
*/
public int insertPack(Pack pack);
public int insertPack(SPack SPack);
/**
* 修改套餐
*
* @param pack 套餐
* @param SPack 套餐
* @return 结果
*/
public int updatePack(Pack pack);
public int updatePack(SPack SPack);
/**
* 删除套餐
......
share-system/src/main/java/share/system/mapper/RoomPackMapper.java
......@@ -3,7 +3,7 @@ package share.system.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import share.system.domain.RoomPack;
import share.system.domain.SRoomPack;
/**
* 包房套餐关系Mapper接口
......@@ -11,38 +11,38 @@ import share.system.domain.RoomPack;
* @author wuwenlong
* @date 2023-10-31
*/
public interface RoomPackMapper extends BaseMapper<RoomPack> {
public interface RoomPackMapper extends BaseMapper<SRoomPack> {
/**
* 查询包房套餐关系
*
* @param id 包房套餐关系主键
* @return 包房套餐关系
*/
public RoomPack selectRoomPackById(Long id);
public SRoomPack selectRoomPackById(Long id);
/**
* 查询包房套餐关系列表
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 包房套餐关系集合
*/
public List<RoomPack> selectRoomPackList(RoomPack roomPack);
public List<SRoomPack> selectRoomPackList(SRoomPack SRoomPack);
/**
* 新增包房套餐关系
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 结果
*/
public int insertRoomPack(RoomPack roomPack);
public int insertRoomPack(SRoomPack SRoomPack);
/**
* 修改包房套餐关系
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 结果
*/
public int updateRoomPack(RoomPack roomPack);
public int updateRoomPack(SRoomPack SRoomPack);
/**
* 删除包房套餐关系
......
share-system/src/main/java/share/system/service/IPackService.java
......@@ -3,7 +3,7 @@ package share.system.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import share.system.domain.Pack;
import share.system.domain.SPack;
/**
* 套餐Service接口
......@@ -11,38 +11,38 @@ import share.system.domain.Pack;
* @author wuwenlong
* @date 2023-10-31
*/
public interface IPackService extends IService<Pack> {
public interface IPackService extends IService<SPack> {
/**
* 查询套餐
*
* @param id 套餐主键
* @return 套餐
*/
public Pack selectPackById(Long id);
public SPack selectPackById(Long id);
/**
* 查询套餐列表
*
* @param pack 套餐
* @param SPack 套餐
* @return 套餐集合
*/
public List<Pack> selectPackList(Pack pack);
public List<SPack> selectPackList(SPack SPack);
/**
* 新增套餐
*
* @param pack 套餐
* @param SPack 套餐
* @return 结果
*/
public int insertPack(Pack pack);
public int insertPack(SPack SPack);
/**
* 修改套餐
*
* @param pack 套餐
* @param SPack 套餐
* @return 结果
*/
public int updatePack(Pack pack);
public int updatePack(SPack SPack);
/**
* 批量删除套餐
......@@ -60,5 +60,5 @@ public interface IPackService extends IService<Pack> {
*/
public int deletePackById(Long id);
List<Pack> selectPackListByIds(List<Long> packIds);
List<SPack> selectPackListByIds(List<Long> packIds);
}
share-system/src/main/java/share/system/service/IRoomPackService.java
......@@ -3,7 +3,7 @@ package share.system.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import share.system.domain.RoomPack;
import share.system.domain.SRoomPack;
/**
* 包房套餐关系Service接口
......@@ -11,38 +11,38 @@ import share.system.domain.RoomPack;
* @author wuwenlong
* @date 2023-10-31
*/
public interface IRoomPackService extends IService<RoomPack> {
public interface IRoomPackService extends IService<SRoomPack> {
/**
* 查询包房套餐关系
*
* @param id 包房套餐关系主键
* @return 包房套餐关系
*/
public RoomPack selectRoomPackById(Long id);
public SRoomPack selectRoomPackById(Long id);
/**
* 查询包房套餐关系列表
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 包房套餐关系集合
*/
public List<RoomPack> selectRoomPackList(RoomPack roomPack);
public List<SRoomPack> selectRoomPackList(SRoomPack SRoomPack);
/**
* 新增包房套餐关系
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 结果
*/
public int insertRoomPack(RoomPack roomPack);
public int insertRoomPack(SRoomPack SRoomPack);
/**
* 修改包房套餐关系
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 结果
*/
public int updateRoomPack(RoomPack roomPack);
public int updateRoomPack(SRoomPack SRoomPack);
/**
* 批量删除包房套餐关系
......@@ -63,4 +63,6 @@ public interface IRoomPackService extends IService<RoomPack> {
List<Long> selectPackListByRoomId(Long id);
int deleteRoomPackByRoomId(Long id);
List<SRoomPack> selectRoomPackByPackId(Long id);
}
share-system/src/main/java/share/system/service/ISRoomService.java
......@@ -3,7 +3,7 @@ package share.system.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import share.system.domain.Pack;
import share.system.domain.SPack;
import share.system.domain.SRoom;
import share.system.domain.vo.SRoomVo;
......@@ -85,5 +85,5 @@ public interface ISRoomService extends IService<SRoom>
String openDoor(Long id);
List<Pack> getPackByRoomId(Long id);
List<SPack> getPackByRoomId(Long id);
}
share-system/src/main/java/share/system/service/impl/PackServiceImpl.java
......@@ -2,12 +2,13 @@ package share.system.service.impl;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import share.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import share.system.mapper.PackMapper;
import share.system.domain.Pack;
import share.system.domain.SPack;
import share.system.service.IPackService;
/**
......@@ -17,7 +18,7 @@ import share.system.service.IPackService;
* @date 2023-10-31
*/
@Service
public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements IPackService {
public class PackServiceImpl extends ServiceImpl<PackMapper, SPack> implements IPackService {
@Autowired
private PackMapper packMapper;
......@@ -28,43 +29,43 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements IP
* @return 套餐
*/
@Override
public Pack selectPackById(Long id) {
public SPack selectPackById(Long id) {
return packMapper.selectPackById(id);
}
/**
* 查询套餐列表
*
* @param pack 套餐
* @param SPack 套餐
* @return 套餐
*/
@Override
public List<Pack> selectPackList(Pack pack) {
return packMapper.selectPackList(pack);
public List<SPack> selectPackList(SPack SPack) {
return packMapper.selectPackList(SPack);
}
/**
* 新增套餐
*
* @param pack 套餐
* @param SPack 套餐
* @return 结果
*/
@Override
public int insertPack(Pack pack) {
pack.setCreateTime(DateUtils.getNowDate());
return packMapper.insertPack(pack);
public int insertPack(SPack SPack) {
SPack.setCreateTime(DateUtils.getNowDate());
return packMapper.insertPack(SPack);
}
/**
* 修改套餐
*
* @param pack 套餐
* @param SPack 套餐
* @return 结果
*/
@Override
public int updatePack(Pack pack) {
pack.setUpdateTime(DateUtils.getNowDate());
return packMapper.updatePack(pack);
public int updatePack(SPack SPack) {
SPack.setUpdateTime(DateUtils.getNowDate());
return packMapper.updatePack(SPack);
}
/**
......@@ -90,7 +91,9 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements IP
}
@Override
public List<Pack> selectPackListByIds(List<Long> packIds) {
return packMapper.selectBatchIds(packIds);
public List<SPack> selectPackListByIds(List<Long> packIds) {
LambdaQueryWrapper<SPack> queryWrapper = new LambdaQueryWrapper();
queryWrapper.in(SPack::getId, packIds);
return packMapper.selectList(queryWrapper);
}
}
share-system/src/main/java/share/system/service/impl/RoomPackServiceImpl.java
package share.system.service.impl;
import java.sql.Wrapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import share.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import share.system.domain.SCleanRecords;
import share.system.mapper.RoomPackMapper;
import share.system.domain.RoomPack;
import share.system.domain.SRoomPack;
import share.system.service.IRoomPackService;
/**
......@@ -21,7 +18,7 @@ import share.system.service.IRoomPackService;
* @date 2023-10-31
*/
@Service
public class RoomPackServiceImpl extends ServiceImpl<RoomPackMapper, RoomPack> implements IRoomPackService {
public class RoomPackServiceImpl extends ServiceImpl<RoomPackMapper, SRoomPack> implements IRoomPackService {
@Autowired
private RoomPackMapper roomPackMapper;
......@@ -32,43 +29,43 @@ public class RoomPackServiceImpl extends ServiceImpl<RoomPackMapper, RoomPack> i
* @return 包房套餐关系
*/
@Override
public RoomPack selectRoomPackById(Long id) {
public SRoomPack selectRoomPackById(Long id) {
return roomPackMapper.selectRoomPackById(id);
}
/**
* 查询包房套餐关系列表
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 包房套餐关系
*/
@Override
public List<RoomPack> selectRoomPackList(RoomPack roomPack) {
return roomPackMapper.selectRoomPackList(roomPack);
public List<SRoomPack> selectRoomPackList(SRoomPack SRoomPack) {
return roomPackMapper.selectRoomPackList(SRoomPack);
}
/**
* 新增包房套餐关系
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 结果
*/
@Override
public int insertRoomPack(RoomPack roomPack) {
roomPack.setCreateTime(DateUtils.getNowDate());
return roomPackMapper.insertRoomPack(roomPack);
public int insertRoomPack(SRoomPack SRoomPack) {
SRoomPack.setCreateTime(DateUtils.getNowDate());
return roomPackMapper.insertRoomPack(SRoomPack);
}
/**
* 修改包房套餐关系
*
* @param roomPack 包房套餐关系
* @param SRoomPack 包房套餐关系
* @return 结果
*/
@Override
public int updateRoomPack(RoomPack roomPack) {
roomPack.setUpdateTime(DateUtils.getNowDate());
return roomPackMapper.updateRoomPack(roomPack);
public int updateRoomPack(SRoomPack SRoomPack) {
SRoomPack.setUpdateTime(DateUtils.getNowDate());
return roomPackMapper.updateRoomPack(SRoomPack);
}
/**
......@@ -100,8 +97,16 @@ public class RoomPackServiceImpl extends ServiceImpl<RoomPackMapper, RoomPack> i
@Override
public int deleteRoomPackByRoomId(Long id) {
LambdaQueryWrapper<RoomPack> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RoomPack::getRoomId, id);
LambdaQueryWrapper<SRoomPack> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SRoomPack::getRoomId, id);
return roomPackMapper.delete(queryWrapper);
}
@Override
public List<SRoomPack> selectRoomPackByPackId(Long id) {
LambdaQueryWrapper<SRoomPack> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SRoomPack::getPackId, id);
return roomPackMapper.selectList(queryWrapper);
}
}
share-system/src/main/java/share/system/service/impl/SRoomServiceImpl.java
......@@ -11,8 +11,8 @@ import share.common.enums.RoleTypeEnum;
import share.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import share.system.domain.Pack;
import share.system.domain.RoomPack;
import share.system.domain.SPack;
import share.system.domain.SRoomPack;
import share.system.domain.SConsumer;
import share.system.domain.vo.FrontTokenComponent;
import share.system.domain.vo.SRoomVo;
......@@ -54,6 +54,7 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
public SRoomVo selectSRoomById(Long id)
{
SRoom sRoom = sRoomMapper.selectSRoomById(id);
sRoom.setPackIds(roomPackService.selectPackListByRoomId(id).stream().map(String::valueOf).collect(Collectors.joining(",")));
if(Objects.nonNull(sRoom)&&sRoom.getId()!=null){
return convertVoList(new ArrayList<SRoom>(){{add(sRoom);}}).get(0);
}
......@@ -70,6 +71,9 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
public List<SRoomVo> selectSRoomList(SRoom sRoom)
{
List<SRoom> roomList = sRoomMapper.selectSRoomList(sRoom);
roomList.forEach(o -> {
o.setPackIds(roomPackService.selectPackListByRoomId(o.getId()).stream().map(String::valueOf).collect(Collectors.joining(",")));
});
return convertVoList(roomList);
}
......@@ -101,25 +105,32 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
@Override
public int insertSRoom(SRoom sRoom)
{
int i = 0;
try {
sRoom.setCreateTime(DateUtils.getNowDate());
i = sRoomMapper.insertSRoom(sRoom);
//判断套餐ID
if (sRoom.getPackIds().length > 0) {
List<Pack> packList = packService.selectPackListByIds(Arrays.asList(sRoom.getPackIds()));
if (CollectionUtils.isEmpty(packList)) {
if (!sRoom.getPackIds().isEmpty()) {
//String 转Long
List<SPack> SPackList = packService.selectPackListByIds(Arrays.asList(sRoom.getPackIds().split(",")).stream().map(Long::valueOf).collect(Collectors.toList()));
if (CollectionUtils.isEmpty(SPackList)) {
throw new RuntimeException("套餐不存在");
}
List<Long> list = Arrays.asList(sRoom.getPackIds());
List<RoomPack> roomPackList = new ArrayList<>();
List<Long> list = Arrays.asList(sRoom.getPackIds().split(",")).stream().map(Long::valueOf).collect(Collectors.toList());
List<SRoomPack> SRoomPackList = new ArrayList<>();
list.stream().forEach(o -> {
RoomPack roomPack = new RoomPack();
roomPack.setPackId(o);
roomPack.setRoomId(sRoom.getId());
roomPack.setCreateTime(DateUtils.getNowDate());
roomPackList.add(roomPack);
SRoomPack SRoomPack = new SRoomPack();
SRoomPack.setPackId(o);
SRoomPack.setRoomId(sRoom.getId());
SRoomPack.setCreateTime(DateUtils.getNowDate());
SRoomPackList.add(SRoomPack);
});
roomPackService.saveBatch(roomPackList);
roomPackService.saveBatch(SRoomPackList);
}
sRoom.setCreateTime(DateUtils.getNowDate());
return sRoomMapper.insertSRoom(sRoom);
} catch (Exception e) {
throw new RuntimeException("新增房间失败");
}
return i;
}
/**
......@@ -132,24 +143,24 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
public int updateSRoom(SRoom sRoom)
{
//判断套餐ID
if (sRoom.getPackIds().length > 0) {
if (!sRoom.getPackIds().isEmpty()) {
//判断套餐ID
List<Pack> packList = packService.selectPackListByIds(Arrays.asList(sRoom.getPackIds()));
if (CollectionUtils.isEmpty(packList)) {
List<SPack> SPackList = packService.selectPackListByIds(Arrays.asList(sRoom.getPackIds().split(",")).stream().map(Long::valueOf).collect(Collectors.toList()));
if (CollectionUtils.isEmpty(SPackList)) {
throw new RuntimeException("套餐不存在");
}
//删除原有套餐
roomPackService.deleteRoomPackByRoomId(sRoom.getId());
List<Long> list = Arrays.asList(sRoom.getPackIds());
List<RoomPack> roomPackList = new ArrayList<>();
List<Long> list = Arrays.asList(sRoom.getPackIds().split(",")).stream().map(Long::valueOf).collect(Collectors.toList());
List<SRoomPack> SRoomPackList = new ArrayList<>();
list.stream().forEach(o -> {
RoomPack roomPack = new RoomPack();
roomPack.setPackId(o);
roomPack.setRoomId(sRoom.getId());
roomPack.setCreateTime(DateUtils.getNowDate());
roomPackList.add(roomPack);
SRoomPack SRoomPack = new SRoomPack();
SRoomPack.setPackId(o);
SRoomPack.setRoomId(sRoom.getId());
SRoomPack.setCreateTime(DateUtils.getNowDate());
SRoomPackList.add(SRoomPack);
});
roomPackService.saveBatch(roomPackList);
roomPackService.saveBatch(SRoomPackList);
}
sRoom.setUpdateTime(DateUtils.getNowDate());
return sRoomMapper.updateSRoom(sRoom);
......@@ -223,7 +234,7 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
}
@Override
public List<Pack> getPackByRoomId(Long id) {
public List<SPack> getPackByRoomId(Long id) {
List<Long> packIds = roomPackService.selectPackListByRoomId(id);
return packService.selectPackListByIds(packIds);
}
......
share-system/src/main/resources/mapper/system/PackMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="share.system.mapper.PackMapper">
<resultMap type="Pack" id="PackResult">
<resultMap type="SPack" id="PackResult">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="duration" column="duration"/>
......@@ -33,7 +33,7 @@
from s_pack
</sql>
<select id="selectPackList" parameterType="Pack" resultMap="PackResult">
<select id="selectPackList" parameterType="SPack" resultMap="PackResult">
<include refid="selectPackVo"/>
<where>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
......@@ -51,7 +51,7 @@
where id = #{id}
</select>
<insert id="insertPack" parameterType="Pack" useGeneratedKeys="true" keyProperty="id">
<insert id="insertPack" parameterType="SPack" useGeneratedKeys="true" keyProperty="id">
insert into s_pack
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
......@@ -79,7 +79,7 @@
</trim>
</insert>
<update id="updatePack" parameterType="Pack">
<update id="updatePack" parameterType="SPack">
update s_pack
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
......
share-system/src/main/resources/mapper/system/RoomPackMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="share.system.mapper.RoomPackMapper">
<resultMap type="RoomPack" id="RoomPackResult">
<resultMap type="SRoomPack" id="RoomPackResult">
<result property="id" column="id"/>
<result property="roomId" column="room_id"/>
<result property="packId" column="pack_id"/>
......@@ -27,7 +27,7 @@
from s_room_pack
</sql>
<select id="selectRoomPackList" parameterType="RoomPack" resultMap="RoomPackResult">
<select id="selectRoomPackList" parameterType="SRoomPack" resultMap="RoomPackResult">
<include refid="selectRoomPackVo"/>
<where>
<if test="roomId != null ">and room_id = #{roomId}</if>
......@@ -45,7 +45,7 @@
where room_id = #{roomId}
</select>
<insert id="insertRoomPack" parameterType="RoomPack" useGeneratedKeys="true" keyProperty="id">
<insert id="insertRoomPack" parameterType="SRoomPack" useGeneratedKeys="true" keyProperty="id">
insert into s_room_pack
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="roomId != null">room_id,</if>
......@@ -67,7 +67,7 @@
</trim>
</insert>
<update id="updateRoomPack" parameterType="RoomPack">
<update id="updateRoomPack" parameterType="SRoomPack">
update s_room_pack
<trim prefix="SET" suffixOverrides=",">
<if test="roomId != null">room_id = #{roomId},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment