wx

admin/src/main/java/org/springblade/modules/ycwh/controller/pc/AccountController.java

@@ -1,151 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.controller.pc;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-import org.springblade.modules.ycwh.excel.AccountExcel;
-import org.springblade.modules.ycwh.service.IAccountService;
-import org.springblade.modules.ycwh.vo.AccountVO;
-import org.springblade.modules.ycwh.wrapper.AccountWrapper;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 账号表 控制器
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("account")
-@Api(value = "账号表", tags = "账号表接口")
-public class AccountController extends BladeController {
-
-	private final IAccountService accountService;
-
-	/**
-	 * 账号表 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入account")
-	public R<AccountVO> detail(AccountEntity account) {
-		AccountEntity detail = accountService.getOne(Condition.getQueryWrapper(account));
-		return R.data(AccountWrapper.build().entityVO(detail));
-	}
-	/**
-	 * 账号表 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入account")
-	public R<IPage<AccountVO>> list(@ApiIgnore @RequestParam Map<String, Object> account, Query query) {
-		IPage<AccountEntity> pages = accountService.page(Condition.getPage(query), Condition.getQueryWrapper(account, AccountEntity.class));
-		return R.data(AccountWrapper.build().pageVO(pages));
-	}
-
-	/**
-	 * 账号表 自定义分页
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入account")
-	public R<IPage<AccountVO>> page(AccountVO account, Query query) {
-		IPage<AccountVO> pages = accountService.selectAccountPage(Condition.getPage(query), account);
-		return R.data(pages);
-	}
-
-	/**
-	 * 账号表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入account")
-	public R save(@Valid @RequestBody AccountEntity account) {
-		return R.status(accountService.save(account));
-	}
-
-	/**
-	 * 账号表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入account")
-	public R update(@Valid @RequestBody AccountEntity account) {
-		return R.status(accountService.updateById(account));
-	}
-
-	/**
-	 * 账号表 新增或修改
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入account")
-	public R submit(@Valid @RequestBody AccountEntity account) {
-		return R.status(accountService.saveOrUpdate(account));
-	}
-
-	/**
-	 * 账号表 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(accountService.deleteLogic(Func.toLongList(ids)));
-	}
-
-
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-account")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入account")
-	public void exportAccount(@ApiIgnore @RequestParam Map<String, Object> account, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<AccountEntity> queryWrapper = Condition.getQueryWrapper(account, AccountEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(Account::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(AccountEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<AccountExcel> list = accountService.exportAccount(queryWrapper);
-		ExcelUtil.export(response, "账号表数据" + DateUtil.time(), "账号表数据表", list, AccountExcel.class);
-	}
-
-}

admin/src/main/java/org/springblade/modules/ycwh/controller/pc/MemberInfoController.java

@@ -1,151 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.controller.pc;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-import org.springblade.modules.ycwh.excel.MemberInfoExcel;
-import org.springblade.modules.ycwh.service.IMemberInfoService;
-import org.springblade.modules.ycwh.vo.MemberInfoVO;
-import org.springblade.modules.ycwh.wrapper.MemberInfoWrapper;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 会员信息 控制器
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("member_info")
-@Api(value = "会员信息", tags = "会员信息接口")
-public class MemberInfoController extends BladeController {
-
-	private final IMemberInfoService memberInfoService;
-
-	/**
-	 * 会员信息 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入memberInfo")
-	public R<MemberInfoVO> detail(MemberInfoEntity memberInfo) {
-		MemberInfoEntity detail = memberInfoService.getOne(Condition.getQueryWrapper(memberInfo));
-		return R.data(MemberInfoWrapper.build().entityVO(detail));
-	}
-	/**
-	 * 会员信息 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入memberInfo")
-	public R<IPage<MemberInfoVO>> list(@ApiIgnore @RequestParam Map<String, Object> memberInfo, Query query) {
-		IPage<MemberInfoEntity> pages = memberInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(memberInfo, MemberInfoEntity.class));
-		return R.data(MemberInfoWrapper.build().pageVO(pages));
-	}
-
-	/**
-	 * 会员信息 自定义分页
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入memberInfo")
-	public R<IPage<MemberInfoVO>> page(MemberInfoVO memberInfo, Query query) {
-		IPage<MemberInfoVO> pages = memberInfoService.selectMemberInfoPage(Condition.getPage(query), memberInfo);
-		return R.data(pages);
-	}
-
-	/**
-	 * 会员信息 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入memberInfo")
-	public R save(@Valid @RequestBody MemberInfoEntity memberInfo) {
-		return R.status(memberInfoService.save(memberInfo));
-	}
-
-	/**
-	 * 会员信息 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入memberInfo")
-	public R update(@Valid @RequestBody MemberInfoEntity memberInfo) {
-		return R.status(memberInfoService.updateById(memberInfo));
-	}
-
-	/**
-	 * 会员信息 新增或修改
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入memberInfo")
-	public R submit(@Valid @RequestBody MemberInfoEntity memberInfo) {
-		return R.status(memberInfoService.saveOrUpdate(memberInfo));
-	}
-
-	/**
-	 * 会员信息 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(memberInfoService.deleteLogic(Func.toLongList(ids)));
-	}
-
-
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-memberInfo")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入memberInfo")
-	public void exportMemberInfo(@ApiIgnore @RequestParam Map<String, Object> memberInfo, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<MemberInfoEntity> queryWrapper = Condition.getQueryWrapper(memberInfo, MemberInfoEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(MemberInfo::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(MemberInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<MemberInfoExcel> list = memberInfoService.exportMemberInfo(queryWrapper);
-		ExcelUtil.export(response, "会员信息数据" + DateUtil.time(), "会员信息数据表", list, MemberInfoExcel.class);
-	}
-
-}

admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXMemberController.java

@@ -1,61 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.controller.wx;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.modules.ycwh.entity.FamousDishEntity;
-import org.springblade.modules.ycwh.service.IFamousDishService;
-import org.springblade.modules.ycwh.vo.FamousDishVO;
-import org.springblade.modules.ycwh.wrapper.FamousDishWrapper;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.Map;
-
-/**
- * 名菜
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("yuecai-wx/member")
-@Api(value = "用户信息接口", tags = "用户信息接口")
-public class WXMemberController extends BladeController {
-
-	private final IFamousDishService famousDishService;
-
-	/**
-	 * 用户信息
-	 */
-	@GetMapping("/info")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入famousDish")
-	public R<FamousDishVO> getInfo(FamousDishEntity famousDish) {
-		return R.data(null);
-	}
-
-}

