From 0a7d38d6e51d0dde0d3d89daa79db1f5a1223e51 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 19 Mar 2025 10:19:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 113 +++++++----- .../controller/MassageVipComboController.java | 171 +++++++++++++++++++ .../massageVipCombo/entity/MassageVipCombo.java | 67 ++++++++ .../mapper/MassageVipComboMapper.java | 17 ++ .../mapper/xml/MassageVipComboMapper.xml | 5 + .../service/IMassageVipComboService.java | 14 ++ .../service/impl/MassageVipComboServiceImpl.java | 19 +++ .../massageVipCombo/vue/MassageVipComboList.vue | 190 +++++++++++++++++++++ .../vue/modules/MassageVipComboForm.vue | 119 +++++++++++++ .../modules/MassageVipComboModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/MassageVipComboModal.vue | 60 +++++++ .../massageVipCombo/vue3/MassageVipCombo.api.ts | 61 +++++++ .../massageVipCombo/vue3/MassageVipCombo.data.ts | 56 ++++++ .../massageVipCombo/vue3/MassageVipComboList.vue | 162 ++++++++++++++++++ .../vue3/components/MassageVipComboModal.vue | 58 +++++++ .../controller/MassageVipRecordController.java | 171 +++++++++++++++++++ .../massageVipRecord/entity/MassageVipRecord.java | 62 +++++++ .../mapper/MassageVipRecordMapper.java | 17 ++ .../mapper/xml/MassageVipRecordMapper.xml | 5 + .../service/IMassageVipRecordService.java | 14 ++ .../service/impl/MassageVipRecordServiceImpl.java | 19 +++ .../massageVipRecord/vue/MassageVipRecordList.vue | 183 ++++++++++++++++++++ .../vue/modules/MassageVipRecordForm.vue | 114 +++++++++++++ .../modules/MassageVipRecordModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/MassageVipRecordModal.vue | 60 +++++++ .../massageVipRecord/vue3/MassageVipRecord.api.ts | 61 +++++++ .../massageVipRecord/vue3/MassageVipRecord.data.ts | 46 +++++ .../massageVipRecord/vue3/MassageVipRecordList.vue | 162 ++++++++++++++++++ .../vue3/components/MassageVipRecordModal.vue | 58 +++++++ .../api/massageController/ShareController.java | 2 +- .../api/massageController/VipController.java | 44 +++++ .../org/jeecg/modules/apiService/VipService.java | 18 ++ .../modules/apiService/impl/VipServiceImpl.java | 68 ++++++++ 33 files changed, 2342 insertions(+), 42 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/controller/MassageVipComboController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/entity/MassageVipCombo.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/MassageVipComboMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/xml/MassageVipComboMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/IMassageVipComboService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/impl/MassageVipComboServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/MassageVipComboList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipComboList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/components/MassageVipComboModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/controller/MassageVipRecordController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/entity/MassageVipRecord.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/MassageVipRecordMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/xml/MassageVipRecordMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/IMassageVipRecordService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/impl/MassageVipRecordServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/MassageVipRecordList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecordList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/components/MassageVipRecordModal.vue create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/VipController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f2284f2..d61532c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,16 +2,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -224,17 +254,18 @@ - - + - + @@ -243,70 +274,70 @@ - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/controller/MassageVipComboController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/controller/MassageVipComboController.java new file mode 100644 index 0000000..8c53fe8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/controller/MassageVipComboController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.massageVipCombo.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +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.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import org.jeecg.modules.massageVipCombo.service.IMassageVipComboService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 会员充值套餐表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +@Api(tags="会员充值套餐表") +@RestController +@RequestMapping("/massageVipCombo/massageVipCombo") +@Slf4j +public class MassageVipComboController extends JeecgController { + @Autowired + private IMassageVipComboService massageVipComboService; + + /** + * 分页列表查询 + * + * @param massageVipCombo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "会员充值套餐表-分页列表查询") + @ApiOperation(value="会员充值套餐表-分页列表查询", notes="会员充值套餐表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(MassageVipCombo massageVipCombo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(massageVipCombo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = massageVipComboService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param massageVipCombo + * @return + */ + @AutoLog(value = "会员充值套餐表-添加") + @ApiOperation(value="会员充值套餐表-添加", notes="会员充值套餐表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody MassageVipCombo massageVipCombo) { + massageVipComboService.save(massageVipCombo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param massageVipCombo + * @return + */ + @AutoLog(value = "会员充值套餐表-编辑") + @ApiOperation(value="会员充值套餐表-编辑", notes="会员充值套餐表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody MassageVipCombo massageVipCombo) { + massageVipComboService.updateById(massageVipCombo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "会员充值套餐表-通过id删除") + @ApiOperation(value="会员充值套餐表-通过id删除", notes="会员充值套餐表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + massageVipComboService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "会员充值套餐表-批量删除") + @ApiOperation(value="会员充值套餐表-批量删除", notes="会员充值套餐表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.massageVipComboService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "会员充值套餐表-通过id查询") + @ApiOperation(value="会员充值套餐表-通过id查询", notes="会员充值套餐表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + MassageVipCombo massageVipCombo = massageVipComboService.getById(id); + if(massageVipCombo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(massageVipCombo); + } + + /** + * 导出excel + * + * @param request + * @param massageVipCombo + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MassageVipCombo massageVipCombo) { + return super.exportXls(request, massageVipCombo, MassageVipCombo.class, "会员充值套餐表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, MassageVipCombo.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/entity/MassageVipCombo.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/entity/MassageVipCombo.java new file mode 100644 index 0000000..4088ecd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/entity/MassageVipCombo.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.massageVipCombo.entity; + +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 lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 会员充值套餐表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +@Data +@TableName("massage_vip_combo") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="massage_vip_combo对象", description="会员充值套餐表") +public class MassageVipCombo implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**会员名称*/ + @Excel(name = "会员名称", width = 15) + @ApiModelProperty(value = "会员名称") + private java.lang.String title; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "vip_type") + @Dict(dicCode = "vip_type") + @ApiModelProperty(value = "类型") + private java.lang.String type; + /**排序编号*/ + @Excel(name = "排序编号", width = 15) + @ApiModelProperty(value = "排序编号") + private java.lang.Integer orderNo; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/MassageVipComboMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/MassageVipComboMapper.java new file mode 100644 index 0000000..a79f17e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/MassageVipComboMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.massageVipCombo.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 会员充值套餐表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +public interface MassageVipComboMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/xml/MassageVipComboMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/xml/MassageVipComboMapper.xml new file mode 100644 index 0000000..c66a650 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/mapper/xml/MassageVipComboMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/IMassageVipComboService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/IMassageVipComboService.java new file mode 100644 index 0000000..651e963 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/IMassageVipComboService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.massageVipCombo.service; + +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 会员充值套餐表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +public interface IMassageVipComboService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/impl/MassageVipComboServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/impl/MassageVipComboServiceImpl.java new file mode 100644 index 0000000..e3f4fe9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/service/impl/MassageVipComboServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.massageVipCombo.service.impl; + +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import org.jeecg.modules.massageVipCombo.mapper.MassageVipComboMapper; +import org.jeecg.modules.massageVipCombo.service.IMassageVipComboService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 会员充值套餐表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +@Service +public class MassageVipComboServiceImpl extends ServiceImpl implements IMassageVipComboService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/MassageVipComboList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/MassageVipComboList.vue new file mode 100644 index 0000000..90ee559 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/MassageVipComboList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboForm.vue new file mode 100644 index 0000000..e5df494 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.Style#Drawer.vue new file mode 100644 index 0000000..fa3e55f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.vue new file mode 100644 index 0000000..b756514 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue/modules/MassageVipComboModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.api.ts new file mode 100644 index 0000000..0458731 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/massageVipCombo/massageVipCombo/list', + save='/massageVipCombo/massageVipCombo/add', + edit='/massageVipCombo/massageVipCombo/edit', + deleteOne = '/massageVipCombo/massageVipCombo/delete', + deleteBatch = '/massageVipCombo/massageVipCombo/deleteBatch', + importExcel = '/massageVipCombo/massageVipCombo/importExcel', + exportXls = '/massageVipCombo/massageVipCombo/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.data.ts new file mode 100644 index 0000000..112f9b5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipCombo.data.ts @@ -0,0 +1,56 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '会员名称', + align:"center", + dataIndex: 'title' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '排序编号', + align:"center", + dataIndex: 'orderNo' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '会员名称', + field: 'title', + component: 'Input', + }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"vip_type" + }, + }, + { + label: '排序编号', + field: 'orderNo', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipComboList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipComboList.vue new file mode 100644 index 0000000..13495e3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/MassageVipComboList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/components/MassageVipComboModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/components/MassageVipComboModal.vue new file mode 100644 index 0000000..1a186ae --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipCombo/vue3/components/MassageVipComboModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/controller/MassageVipRecordController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/controller/MassageVipRecordController.java new file mode 100644 index 0000000..628c98c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/controller/MassageVipRecordController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.massageVipRecord.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +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.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import org.jeecg.modules.massageVipRecord.service.IMassageVipRecordService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 会员充值记录表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +@Api(tags="会员充值记录表") +@RestController +@RequestMapping("/massageVipRecord/massageVipRecord") +@Slf4j +public class MassageVipRecordController extends JeecgController { + @Autowired + private IMassageVipRecordService massageVipRecordService; + + /** + * 分页列表查询 + * + * @param massageVipRecord + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "会员充值记录表-分页列表查询") + @ApiOperation(value="会员充值记录表-分页列表查询", notes="会员充值记录表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(MassageVipRecord massageVipRecord, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(massageVipRecord, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = massageVipRecordService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param massageVipRecord + * @return + */ + @AutoLog(value = "会员充值记录表-添加") + @ApiOperation(value="会员充值记录表-添加", notes="会员充值记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody MassageVipRecord massageVipRecord) { + massageVipRecordService.save(massageVipRecord); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param massageVipRecord + * @return + */ + @AutoLog(value = "会员充值记录表-编辑") + @ApiOperation(value="会员充值记录表-编辑", notes="会员充值记录表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody MassageVipRecord massageVipRecord) { + massageVipRecordService.updateById(massageVipRecord); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "会员充值记录表-通过id删除") + @ApiOperation(value="会员充值记录表-通过id删除", notes="会员充值记录表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + massageVipRecordService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "会员充值记录表-批量删除") + @ApiOperation(value="会员充值记录表-批量删除", notes="会员充值记录表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.massageVipRecordService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "会员充值记录表-通过id查询") + @ApiOperation(value="会员充值记录表-通过id查询", notes="会员充值记录表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + MassageVipRecord massageVipRecord = massageVipRecordService.getById(id); + if(massageVipRecord==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(massageVipRecord); + } + + /** + * 导出excel + * + * @param request + * @param massageVipRecord + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MassageVipRecord massageVipRecord) { + return super.exportXls(request, massageVipRecord, MassageVipRecord.class, "会员充值记录表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, MassageVipRecord.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/entity/MassageVipRecord.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/entity/MassageVipRecord.java new file mode 100644 index 0000000..3ac7e57 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/entity/MassageVipRecord.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.massageVipRecord.entity; + +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 lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 会员充值记录表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +@Data +@TableName("massage_vip_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="massage_vip_record对象", description="会员充值记录表") +public class MassageVipRecord implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**金额*/ + @Excel(name = "金额", width = 15) + @ApiModelProperty(value = "金额") + private java.math.BigDecimal amount; + /**关联用户*/ + @Excel(name = "关联用户", width = 15) + @ApiModelProperty(value = "关联用户") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/MassageVipRecordMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/MassageVipRecordMapper.java new file mode 100644 index 0000000..7dafeaa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/MassageVipRecordMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.massageVipRecord.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 会员充值记录表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +public interface MassageVipRecordMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/xml/MassageVipRecordMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/xml/MassageVipRecordMapper.xml new file mode 100644 index 0000000..8695327 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/mapper/xml/MassageVipRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/IMassageVipRecordService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/IMassageVipRecordService.java new file mode 100644 index 0000000..22d7b16 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/IMassageVipRecordService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.massageVipRecord.service; + +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 会员充值记录表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +public interface IMassageVipRecordService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/impl/MassageVipRecordServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/impl/MassageVipRecordServiceImpl.java new file mode 100644 index 0000000..6a872fb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/service/impl/MassageVipRecordServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.massageVipRecord.service.impl; + +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import org.jeecg.modules.massageVipRecord.mapper.MassageVipRecordMapper; +import org.jeecg.modules.massageVipRecord.service.IMassageVipRecordService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 会员充值记录表 + * @Author: jeecg-boot + * @Date: 2025-03-19 + * @Version: V1.0 + */ +@Service +public class MassageVipRecordServiceImpl extends ServiceImpl implements IMassageVipRecordService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/MassageVipRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/MassageVipRecordList.vue new file mode 100644 index 0000000..8c10e7f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/MassageVipRecordList.vue @@ -0,0 +1,183 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordForm.vue new file mode 100644 index 0000000..24e0cec --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.Style#Drawer.vue new file mode 100644 index 0000000..f9b039a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.vue new file mode 100644 index 0000000..a37a086 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue/modules/MassageVipRecordModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.api.ts new file mode 100644 index 0000000..85ecb9b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/massageVipRecord/massageVipRecord/list', + save='/massageVipRecord/massageVipRecord/add', + edit='/massageVipRecord/massageVipRecord/edit', + deleteOne = '/massageVipRecord/massageVipRecord/delete', + deleteBatch = '/massageVipRecord/massageVipRecord/deleteBatch', + importExcel = '/massageVipRecord/massageVipRecord/importExcel', + exportXls = '/massageVipRecord/massageVipRecord/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.data.ts new file mode 100644 index 0000000..9635041 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecord.data.ts @@ -0,0 +1,46 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '金额', + align:"center", + dataIndex: 'amount' + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '金额', + field: 'amount', + component: 'InputNumber', + }, + { + label: '关联用户', + field: 'userId', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecordList.vue new file mode 100644 index 0000000..92a55b2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/MassageVipRecordList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/components/MassageVipRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/components/MassageVipRecordModal.vue new file mode 100644 index 0000000..d95833d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/massageVipRecord/vue3/components/MassageVipRecordModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java index 5fc9d0e..aaeada1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java @@ -25,7 +25,7 @@ public class ShareController { /******************************************************************************************************************/ //我的-邀请好友 - @ApiOperation(value="我的-邀请好友", notes="我的服务-邀请好友") + @ApiOperation(value="我的-邀请好友", notes="我的-邀请好友") @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST}) public Result getInviteCode(@RequestHeader("X-Access-Token") String token){ return shareService.getInviteCode(token); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/VipController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/VipController.java new file mode 100644 index 0000000..16cae7c --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/VipController.java @@ -0,0 +1,44 @@ +package org.jeecg.modules.api.massageController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.BannerService; +import org.jeecg.modules.apiService.VipService; +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="我的-会员中心相关接口") +@RestController +@RequestMapping("/massage/vip") +@Slf4j +public class VipController { + /******************************************************************************************************************/ + //轮播图 + @Resource + private VipService vipService; + /******************************************************************************************************************/ + + //会员中心-充值套餐 + @ApiOperation(value="会员中心-获取充值套餐列表", notes="会员中心-获取充值套餐列表") + @RequestMapping(value = "/queryComboList", method = {RequestMethod.GET}) + public Result queryComboList(MassageVipCombo vipCombo, PageBean pageBean){ + return vipService.queryComboList(vipCombo, pageBean); + } + + //会员中心-开通会员 + @ApiOperation(value="会员中心-开通会员", notes="会员中心-开通会员") + @RequestMapping(value = "/addVip", method = {RequestMethod.POST}) + public Result addVip(@RequestHeader("X-Access-Token") String token, MassageVipRecord vipRecord){ + return null; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java new file mode 100644 index 0000000..54ae62d --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.apiService; + +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +public interface VipService { + //会员中心-充值套餐 + public Result queryComboList(MassageVipCombo vipCombo, PageBean pageBean); + + //会员中心-开通会员 + public Result addVip(String token, MassageVipRecord vipRecord); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java new file mode 100644 index 0000000..32a85d7 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.VipService; +import org.jeecg.modules.massageVipCombo.entity.MassageVipCombo; +import org.jeecg.modules.massageVipCombo.service.IMassageVipComboService; +import org.jeecg.modules.massageVipRecord.entity.MassageVipRecord; +import org.jeecg.modules.massageVipRecord.service.IMassageVipRecordService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class VipServiceImpl implements VipService { + /******************************************************************************************************************/ + //会员充值套餐信息 + @Resource + private IMassageVipComboService massageVipComboService; + //会员充值记录信息 + @Resource + private IMassageVipRecordService massageVipRecordService; + /******************************************************************************************************************/ + //会员中心-充值套餐 + @Override + public Result queryComboList(MassageVipCombo vipCombo, PageBean pageBean) { + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = massageVipComboService + .lambdaQuery(); + + //组装查询条件 + if(StringUtils.isNotBlank(vipCombo.getType())){ + query.eq(MassageVipCombo::getType, vipCombo.getType()); + } + + //按照排序编号升序排列 + query.orderByAsc(MassageVipCombo::getOrderNo); + + //获取充值套餐信息 + pageList = query.page(page); + + return Result.OK("充值套餐列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("充值套餐列表查询失败"); + } + } + + //会员中心-开通会员 + @Override + public Result addVip(String token, MassageVipRecord vipRecord) { + return null; + } +}