admin/src/main/java/org/springblade/modules/ycwh/dto/AccountDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-
-/**
- * 账号表 数据传输对象实体类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class AccountDTO extends AccountEntity {
-	private static final long serialVersionUID = 1L;
-
-}

admin/src/main/java/org/springblade/modules/ycwh/dto/MemberInfoDTO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-
-/**
- * 会员信息 数据传输对象实体类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MemberInfoDTO extends MemberInfoEntity {
-	private static final long serialVersionUID = 1L;
-
-}

admin/src/main/java/org/springblade/modules/ycwh/mapper/AccountMapper.java

@@ -1,55 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-import org.springblade.modules.ycwh.excel.AccountExcel;
-import org.springblade.modules.ycwh.vo.AccountVO;
-
-import java.util.List;
-
-/**
- * 账号表 Mapper 接口
- *
- * @author BladeX
- * @since 2023-08-29
- */
-public interface AccountMapper extends BaseMapper<AccountEntity> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param account
-	 * @return
-	 */
-	List<AccountVO> selectAccountPage(IPage page, AccountVO account);
-
-
-	/**
-	 * 获取导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<AccountExcel> exportAccount(@Param("ew") Wrapper<AccountEntity> queryWrapper);
-
-}

admin/src/main/java/org/springblade/modules/ycwh/mapper/MemberInfoMapper.java

@@ -1,55 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-import org.springblade.modules.ycwh.excel.MemberInfoExcel;
-import org.springblade.modules.ycwh.vo.MemberInfoVO;
-
-import java.util.List;
-
-/**
- * 会员信息 Mapper 接口
- *
- * @author BladeX
- * @since 2023-08-29
- */
-public interface MemberInfoMapper extends BaseMapper<MemberInfoEntity> {
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param memberInfo
-	 * @return
-	 */
-	List<MemberInfoVO> selectMemberInfoPage(IPage page, MemberInfoVO memberInfo);
-
-
-	/**
-	 * 获取导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<MemberInfoExcel> exportMemberInfo(@Param("ew") Wrapper<MemberInfoEntity> queryWrapper);
-
-}

admin/src/main/java/org/springblade/modules/ycwh/mapper/MemberInfoMapper.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.ycwh.mapper.MemberInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="memberInfoResultMap" type="org.springblade.modules.ycwh.entity.MemberInfoEntity">
-        <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_dept" property="createDept"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="remark" property="remark"/>
-        <result column="sort" property="sort"/>
-        <result column="avatar" property="avatar"/>
-        <result column="nickname" property="nickname"/>
-        <result column="realname" property="realname"/>
-        <result column="phone" property="phone"/>
-        <result column="sex" property="sex"/>
-        <result column="birthday" property="birthday"/>
-        <result column="email" property="email"/>
-        <result column="reg_ip" property="regIp"/>
-        <result column="last_login_ip" property="lastLoginIp"/>
-        <result column="last_login_time" property="lastLoginTime"/>
-        <result column="area_code" property="areaCode"/>
-        <result column="address" property="address"/>
-        <result column="bnum" property="bnum"/>
-        <result column="ballnum" property="ballnum"/>
-    </resultMap>
-
-
-    <select id="selectMemberInfoPage" resultMap="memberInfoResultMap">
-        select * from ycwh_member_info where is_deleted = 0
-    </select>
-
-
-    <select id="exportMemberInfo" resultType="org.springblade.modules.ycwh.excel.MemberInfoExcel">
-        SELECT * FROM ycwh_member_info ${ew.customSqlSegment}
-    </select>
-
-</mapper>

admin/src/main/java/org/springblade/modules/ycwh/service/IAccountService.java

@@ -1,53 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.service;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-import org.springblade.modules.ycwh.excel.AccountExcel;
-import org.springblade.modules.ycwh.vo.AccountVO;
-
-import java.util.List;
-
-/**
- * 账号表 服务类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-public interface IAccountService extends BaseService<AccountEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param account
-	 * @return
-	 */
-	IPage<AccountVO> selectAccountPage(IPage<AccountVO> page, AccountVO account);
-
-
-	/**
-	 * 导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<AccountExcel> exportAccount(Wrapper<AccountEntity> queryWrapper);
-
-}

admin/src/main/java/org/springblade/modules/ycwh/service/IMemberInfoService.java

@@ -1,53 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.service;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-import org.springblade.modules.ycwh.excel.MemberInfoExcel;
-import org.springblade.modules.ycwh.vo.MemberInfoVO;
-
-import java.util.List;
-
-/**
- * 会员信息 服务类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-public interface IMemberInfoService extends BaseService<MemberInfoEntity> {
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param memberInfo
-	 * @return
-	 */
-	IPage<MemberInfoVO> selectMemberInfoPage(IPage<MemberInfoVO> page, MemberInfoVO memberInfo);
-
-
-	/**
-	 * 导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<MemberInfoExcel> exportMemberInfo(Wrapper<MemberInfoEntity> queryWrapper);
-
-}

admin/src/main/java/org/springblade/modules/ycwh/service/impl/AccountServiceImpl.java

@@ -1,55 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-import org.springblade.modules.ycwh.excel.AccountExcel;
-import org.springblade.modules.ycwh.mapper.AccountMapper;
-import org.springblade.modules.ycwh.service.IAccountService;
-import org.springblade.modules.ycwh.vo.AccountVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 账号表 服务实现类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@Service
-public class AccountServiceImpl extends BaseServiceImpl<AccountMapper, AccountEntity> implements IAccountService {
-
-	@Override
-	public IPage<AccountVO> selectAccountPage(IPage<AccountVO> page, AccountVO account) {
-		return page.setRecords(baseMapper.selectAccountPage(page, account));
-	}
-
-
-	@Override
-	public List<AccountExcel> exportAccount(Wrapper<AccountEntity> queryWrapper) {
-		List<AccountExcel> accountList = baseMapper.exportAccount(queryWrapper);
-		//accountList.forEach(account -> {
-		//	account.setTypeName(DictCache.getValue(DictEnum.YES_NO, Account.getType()));
-		//});
-		return accountList;
-	}
-
-}

admin/src/main/java/org/springblade/modules/ycwh/service/impl/MemberInfoServiceImpl.java

@@ -1,55 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-import org.springblade.modules.ycwh.excel.MemberInfoExcel;
-import org.springblade.modules.ycwh.mapper.MemberInfoMapper;
-import org.springblade.modules.ycwh.service.IMemberInfoService;
-import org.springblade.modules.ycwh.vo.MemberInfoVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员信息 服务实现类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@Service
-public class MemberInfoServiceImpl extends BaseServiceImpl<MemberInfoMapper, MemberInfoEntity> implements IMemberInfoService {
-
-	@Override
-	public IPage<MemberInfoVO> selectMemberInfoPage(IPage<MemberInfoVO> page, MemberInfoVO memberInfo) {
-		return page.setRecords(baseMapper.selectMemberInfoPage(page, memberInfo));
-	}
-
-
-	@Override
-	public List<MemberInfoExcel> exportMemberInfo(Wrapper<MemberInfoEntity> queryWrapper) {
-		List<MemberInfoExcel> memberInfoList = baseMapper.exportMemberInfo(queryWrapper);
-		//memberInfoList.forEach(memberInfo -> {
-		//	memberInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, MemberInfo.getType()));
-		//});
-		return memberInfoList;
-	}
-
-}

admin/src/main/java/org/springblade/modules/ycwh/vo/AccountVO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-
-/**
- * 账号表 视图实体类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class AccountVO extends AccountEntity {
-	private static final long serialVersionUID = 1L;
-
-}

admin/src/main/java/org/springblade/modules/ycwh/vo/MemberInfoVO.java

@@ -1,34 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-
-/**
- * 会员信息 视图实体类
- *
- * @author BladeX
- * @since 2023-08-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MemberInfoVO extends MemberInfoEntity {
-	private static final long serialVersionUID = 1L;
-
-}

admin/src/main/java/org/springblade/modules/ycwh/wrapper/AccountWrapper.java

@@ -1,51 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.ycwh.entity.AccountEntity;
-import org.springblade.modules.ycwh.vo.AccountVO;
-
-import java.util.Objects;
-
-/**
- * 账号表 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2023-08-29
- */
-public class AccountWrapper extends BaseEntityWrapper<AccountEntity, AccountVO>  {
-
-	public static AccountWrapper build() {
-		return new AccountWrapper();
- 	}
-
-	@Override
-	public AccountVO entityVO(AccountEntity account) {
-		AccountVO accountVO = Objects.requireNonNull(BeanUtil.copy(account, AccountVO.class));
-
-		//User createUser = UserCache.getUser(account.getCreateUser());
-		//User updateUser = UserCache.getUser(account.getUpdateUser());
-		//accountVO.setCreateUserName(createUser.getName());
-		//accountVO.setUpdateUserName(updateUser.getName());
-
-		return accountVO;
-	}
-
-
-}

admin/src/main/java/org/springblade/modules/ycwh/wrapper/MemberInfoWrapper.java

@@ -1,51 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.ycwh.wrapper;
-
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.ycwh.entity.MemberInfoEntity;
-import org.springblade.modules.ycwh.vo.MemberInfoVO;
-
-import java.util.Objects;
-
-/**
- * 会员信息 包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2023-08-29
- */
-public class MemberInfoWrapper extends BaseEntityWrapper<MemberInfoEntity, MemberInfoVO>  {
-
-	public static MemberInfoWrapper build() {
-		return new MemberInfoWrapper();
- 	}
-
-	@Override
-	public MemberInfoVO entityVO(MemberInfoEntity memberInfo) {
-		MemberInfoVO memberInfoVO = Objects.requireNonNull(BeanUtil.copy(memberInfo, MemberInfoVO.class));
-
-		//User createUser = UserCache.getUser(memberInfo.getCreateUser());
-		//User updateUser = UserCache.getUser(memberInfo.getUpdateUser());
-		//memberInfoVO.setCreateUserName(createUser.getName());
-		//memberInfoVO.setUpdateUserName(updateUser.getName());
-
-		return memberInfoVO;
-	}
-
-
-}