diff --git a/pom.xml b/pom.xml
index d53960e..2338a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.gxwebsoft</groupId>
-    <artifactId>com-gxwebsoft-server</artifactId>
-    <version>1.5.2</version>
+    <artifactId>com-gxwebsoft-modules</artifactId>
+    <version>1.5.0</version>
 
     <name>com-gxwebsoft-api</name>
     <description>WebSoftApi project for Spring Boot</description>
diff --git a/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java b/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java
deleted file mode 100644
index 82a407c..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/EquipmentConstants.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gxwebsoft.apps.constants;
-
-public class EquipmentConstants {
-  // 事件类型
-  public static final String EVENT_TYPE_BIND = "电池绑定";
-  public static final String EVENT_TYPE_CHANGE = "电池更换";
-  public static final String EVENT_TYPE_UNBIND = "电池解绑";
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java b/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java
deleted file mode 100644
index c00e1da..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/HualalaConstants.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.gxwebsoft.apps.constants;
-
-public class HualalaConstants {
-  // 集团ID
-  public static final String GROUP_ID = "1528";
-  // 服务器接口
-  public static final String API_URL = "https://www-openapi.hualala.com";
-  // appKey
-  public static final String APP_KEY = "2487";
-  // appSecret
-  public static final String APP_SECRET = "Hgr520dQpEiFe0FV";
-  // version
-  public static final Integer VERSION = 3;
-  // 店铺ID
-  public static final Long shopId = 0L;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java b/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java
deleted file mode 100644
index c68ddfe..0000000
--- a/src/main/java/com/gxwebsoft/apps/constants/SfExpressConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gxwebsoft.apps.constants;
-
-public class SfExpressConstants {
-  // 开发者id
-  public static final Long DEV_ID = 1651421896L;
-  // 开发者密钥
-  public static final String DEV_KEY = "2f10570c5057570fe0e488a425a6d813";
-  // 正式环境
-  public static final String SERVER_HOST = "https://openic.sf-express.com";
-  // 店铺ID
-  public static final String SHOP_ID = "3243279847393";
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java b/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java
deleted file mode 100644
index 34a76df..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcAgentController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.BcAgentService;
-import com.gxwebsoft.apps.entity.BcAgent;
-import com.gxwebsoft.apps.param.BcAgentParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 代报餐管理控制器
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-@Api(tags = "代报餐管理管理")
-@RestController
-@RequestMapping("/api/apps/bc-agent")
-public class BcAgentController extends BaseController {
-    @Resource
-    private BcAgentService bcAgentService;
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
-    @ApiOperation("分页查询代报餐管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcAgent>> page(BcAgentParam param) {
-        // 使用关联查询
-      return success(bcAgentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
-    @ApiOperation("查询全部代报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcAgent>> list(BcAgentParam param) {
-        // 使用关联查询
-        return success(bcAgentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:list')")
-    @ApiOperation("根据id查询代报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcAgent> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(bcAgentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:save')")
-    @ApiOperation("添加代报餐管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcAgent bcAgent) {
-        if (bcAgentService.save(bcAgent)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
-    @ApiOperation("修改代报餐管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcAgent bcAgent) {
-        if (bcAgentService.updateById(bcAgent)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
-    @ApiOperation("删除代报餐管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcAgentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:save')")
-    @ApiOperation("批量添加代报餐管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcAgent> list) {
-        if (bcAgentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
-    @ApiOperation("批量修改代报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcAgent> batchParam) {
-        if (batchParam.update(bcAgentService, "agent_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
-    @ApiOperation("批量删除代报餐管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcAgentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java b/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java
deleted file mode 100644
index 45070a8..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcCartController.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcCart;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.result.CartResult;
-import com.gxwebsoft.apps.service.BcPlanService;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.CartParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS;
-
-/**
- * 批量报餐
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "购物车记录表管理")
-@RestController
-@RequestMapping("/api/apps/bc-cart")
-public class BcCartController extends BaseController {
-  @Resource
-  private GoodsService goodsService;
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private OrderGoodsService orderGoodsService;
-
-  @Resource
-  private BcPlanService bcPlanService;
-
-  @ApiOperation("添加购物车")
-  @PostMapping("/addCart")
-  public ApiResult<?> addCart(@RequestBody BcCart vo) {
-    final Goods goods = goodsService.getById(vo.getGoodsId());
-    if (goods == null) {
-      return fail("该商品已下架");
-    }
-    // 获取当天菜单
-    final List<BcPlan> bcList = bcPlanService.list(new LambdaQueryWrapper<BcPlan>().eq(BcPlan::getDayTime, vo.getDeliveryTime() + " 00:00:00"));
-    System.out.println("bcList = " + bcList);
-    if (bcList != null && !CollectionUtils.isEmpty(bcList)) {
-      final BcPlan bcPlan = bcList.get(0);
-      final ArrayList<Integer> arrayList = JSONUtil.parseObject(bcPlan.getGoodsIds(), ArrayList.class);
-      if(!arrayList.contains(vo.getGoodsId())) {
-        return fail(vo.getDeliveryTime() + "没有上架" + goods.getGoodsName());
-      }
-    }
-
-    // 1. key = cache10048:cart651:2023-05-04
-    String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":" + vo.getDeliveryTime();
-    // 2. 准备数据
-
-    vo.setImage(goods.getImage());
-    vo.setGoodsName(goods.getGoodsName());
-    vo.setComments(goods.getComments());
-    vo.setCategoryId(goods.getCategoryId());
-    vo.setGear(goods.getGear());
-    vo.setUserId(getLoginUserId());
-    // 2. 保存到购物车
-    stringRedisTemplate.opsForHash().put(key, vo.getGoodsId().toString(), JSONObject.toJSONString(vo));
-    //设置过期时间600秒
-    System.out.println("设置过期时间600秒 = " + key);
-    stringRedisTemplate.opsForHash().getOperations().expire(key,60*60*3, TimeUnit.SECONDS);
-    // 3. 查询购物车并返回
-    final List<BcCart> list = getCart(key);
-    final ArrayList<CartResult> cartAll = getCartAll();
-    return success("添加成功", cartAll);
-  }
-
-  @ApiOperation("查看购物车")
-  @PostMapping("/showCart")
-  public ApiResult<?> showCart() {
-//    System.out.println("vo = " + vo);
-
-    // 按预定日期查询
-//    if (vo.getDeliveryTime() != null) {
-//      // key = cache10048:cart651:2023-05-04
-//      String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":" + vo.getDeliveryTime();
-//      final List<BcCart> list = getCart(key);
-//      return success("获取成功", list);
-//    }
-    // 查询全部购物车数据
-    return success("获取成功", getCartAll());
-  }
-
-  @ApiOperation("从购物车创建订单")
-  @PostMapping("/createOrder")
-  @Transactional(rollbackFor = {Exception.class})
-  public ApiResult<?> createOrder(@RequestBody CartParam param) {
-    // 1.判断是否代报餐
-    Integer userId = 0;
-    if (param.getAgentUserId() != null) {
-      userId = param.getAgentUserId();
-    } else {
-      userId = getLoginUserId();
-    }
-    // 2.从缓存读取用户的购物车数据
-    final ArrayList<CartResult> cartAll = getCartAll();
-    if (cartAll.size() == 0) {
-      throw new BusinessException("订单不存在");
-    }
-    // 3.批量创建订单
-    Integer finalUserId = userId;
-    final ArrayList<Object> orderIds = new ArrayList<>();
-    cartAll.forEach(d -> {
-      // 过滤空单
-      if (!d.getTotalNum().equals(0)) {
-        System.out.println("批量创建订单d = " + d);
-        Order order = new Order();
-        // 查询今日订单是否存在
-        final Order one = orderService.getOne(new LambdaQueryWrapper<Order>()
-          .eq(Order::getUserId, finalUserId)
-          .eq(Order::getPayStatus,PAY_STATUS_SUCCESS)
-          .eq(Order::getDeliveryTime, Date.valueOf(d.getDeliveryTime())));
-        if(one == null){
-          order.setOrderNo(IdUtil.getSnowflakeNextId());
-          order.setTotalPrice(d.getTotalPrice());
-          order.setOrderPrice(d.getTotalPrice());
-          order.setPayPrice(d.getTotalPrice());
-          order.setDeliveryTime(Date.valueOf(d.getDeliveryTime()));
-          order.setExpirationTime(DateUtil.nextMonth());
-          order.setIsTemporary(param.getIsTemporary());
-          order.setUserId(finalUserId);
-          order.setWeek(DateUtil.dayOfWeek(order.getDeliveryTime()) - 1);
-          orderService.save(order);
-        }else {
-          order.setOrderId(one.getOrderId());
-        }
-        orderIds.add(order.getOrderId());
-
-        // 添加订单商品
-        final List<BcCart> items = d.getItems();
-        final ArrayList<OrderGoods> orderGoods = new ArrayList<>();
-        items.forEach(g -> {
-          if(!g.getTotalNum().equals(0)){
-            final OrderGoods og = new OrderGoods();
-            og.setOrderId(order.getOrderId());
-            og.setGoodsId(g.getGoodsId());
-            og.setGoodsName(g.getGoodsName());
-            og.setImageUrl(g.getImage());
-            og.setTotalNum(g.getTotalNum());
-            og.setCategoryId(g.getCategoryId());
-            og.setGoodsPrice(g.getGoodsPrice());
-            og.setComments(g.getComments());
-            og.setGear(g.getGear());
-            og.setGoodsId(g.getGoodsId());
-            og.setTemporary(param.getIsTemporary());
-            og.setUserId(finalUserId);
-//          og.setDeliveryTime(order.getDeliveryTime());
-            orderGoods.add(og);
-          }
-        });
-        orderGoodsService.saveBatch(orderGoods);
-      }
-    });
-    // 4.清空购物车
-    removeCart();
-    return success("创建成功",orderIds);
-  }
-
-  @ApiOperation("清空购物车")
-  @GetMapping("/clearCart")
-  public ApiResult<?> clearCart() {
-    removeCart();
-    return success("清空成功");
-  }
-
-  /**
-   * 清空购物车
-   */
-  private void removeCart() {
-    String key = "cache" + getTenantId() + ":cart" + getLoginUserId() + ":";
-    final Set<String> keys = stringRedisTemplate.keys(key + "*");
-    System.out.println("清空购物车keys = " + keys);
-    assert keys != null;
-    stringRedisTemplate.delete(keys);
-  }
-
-  /**
-   * 获取购物车数据(按预定日期)
-   */
-  private List<BcCart> getCart(String key) {
-    // 获取购物车数据
-    List<Object> values = stringRedisTemplate.opsForHash().values(key);
-    return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), BcCart.class)).collect(Collectors.toList());
-  }
-
-  /**
-   * 查询全部购物车数据
-   */
-  private ArrayList<CartResult> getCartAll() {
-    String key = "cache" + getTenantId() + ":cart" + getLoginUserId();
-    Set<String> keys = stringRedisTemplate.keys(key + "*");
-//    System.out.println("keys = " + keys);
-    assert keys != null;
-    final ArrayList<CartResult> list = new ArrayList<>();
-    keys.forEach(d -> {
-      final List<Object> values = stringRedisTemplate.opsForHash().values(d);
-      final CartResult cartResult = new CartResult();
-      final ArrayList<BcCart> dataList = new ArrayList<>();
-
-      values.forEach(item -> {
-        BcCart bcCart = JSONUtil.parseObject(item.toString(), BcCart.class);
-        assert bcCart != null;
-//        System.out.println("cartResult = " + cartResult.getTotalPrice());
-        if (cartResult.getTotalNum() == null) {
-          cartResult.setTotalNum(0);
-        }
-        if (cartResult.getTotalPrice() == null) {
-          cartResult.setTotalPrice(new BigDecimal(0));
-        }
-        cartResult.setTotalNum(cartResult.getTotalNum() + bcCart.getTotalNum());
-        cartResult.setDeliveryTime(bcCart.getDeliveryTime());
-        cartResult.setTotalPrice(cartResult.getTotalPrice().add(bcCart.getGoodsPrice().multiply(BigDecimal.valueOf(bcCart.getTotalNum()))));
-        dataList.add(bcCart);
-      });
-      cartResult.setItems(dataList);
-      list.add(cartResult);
-    });
-    return list;
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java b/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java
deleted file mode 100644
index 9fa47aa..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcCookbookController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.BcCookbookService;
-import com.gxwebsoft.apps.entity.BcCookbook;
-import com.gxwebsoft.apps.param.BcCookbookParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 常用菜谱控制器
- *
- * @author 科技小王子
- * @since 2023-05-05 14:56:54
- */
-@Api(tags = "常用菜谱管理")
-@RestController
-@RequestMapping("/api/apps/bc-cookbook")
-public class BcCookbookController extends BaseController {
-    @Resource
-    private BcCookbookService bcCookbookService;
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:list')")
-    @ApiOperation("分页查询常用菜谱")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcCookbook>> page(BcCookbookParam param) {
-        PageParam<BcCookbook, BcCookbookParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(bcCookbookService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(bcCookbookService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:list')")
-    @ApiOperation("查询全部常用菜谱")
-    @GetMapping()
-    public ApiResult<List<BcCookbook>> list(BcCookbookParam param) {
-        PageParam<BcCookbook, BcCookbookParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(bcCookbookService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(bcCookbookService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:list')")
-    @ApiOperation("根据id查询常用菜谱")
-    @GetMapping("/{id}")
-    public ApiResult<BcCookbook> get(@PathVariable("id") Integer id) {
-        return success(bcCookbookService.getById(id));
-        // 使用关联查询
-        //return success(bcCookbookService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:save')")
-    @ApiOperation("添加常用菜谱")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcCookbook bcCookbook) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          bcCookbook.setUserId(loginUser.getUserId());
-        }
-        if (bcCookbookService.save(bcCookbook)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:update')")
-    @ApiOperation("修改常用菜谱")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcCookbook bcCookbook) {
-        if (bcCookbookService.updateById(bcCookbook)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:remove')")
-    @ApiOperation("删除常用菜谱")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcCookbookService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:save')")
-    @ApiOperation("批量添加常用菜谱")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcCookbook> list) {
-        if (bcCookbookService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:update')")
-    @ApiOperation("批量修改常用菜谱")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcCookbook> batchParam) {
-        if (batchParam.update(bcCookbookService, "cookbook_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcCookbook:remove')")
-    @ApiOperation("批量删除常用菜谱")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcCookbookService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java b/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java
deleted file mode 100644
index c90f3c3..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcEquipmentController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.apps.utils.BcUtil;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.BcEquipmentService;
-import com.gxwebsoft.apps.entity.BcEquipment;
-import com.gxwebsoft.apps.param.BcEquipmentParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 报餐设备管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-02 10:34:40
- */
-@Api(tags = "报餐设备管理管理")
-@RestController
-@RequestMapping("/api/apps/bc-equipment")
-public class BcEquipmentController extends BaseController {
-    @Resource
-    private BcEquipmentService bcEquipmentService;
-    @Resource
-    private BcUtil bcUtil;
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("分页查询报餐设备管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcEquipment>> page(BcEquipmentParam param) {
-        PageParam<BcEquipment, BcEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(bcEquipmentService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(bcEquipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("查询全部报餐设备管理")
-    @GetMapping()
-    public ApiResult<List<BcEquipment>> list(BcEquipmentParam param) {
-        PageParam<BcEquipment, BcEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(bcEquipmentService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(bcEquipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("根据id查询报餐设备管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcEquipment> get(@PathVariable("id") Integer id) {
-        return success(bcEquipmentService.getById(id));
-        // 使用关联查询
-        //return success(bcEquipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("添加报餐设备管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcEquipment bcEquipment) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          bcEquipment.setUserId(loginUser.getUserId());
-          bcEquipment.setMerchantCode(getMerchantCode());
-        }
-        if (bcEquipmentService.save(bcEquipment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("修改报餐设备管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcEquipment bcEquipment) {
-        if (bcEquipmentService.updateById(bcEquipment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("删除报餐设备管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcEquipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:save')")
-    @ApiOperation("批量添加报餐设备管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcEquipment> list) {
-        if (bcEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:update')")
-    @ApiOperation("批量修改报餐设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcEquipment> batchParam) {
-        if (batchParam.update(bcEquipmentService, "bc_equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:remove')")
-    @ApiOperation("批量删除报餐设备管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcEquipment:list')")
-    @ApiOperation("发送企业微信推送消息")
-    @PostMapping("/addSend")
-    public ApiResult<?> addSend(@RequestBody BcEquipment bcEquipment) {
-      bcUtil.send(bcEquipment.getComments());
-      return success("发送成功");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java b/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java
deleted file mode 100644
index a2e9339..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcExportController.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcExport;
-import com.gxwebsoft.apps.param.BcExportParam;
-import com.gxwebsoft.apps.service.BcExportService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.DELIVERY_STATUS_YES;
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS;
-
-/**
- * 报餐统计导出控制器
- *
- * @author 科技小王子
- * @since 2023-06-01 21:47:02
- */
-@Api(tags = "报餐统计导出管理")
-@RestController
-@RequestMapping("/api/apps/bc-export")
-public class BcExportController extends BaseController {
-    @Resource
-    private BcExportService bcExportService;
-
-    @Resource
-    private OrderService orderService;
-
-    @Resource
-    private OrderGoodsService orderGoodsService;
-
-    @Resource
-    private UserService userService;
-
-    @PreAuthorize("hasAuthority('apps:bcExport:list')")
-    @ApiOperation("分页查询报餐统计导出")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcExport>> page(BcExportParam param) {
-        PageParam<BcExport, BcExportParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(bcExportService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(bcExportService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:list')")
-    @ApiOperation("查询全部报餐统计导出")
-    @GetMapping()
-    public ApiResult<List<BcExport>> list(BcExportParam param) {
-      LinkedList<BcExport> resutl = new LinkedList<>();
-        PageParam<BcExport, BcExportParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-      // 查询所有员工信息
-      final UserParam param1 = new UserParam();
-      param1.setOrganizationId(param.getOrganizationId());
-      final List<User> users = userService.listRel(param1);
-      if(CollectionUtils.isEmpty(users)){
-        return success(resutl);
-      }
-      final Set<Integer> userIds = users.stream().map(User::getUserId).collect(Collectors.toSet());
-
-      // 获取所有订单
-      final LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<Order>()
-        .eq(Order::getPayStatus,PAY_STATUS_SUCCESS)
-        .in(Order::getUserId,userIds);
-
-      if(param.getDeliveryTimeStart() == null){
-        System.out.println("默认查询当天 = ");
-        // 今天开始时间 2023-05-01 00:00:00
-        DateTime parse = DateUtil.parse(DateUtil.today());
-        wrapper.eq(Order::getDeliveryTime, parse);
-      }
-      if(StringUtils.hasText(param.getDeliveryTime())){
-        wrapper.eq(Order::getDeliveryTime, param.getDeliveryTime());
-      }
-      if(StringUtils.hasText(param.getDeliveryTimeStart())){
-        wrapper.ge(Order::getDeliveryTime, param.getDeliveryTimeStart());
-      }
-      if(StringUtils.hasText(param.getDeliveryTimeEnd())){
-        wrapper.le(Order::getDeliveryTime, param.getDeliveryTimeEnd());
-      }
-
-      final List<Order> list = orderService.list(wrapper);
-      if(CollectionUtils.isEmpty(list)){
-        return success(resutl);
-      }
-      // 获取所有订单商品
-      final Set<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toSet());
-      final List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().in(OrderGoods::getOrderId, orderIds));
-
-      // 按订单分组
-      final Map<Integer, List<OrderGoods>> orderGoodsCollect = orderGoods.stream().collect(Collectors.groupingBy(OrderGoods::getOrderId));
-      // 按员工分组
-      final Map<Integer, List<Order>> userCollect = list.stream().collect(Collectors.groupingBy(Order::getUserId));
-      // 计算订餐和签到次数
-      int btotalCount = 0;
-      int btotalSingCount = 0;
-      int ltotalCount = 0;
-      int ltotalSingCount = 0;
-      int dtotalCount = 0;
-      int dtotalSingCount = 0;
-      BigDecimal maxTotalPrice = BigDecimal.ZERO;
-      int maxGear10 = 0;
-      int maxGear20 = 0;
-      int maxSignGear10 = 0;
-      int maxSignGear20 = 0;
-      for (Integer userId : userCollect.keySet()) {
-        final List<Order> userList = userCollect.get(userId); // 员工订单
-        final User user = users.stream().filter(u -> u.getUserId().equals(userId)).findFirst().get();
-        BcExport bcExport = new BcExport();
-        int bCount = 0;
-        int bSingCount = 0;
-        int lCount = 0;
-        int lSingCount = 0;
-        int dCount = 0;
-        int dSingCount = 0;
-        int gear10 = 0;
-        int gear20 = 0;
-        int signGear10 = 0;
-        int signGear20 = 0;
-        BigDecimal totalPrice = BigDecimal.ZERO;
-        for (Order order : userList) {
-          // 获取商品
-          totalPrice = totalPrice.add(order.getTotalPrice());
-          final List<OrderGoods> goodsList = orderGoodsCollect.get(order.getOrderId());
-          if(!CollectionUtils.isEmpty(goodsList)){
-            for (OrderGoods goods : goodsList) {
-              // 查询早餐
-              // 查询午餐
-              // 查询晚餐
-              if(goods.getCategoryId().equals(25)){
-                bCount++;
-                if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){
-                  bSingCount++;
-                }
-              }
-              if(goods.getCategoryId().equals(26)){
-                lCount++;
-                // 统计档口
-                if(goods.getGear().equals(10)){
-                  gear10++;
-                }
-                if (goods.getGear().equals(20)) {
-                  gear20++;
-                }
-                if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){
-                  lSingCount++;
-                  // 统计档口
-                  if(goods.getGear().equals(10)){
-                    signGear10++;
-                  }
-                  if (goods.getGear().equals(20)) {
-                    signGear20++;
-                  }
-                }
-              }
-              if(goods.getCategoryId().equals(27)){
-                dCount++;
-                if(goods.getDeliveryStatus().equals(DELIVERY_STATUS_YES)){
-                  dSingCount++;
-                }
-              }
-            }
-          }
-        }
-        btotalCount += bCount;
-        btotalSingCount += bSingCount;
-        ltotalCount += lCount;
-        ltotalSingCount += lSingCount;
-        dtotalCount += dCount;
-        dtotalSingCount += dSingCount;
-        maxTotalPrice = maxTotalPrice.add(totalPrice);
-        maxGear10 += gear10;
-        maxGear20 += gear20;
-        maxSignGear10 += signGear10;
-        maxSignGear20 += signGear20;
-
-        bcExport.setBreakfastPost(bCount);
-        bcExport.setBreakfastSign(bSingCount);
-        bcExport.setLunchPost(lCount);
-        bcExport.setLunchSign(lSingCount);
-        bcExport.setDinnerPost(dCount);
-        bcExport.setDinnerSign(dSingCount);
-        bcExport.setExpendMoney(totalPrice);
-        bcExport.setGear10(gear10);
-        bcExport.setGear20(gear20);
-        bcExport.setSignGear10(signGear10);
-        bcExport.setSignGear20(signGear20);
-        bcExport.setUserId(userId);
-        bcExport.setOrganizationName(user.getOrganizationName());
-        bcExport.setNickname(user.getNickname());
-        bcExport.setLunchPostText(lCount+"");
-        bcExport.setLunchSignText(lSingCount+"");
-
-        resutl.add(bcExport);
-
-      }
-      BcExport totalBcExport = new BcExport();
-      totalBcExport.setNickname("合计");
-      totalBcExport.setBreakfastPost(btotalCount);
-      totalBcExport.setBreakfastSign(btotalSingCount);
-      totalBcExport.setLunchPost(ltotalCount);
-      totalBcExport.setLunchSign(ltotalSingCount);
-      totalBcExport.setDinnerPost(dtotalCount);
-      totalBcExport.setDinnerSign(dtotalSingCount);
-      totalBcExport.setExpendMoney(maxTotalPrice);
-      totalBcExport.setGear10(maxGear10);
-      totalBcExport.setGear20(maxGear20);
-      totalBcExport.setSignGear10(maxSignGear10);
-      totalBcExport.setSignGear20(maxSignGear20);
-      totalBcExport.setLunchPostText(ltotalCount + "(" + maxGear10 + "/" + maxGear20 + ")");
-      totalBcExport.setLunchSignText(ltotalSingCount + "(" + maxSignGear10 + "/" + maxSignGear20 + ")");
-      totalBcExport.setOrganizationName("");
-      resutl.addFirst(totalBcExport);
-      return success(resutl);
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:list')")
-    @ApiOperation("根据id查询报餐统计导出")
-    @GetMapping("/{id}")
-    public ApiResult<BcExport> get(@PathVariable("id") Integer id) {
-        return success(bcExportService.getById(id));
-        // 使用关联查询
-        //return success(bcExportService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:save')")
-    @ApiOperation("添加报餐统计导出")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcExport bcExport) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          bcExport.setUserId(loginUser.getUserId());
-        }
-        if (bcExportService.save(bcExport)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:update')")
-    @ApiOperation("修改报餐统计导出")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcExport bcExport) {
-        if (bcExportService.updateById(bcExport)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:remove')")
-    @ApiOperation("删除报餐统计导出")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcExportService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:save')")
-    @ApiOperation("批量添加报餐统计导出")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcExport> list) {
-        if (bcExportService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:update')")
-    @ApiOperation("批量修改报餐统计导出")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcExport> batchParam) {
-        if (batchParam.update(bcExportService, "export_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcExport:remove')")
-    @ApiOperation("批量删除报餐统计导出")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcExportService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java b/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java
deleted file mode 100644
index 38ac5bb..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcFoodController.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcFood;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.param.BcFoodParam;
-import com.gxwebsoft.apps.param.BcPlanParam;
-import com.gxwebsoft.apps.service.BcFoodService;
-import com.gxwebsoft.apps.service.BcPlanService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.param.UserRefereeParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.UserRefereeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_DOING;
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS;
-
-/**
- * 发布菜品明细控制器
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Api(tags = "发布菜品明细管理")
-@RestController
-@RequestMapping("/api/apps/bc-food")
-public class BcFoodController extends BaseController {
-    @Resource
-    private BcFoodService bcFoodService;
-    @Resource
-    private BcPlanService bcPlanService;
-    @Resource
-    private GoodsService goodsService;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private OrderGoodsService orderGoodsService;
-    @Resource
-    private UserRefereeService userRefereeService;
-
-    @ApiOperation("查询菜品列表")
-    @GetMapping("/getFoodList")
-    public ApiResult<?> getFoodList(BcPlanParam param) {
-      // 验证签名
-      isCheckSign();
-      BcPlan plan = param.getOne(bcPlanService.listRel(param));
-      if(plan == null){
-        return fail("当日未发布菜品");
-      }
-//      System.out.println("查询菜品列表param = " + param);
-//      System.out.println("plan = " + plan);
-      // json转数组 如：[0,1]转为ArrayList
-      List<Integer> goodsIds = new ArrayList<>();
-      goodsIds = JSONUtil.parseObject(plan.getGoodsIds(), ArrayList.class);
-      final List<Goods> list = goodsService.listByIds(goodsIds);
-      final HashMap<String, Object> map = new HashMap<>();
-      map.put("week",plan.getWeek());
-      map.put("list",list);
-      return success(map);
-    }
-
-    @ApiOperation("查询一周菜谱")
-    @GetMapping("/getWeekFood")
-    public ApiResult<?> getWeekFood() {
-      // 验证签名
-      isCheckSign();
-      final HashMap<String, Object> map = new HashMap<>();
-      // 今天日期
-      final DateTime today = DateUtil.parse(DateUtil.today());
-      // 本周一周开始的日期
-      final DateTime dateTime = DateUtil.beginOfWeek(today);
-      // 查询本周菜谱
-      final List<BcPlan> list = bcPlanService.list(new LambdaQueryWrapper<BcPlan>().ge(BcPlan::getDayTime, dateTime).last("limit 0,7"));
-        try {
-          list.forEach(d -> {
-            // json转数组 如：[0,1]转为ArrayList
-            d.setGoodsList(goodsService.listByIds(JSONUtil.parseObject(d.getGoodsIds(), ArrayList.class)));
-          });
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
-      return success(list);
-    }
-
-    @ApiOperation("查询代取餐人员的报餐信息")
-    @GetMapping("/getOthersFood")
-    public ApiResult<?> getOthersFood() {
-      // 验证签名
-      isCheckSign();
-
-      UserRefereeParam param = new UserRefereeParam();
-      param.setDealerId(getLoginUserId());
-      List<UserReferee> list = userRefereeService.listRel(param);
-      // 附加自己
-      final UserReferee userReferee = new UserReferee();
-      userReferee.setUserId(getLoginUserId());
-      userReferee.setNickname(getLoginUser().getNickname());
-      list.add(userReferee);
-      list.forEach(d -> {
-        // 查询他的订单信息
-        OrderParam orderParam = new OrderParam();
-        orderParam.setUserId(d.getUserId());
-        orderParam.setDeliveryTime(DateUtil.beginOfDay(DateUtil.date()).toString());
-        orderParam.setOrderStatus(ORDER_STATUS_DOING);
-        orderParam.setPayStatus(PAY_STATUS_SUCCESS);
-        List<Order> orders = orderService.listRel(orderParam);
-          orders.forEach(o -> {
-            // 查询菜品信息
-            List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-              .eq(OrderGoods::getOrderId,o.getOrderId())
-              .gt(OrderGoods::getTotalNum,0));
-            o.setGoodsList(orderGoods);
-          });
-        d.setOrder(orders);
-      });
-      return success(list);
-    }
-
-    @ApiOperation("取消代餐")
-    @GetMapping("/cancel")
-    public ApiResult<?> cancel() {
-      UserRefereeParam param = new UserRefereeParam();
-      param.setDealerId(getLoginUserId());
-      List<UserReferee> list = userRefereeService.listRel(param);
-      list.forEach(d -> {
-        // 查询他的订单信息
-        OrderParam orderParam = new OrderParam();
-        orderParam.setUserId(d.getUserId());
-        orderParam.setDeliveryTime(DateUtil.beginOfDay(DateUtil.date()).toString());
-        orderParam.setPayStatus(PAY_STATUS_SUCCESS);
-        List<Order> orders = orderService.listRel(orderParam);
-        orders.forEach(o -> {
-          // 查询菜品信息
-          OrderGoodsParam goodsParam = new OrderGoodsParam();
-          goodsParam.setOrderId(o.getOrderId());
-          List<OrderGoods> orderGoods = orderGoodsService.listRel(goodsParam);
-          o.setGoodsList(orderGoods);
-        });
-        d.setOrder(orders);
-      });
-      return success(list);
-    }
-
-    @ApiOperation("查询临时报餐信息")
-    @GetMapping("/getTemporaryOrder")
-    public ApiResult<?> getTemporaryOrder(OrderParam param) {
-      // 验证签名
-      isCheckSign();
-      LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-      lambdaQueryWrapper
-        .eq(Order::getUserId,getLoginUserId())
-        .eq(Order::getPayStatus,PAY_STATUS_SUCCESS)
-        .eq(Order::getOrderStatus,ORDER_STATUS_DOING)
-        .eq(Order::getDeleted,0)
-        .eq(Order::getIsTemporary,1)
-        .eq(Order::getDeliveryTime,param.getDeliveryTime());
-      Order order = orderService.getOne(lambdaQueryWrapper,false);
-      if(order != null){
-        final List<OrderGoods> goods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
-        order.setGoodsList(goods);
-        return success("查询成功",order);
-      }
-      return fail("没有临时报餐数据",null);
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:list')")
-    @ApiOperation("分页查询发布菜品明细")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcFood>> page(BcFoodParam param) {
-        // 使用关联查询
-        return success(bcFoodService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:list')")
-    @ApiOperation("查询全部发布菜品明细")
-    @GetMapping()
-    public ApiResult<List<BcFood>> list(BcFoodParam param) {
-        // 使用关联查询
-        return success(bcFoodService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:list')")
-    @ApiOperation("根据id查询发布菜品明细")
-    @GetMapping("/{id}")
-    public ApiResult<BcFood> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(bcFoodService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:save')")
-    @ApiOperation("添加发布菜品明细")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcFood bcFood) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          bcFood.setUserId(loginUser.getUserId());
-        }
-        if (bcFoodService.save(bcFood)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:update')")
-    @ApiOperation("修改发布菜品明细")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcFood bcFood) {
-        if (bcFoodService.updateById(bcFood)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:remove')")
-    @ApiOperation("删除发布菜品明细")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcFoodService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:save')")
-    @ApiOperation("批量添加发布菜品明细")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcFood> list) {
-        if (bcFoodService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:update')")
-    @ApiOperation("批量修改发布菜品明细")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcFood> batchParam) {
-        if (batchParam.update(bcFoodService, "bc_food_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcFood:remove')")
-    @ApiOperation("批量删除发布菜品明细")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcFoodService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java b/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java
deleted file mode 100644
index 0760b91..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcPlanController.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.param.BcPlanParam;
-import com.gxwebsoft.apps.service.BcPlanService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 菜品发布管理控制器
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Api(tags = "菜品发布管理管理")
-@RestController
-@RequestMapping("/api/apps/bc-plan")
-public class BcPlanController extends BaseController {
-    @Resource
-    private BcPlanService bcPlanService;
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
-    @ApiOperation("分页查询菜品发布管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcPlan>> page(BcPlanParam param) {
-        // 使用关联查询
-        return success(bcPlanService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
-    @ApiOperation("查询全部菜品发布管理")
-    @GetMapping()
-    public ApiResult<List<BcPlan>> list(BcPlanParam param) {
-        // 使用关联查询
-        return success(bcPlanService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:list')")
-    @ApiOperation("根据id查询菜品发布管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcPlan> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(bcPlanService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:save')")
-    @ApiOperation("添加菜品发布管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcPlan bcPlan) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          bcPlan.setUserId(loginUser.getUserId());
-        }
-        if(bcPlanService.count(new LambdaQueryWrapper<BcPlan>().eq(BcPlan::getDayTime, bcPlan.getDayTime())) > 0){
-          return fail("当天已发布过菜品");
-        }
-        bcPlan.setWeek(DateUtil.dayOfWeek(bcPlan.getDayTime()) - 1);
-        if (bcPlanService.save(bcPlan)) {
-              return success("发布成功");
-        }
-        return fail("发布失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:update')")
-    @ApiOperation("修改菜品发布管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcPlan bcPlan) {
-      System.out.println("bcPlan = " + bcPlan);
-      final Date dayTime = bcPlan.getDayTime();
-      System.out.println("dayTime = " + dayTime);
-      final int week = DateUtil.dayOfWeek(dayTime);
-      bcPlan.setWeek(week - 1);
-      if (bcPlanService.updateById(bcPlan)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:remove')")
-    @ApiOperation("删除菜品发布管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcPlanService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:save')")
-    @ApiOperation("批量添加菜品发布管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcPlan> list) {
-        if (bcPlanService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:update')")
-    @ApiOperation("批量修改菜品发布管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcPlan> batchParam) {
-        if (batchParam.update(bcPlanService, "bc_plan_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcPlan:remove')")
-    @ApiOperation("批量删除菜品发布管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcPlanService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java b/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java
deleted file mode 100644
index 3bc2ab5..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcStatisticsController.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.param.BcPlanParam;
-import com.gxwebsoft.apps.service.BcPlanService;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.OrganizationService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-
-/**
- * 报餐统计控制器
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Api(tags = "报餐统计管理")
-@RestController
-@RequestMapping("/api/apps/bc-statistics")
-public class BcStatisticsController extends BaseController {
-  @Resource
-  private GoodsService goodsService;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private OrderGoodsService orderGoodsService;
-  @Resource
-  private BcPlanService bcPlanService;
-  @Resource
-  private UserService userService;
-  @Resource
-  private OrganizationService organizationService;
-
-
-  @ApiOperation("预定菜品统计")
-  @GetMapping("/baoCanFoodCount")
-  public ApiResult<?> baoCanFoodCount(BcPlanParam param) {
-    // 验证签名
-    isCheckSign();
-
-    BcPlan plan = param.getOne(bcPlanService.listRel(param));
-    System.out.println("1查询菜品列表param = " + plan);
-    if (plan == null) {
-      return fail("当日未发布菜品");
-    }
-    // json转数组 如：[0,1]转为ArrayList
-    ArrayList goodsIds = JSONUtil.parseObject(plan.getGoodsIds(), ArrayList.class);
-    final List<Goods> list = goodsService.listByIds(goodsIds);
-    final ArrayList<Goods> goods = new ArrayList<>();
-
-    // 查询今日有效订单
-    final List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>()
-      .eq(Order::getDeliveryTime, param.getDayTime())
-      .eq(Order::getPayStatus, PAY_STATUS_SUCCESS)
-      .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL)
-    );
-    final List<Integer> orderIds = orders.stream().map(Order::getOrderId).collect(Collectors.toList());
-
-    // 整理餐段菜品数据
-    list.forEach(d -> {
-      if (d.getCategoryId().equals(param.getCategoryId())) {
-        final int DeliveryTimes = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-          .in(OrderGoods::getOrderId, orderIds)
-          .eq(OrderGoods::getCategoryId, param.getCategoryId())
-          .eq(OrderGoods::getGoodsId, d.getGoodsId())
-          .gt(OrderGoods::getTotalNum, 0)
-        );
-        final int NoDeliveryTimes = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-          .in(OrderGoods::getOrderId, orderIds)
-          .eq(OrderGoods::getCategoryId, param.getCategoryId())
-          .eq(OrderGoods::getGoodsId, d.getGoodsId())
-          .gt(OrderGoods::getTotalNum, 0)
-          .eq(OrderGoods::getDeliveryStatus, 10)
-        );
-
-        d.setDeliveryTimes(DeliveryTimes);
-        d.setNoDeliveryTimes(NoDeliveryTimes);
-        goods.add(d);
-      }
-    });
-    return success("查询成功", goods);
-  }
-
-  @ApiOperation("预定人员统计")
-  @GetMapping("/baoCanUserCount")
-  public ApiResult<?> baoCanUserCount(BcPlanParam param) {
-    // 验证签名
-    isCheckSign();
-    // 查询今日有效订单
-    final List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
-      .eq(Order::getDeliveryTime, param.getDayTime())
-      .eq(Order::getPayStatus, PAY_STATUS_SUCCESS)
-      .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL)
-    );
-    final List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-//    System.out.println("list.size() = " + list.size());
-    final List<OrderGoods> list25 = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-      .in(OrderGoods::getOrderId, orderIds)
-      .eq(OrderGoods::getCategoryId, param.getCategoryId())
-      .gt(OrderGoods::getTotalNum, 0)
-      .eq(OrderGoods::getDeleted, 0)
-    );
-    final List<Integer> userIds25 = list25.stream().map(OrderGoods::getUserId).collect(Collectors.toList());
-    final List<User> users25 = userService.listByIds(userIds25);
-    return success("查询成功", users25);
-  }
-
-  @ApiOperation("报餐统计")
-  @GetMapping("/baoCanUsers")
-  public ApiResult<?> baoCanUsers(OrderGoodsParam param) {
-    // 验证签名
-    isCheckSign();
-    System.out.println("param = " + param);
-    // 修复订单商品的支付状态
-//      repairPayPriceStatus();
-
-    final HashMap<Object, Object> map = new HashMap<>();
-
-    LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
-    // 默认查询条件
-    wrapper.ge(Order::getPayStatus,PAY_STATUS_SUCCESS)
-      .ne(Order::getOrderStatus, ORDER_STATUS_CANCEL);
-
-    // 按部门查询
-    if(param.getOrganizationId() != null){
-      System.out.println("按部门查询 = ");
-      final List<User> users = userService.list(new LambdaQueryWrapper<User>().eq(User::getOrganizationId,param.getOrganizationId()));
-      final List<Integer> collect = users.stream().map(User::getUserId).collect(Collectors.toList());
-      System.out.println("userIds = " + collect);
-      wrapper.in(Order::getUserId,collect);
-    }
-
-    // 是否选择日期
-    if(param.getDeliveryTime() == null && param.getDeliveryTimeStart() == null && param.getCategoryId() != 0){
-      return success("请选择预定日期",map);
-    }
-    // 按时间范围查询
-    if(param.getDeliveryTimeStart() != null){
-      // 最大只能选择一个月
-      SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-      try {
-        Date date1 = df.parse(param.getDeliveryTimeStart());
-        Date date2 = df.parse(param.getDeliveryTimeEnd());
-        final boolean after = date1.after(date2);
-        final long between = DateUtil.between(date1, date2, DateUnit.DAY);
-        if(between > 30L){
-          return fail("超出日期查询范围");
-        }
-        System.out.println("between = " + between);
-        System.out.println("after = " + after);
-      } catch (ParseException e) {
-        e.printStackTrace();
-      }
-      wrapper.ge(Order::getDeliveryTime,param.getDeliveryTimeStart());
-      wrapper.le(Order::getDeliveryTime,param.getDeliveryTimeEnd());
-    }
-    // 按预定日期查询
-    if(param.getDeliveryTime() != null){
-      wrapper.eq(Order::getDeliveryTime,param.getDeliveryTime());
-    }
-
-    final List<Order> list = orderService.list(wrapper);
-
-    if(list.size() == 0){
-      return success("查询成功",null);
-    }
-
-    System.out.println("报餐统计 = " + list.size());
-    final List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-    System.out.println("orderIds = " + orderIds.size());
-
-    LambdaQueryWrapper<OrderGoods> queryWrapper = new LambdaQueryWrapper<>();
-    queryWrapper.eq(OrderGoods::getDeleted,0)
-      .gt(OrderGoods::getTotalNum,0)
-      .in(OrderGoods::getOrderId,orderIds);
-
-    if(param.getCategoryId() != null){
-      queryWrapper.eq(OrderGoods::getCategoryId,param.getCategoryId());
-    }
-    if(param.getGear() != null){
-      queryWrapper.eq(OrderGoods::getGear,param.getGear());
-    }
-    // 已报餐
-    final int post = orderGoodsService.count(queryWrapper);
-
-    // 已签到
-    queryWrapper.eq(OrderGoods::getDeliveryStatus,DELIVERY_STATUS_YES);
-    final int sign = orderGoodsService.count(queryWrapper);
-
-    // 未签到
-    int noSign = post - sign;
-
-    map.put("post",post);
-    map.put("sign",sign);
-    map.put("noSign", noSign);
-    return success(map);
-
-
-//
-////       查询今日签到记录
-//    final int sign25 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 25)
-//      .eq(OrderGoods::getDeliveryStatus, 20)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-//    final int sign26 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 26)
-//      .eq(OrderGoods::getDeliveryStatus, 20)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-//    final int sign27 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 27)
-//      .eq(OrderGoods::getDeliveryStatus, 20)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-////      // 查询今日报餐人数
-//    final int post25 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 25)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-//    final int post26 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 26)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-//    final int post27 = orderGoodsService.count(new LambdaQueryWrapper<OrderGoods>()
-//      .in(OrderGoods::getOrderId, orderIds)
-//      .eq(OrderGoods::getCategoryId, 27)
-//      .gt(OrderGoods::getTotalNum, 0)
-//      .eq(OrderGoods::getDeleted, 0)
-//    );
-////
-//    map.put("breakfastSignUsers", sign25);
-//    map.put("lunchSignUsers", sign26);
-//    map.put("dinnerSignUsers", sign27);
-//
-//    map.put("breakfastPostUsers", post25);
-//    map.put("lunchPostUsers", post26);
-//    map.put("dinnerPostUsers", post27);
-
-
-  }
-
-  @ApiOperation("导出报表")
-  @GetMapping("/export")
-  public ApiResult<?> export(OrderGoodsParam param) {
-    return success("导出报表");
-  }
-
-  private void repairPayPriceStatus() {
-    final OrderGoodsParam param = new OrderGoodsParam();
-    param.setUserId(0);
-    final List<OrderGoods> list = orderGoodsService.listRel(param);
-    System.out.println("修复支付状态 = " + list.size());
-    list.forEach(d -> {
-      final Order order = orderService.getById(d.getOrderId());
-      if (order != null) {
-        System.out.println("order = " + order);
-        d.setPayStatus(PAY_STATUS_SUCCESS);
-        d.setUserId(order.getUserId());
-        orderGoodsService.updateById(d);
-      } else {
-        orderGoodsService.removeById(d);
-      }
-    });
-  }
-
-  private void updateTimeByOrderGoods() {
-    System.out.println("修复数据 = ");
-//      final Order order = orderService.getById(2467);
-    final LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
-//      wrapper.eq(Order::getTenantId,10048);
-//      wrapper.eq(Order::getDeleted,0);
-//      wrapper.eq(Order::getOrderStatus,10);
-//      wrapper.eq(Order::getDeliveryStatus,10);
-    wrapper.in(Order::getOrderId, 3184);
-//      wrapper.eq(Order::getPayStatus,20);
-//      wrapper.gt(Order::getOrderId,1000);
-//      wrapper.lt(Order::getOrderId,2000);
-    final List<Order> list = orderService.list(wrapper);
-    System.out.println("修复数据list = " + list.size());
-    list.forEach(order -> {
-      final OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-      orderGoodsParam.setOrderId(order.getOrderId());
-      final List<OrderGoods> goods = orderGoodsService.listRel(orderGoodsParam);
-      goods.forEach(d -> {
-        d.setDeliveryTime(order.getDeliveryTime());
-        d.setPayStatus(order.getPayStatus());
-        orderGoodsService.updateById(d);
-        System.out.println("修复预定时间 = " + d.getOrderId());
-      });
-    });
-  }
-
-
-  @ApiOperation("今日上架物品")
-  @GetMapping("/getNoGrounding")
-  public ApiResult<?> getNoGrounding(BcPlanParam param) {
-    final List<BcPlan> list = bcPlanService.list(new LambdaQueryWrapper<BcPlan>().eq(BcPlan::getDayTime, param.getDayTime()));
-    final BcPlan bcPlan = list.get(0);
-    final ArrayList arrayList = JSONUtil.parseObject(bcPlan.getGoodsIds(), ArrayList.class);
-//    final List<Goods> goodsList = goodsService.list(new LambdaQueryWrapper<Goods>().in(Goods::getGoodsId, arrayList));
-    return success("查询成功", arrayList);
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java b/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java
deleted file mode 100644
index 79d71e2..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/BcTemporaryController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.BcTemporaryService;
-import com.gxwebsoft.apps.entity.BcTemporary;
-import com.gxwebsoft.apps.param.BcTemporaryParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 临时报餐管理控制器
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-@Api(tags = "临时报餐管理管理")
-@RestController
-@RequestMapping("/api/apps/bc-temporary")
-public class BcTemporaryController extends BaseController {
-    @Resource
-    private BcTemporaryService bcTemporaryService;
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @ApiOperation("分页查询临时报餐管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcTemporary>> page(BcTemporaryParam param) {
-        // 使用关联查询
-        return success(bcTemporaryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @ApiOperation("查询全部临时报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcTemporary>> list(BcTemporaryParam param) {
-        // 使用关联查询
-        return success(bcTemporaryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @ApiOperation("根据id查询临时报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcTemporary> get(@PathVariable("id") Integer id) {
-        return success(bcTemporaryService.getById(id));
-        // 使用关联查询
-        //return success(bcTemporaryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
-    @ApiOperation("添加临时报餐管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcTemporary bcTemporary) {
-        bcTemporary.setUserId(getLoginUserId());
-        if (bcTemporaryService.save(bcTemporary)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
-    @ApiOperation("申请临时报餐")
-    @PostMapping("/apply")
-    public ApiResult<?> apply(@RequestBody BcTemporary bcTemporary) {
-      bcTemporary.setUserId(getLoginUserId());
-      final int count = bcTemporaryService.count(new LambdaQueryWrapper<BcTemporary>()
-        .eq(BcTemporary::getUserId, getLoginUserId())
-        .eq(BcTemporary::getStatus, 0)
-        .eq(BcTemporary::getDayTime,DateUtil.today()));
-      if(count > 0){
-        return fail("请勿重复提交");
-      }
-      final DateTime dayTime = DateUtil.parse(DateUtil.today());
-      bcTemporary.setDayTime(dayTime);
-      bcTemporary.setExpirationTime(DateUtil.offsetMinute(DateUtil.parse(DateUtil.now()), 60));
-      if (bcTemporaryService.save(bcTemporary)) {
-        return success("提交成功");
-      }
-      return fail("提交成功");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @ApiOperation("修改临时报餐管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcTemporary bcTemporary) {
-        // 失效时间为审核通过后半个小时
-        bcTemporary.setExpirationTime(DateUtil.offsetMinute(DateUtil.parse(DateUtil.now()), 60));
-        if (bcTemporaryService.updateById(bcTemporary)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
-    @ApiOperation("删除临时报餐管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcTemporaryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
-    @ApiOperation("批量添加临时报餐管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcTemporary> list) {
-        if (bcTemporaryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
-    @ApiOperation("批量修改临时报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcTemporary> batchParam) {
-        if (batchParam.update(bcTemporaryService, "temporary_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
-    @ApiOperation("批量删除临时报餐管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcTemporaryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/CashierController.java b/src/main/java/com/gxwebsoft/apps/controller/CashierController.java
deleted file mode 100644
index 1c32269..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/CashierController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.CashierService;
-import com.gxwebsoft.apps.entity.Cashier;
-import com.gxwebsoft.apps.param.CashierParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 海牛收银台记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-18 11:47:09
- */
-@Api(tags = "海牛收银台记录表管理")
-@RestController
-@RequestMapping("/api/apps/cashier")
-public class CashierController extends BaseController {
-    @Resource
-    private CashierService cashierService;
-
-    @PreAuthorize("hasAuthority('apps:cashier:list')")
-    @ApiOperation("分页查询海牛收银台记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Cashier>> page(CashierParam param) {
-        PageParam<Cashier, CashierParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(cashierService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(cashierService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:list')")
-    @ApiOperation("查询全部海牛收银台记录表")
-    @GetMapping()
-    public ApiResult<List<Cashier>> list(CashierParam param) {
-        PageParam<Cashier, CashierParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(cashierService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(cashierService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:list')")
-    @ApiOperation("根据id查询海牛收银台记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Cashier> get(@PathVariable("id") Integer id) {
-        return success(cashierService.getById(id));
-        // 使用关联查询
-        //return success(cashierService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:save')")
-    @ApiOperation("添加海牛收银台记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Cashier cashier) {
-        if(getMerchantCode() != null){
-          cashier.setMerchantCode(getMerchantCode());
-        }
-        if (cashierService.save(cashier)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:update')")
-    @ApiOperation("修改海牛收银台记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Cashier cashier) {
-        if (cashierService.updateById(cashier)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:remove')")
-    @ApiOperation("删除海牛收银台记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (cashierService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:save')")
-    @ApiOperation("批量添加海牛收银台记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Cashier> list) {
-        if (cashierService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:update')")
-    @ApiOperation("批量修改海牛收银台记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Cashier> batchParam) {
-        if (batchParam.update(cashierService, "cashier_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:cashier:remove')")
-    @ApiOperation("批量删除海牛收银台记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (cashierService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java
deleted file mode 100644
index 26059fa..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentAlarmController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.EquipmentAlarmService;
-import com.gxwebsoft.apps.entity.EquipmentAlarm;
-import com.gxwebsoft.apps.param.EquipmentAlarmParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 故障报警记录控制器
- *
- * @author 科技小王子
- * @since 2022-12-01 23:49:44
- */
-@Api(tags = "故障报警记录管理")
-@RestController
-@RequestMapping("/api/apps/equipment-alarm")
-public class EquipmentAlarmController extends BaseController {
-    @Resource
-    private EquipmentAlarmService equipmentAlarmService;
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')")
-    @ApiOperation("分页查询故障报警记录")
-    @GetMapping("/page")
-    public ApiResult<PageResult<EquipmentAlarm>> page(EquipmentAlarmParam param) {
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(equipmentAlarmService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(equipmentAlarmService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')")
-    @ApiOperation("查询全部故障报警记录")
-    @GetMapping()
-    public ApiResult<List<EquipmentAlarm>> list(EquipmentAlarmParam param) {
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(equipmentAlarmService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(equipmentAlarmService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:list')")
-    @ApiOperation("根据id查询故障报警记录")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentAlarm> get(@PathVariable("id") Integer id) {
-        return success(equipmentAlarmService.getById(id));
-        // 使用关联查询
-        //return success(equipmentAlarmService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:save')")
-    @ApiOperation("添加故障报警记录")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody EquipmentAlarm equipmentAlarm) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          equipmentAlarm.setUserId(loginUser.getUserId());
-          equipmentAlarm.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentAlarmService.save(equipmentAlarm)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')")
-    @ApiOperation("修改故障报警记录")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody EquipmentAlarm equipmentAlarm) {
-        if (equipmentAlarmService.updateById(equipmentAlarm)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')")
-    @ApiOperation("删除故障报警记录")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentAlarmService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:save')")
-    @ApiOperation("批量添加故障报警记录")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<EquipmentAlarm> list) {
-        if (equipmentAlarmService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:update')")
-    @ApiOperation("批量修改故障报警记录")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentAlarm> batchParam) {
-        if (batchParam.update(equipmentAlarmService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentAlarm:remove')")
-    @ApiOperation("批量删除故障报警记录")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentAlarmService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
deleted file mode 100644
index 5664bd8..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.AlipayOpenAppQrcodeCreateModel;
-import com.alipay.api.request.AlipayOpenAppQrcodeCreateRequest;
-import com.alipay.api.response.AlipayOpenAppQrcodeCreateResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.entity.EquipmentRecord;
-import com.gxwebsoft.apps.param.EquipmentParam;
-import com.gxwebsoft.apps.service.EquipmentRecordService;
-import com.gxwebsoft.apps.service.EquipmentService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.AlipayConfigUtil;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.service.MerchantService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.apps.constants.EquipmentConstants.EVENT_TYPE_BIND;
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-
-/**
- * 设备管理控制器
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-@Api(tags = "设备管理管理")
-@RestController
-@RequestMapping("/api/apps/equipment")
-public class EquipmentController extends BaseController {
-    @Resource
-    private EquipmentService equipmentService;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private AlipayConfigUtil alipayConfig;
-    @Resource
-    private MerchantService merchantService;
-    @Resource
-    private EquipmentRecordService equipmentRecordService;
-
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @ApiOperation("分页查询设备管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Equipment>> page(EquipmentParam param) {
-        // 使用关联查询
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
-        return success(equipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @ApiOperation("查询全部设备管理")
-    @GetMapping()
-    public ApiResult<List<Equipment>> list(EquipmentParam param) {
-        PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(equipmentService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(equipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @ApiOperation("根据id查询设备管理")
-    @GetMapping("/{id}")
-    public ApiResult<Equipment> get(@PathVariable("id") Integer id) {
-//        return success(equipmentService.getById(id));
-        // 使用关联查询
-        return success(equipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:save')")
-    @ApiOperation("添加设备管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Equipment equipment) throws AlipayApiException {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (getMerchantCode() != null) {
-          equipment.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentService.count(new LambdaQueryWrapper<Equipment>()
-          .eq(Equipment::getEquipmentCode, equipment.getEquipmentCode())) > 0) {
-          return fail("设备编号已存在");
-        }
-        if (equipmentService.save(equipment)) {
-          // 生成二维码
-          String qrcode = createQrcode(equipment);
-          equipment.setQrcode(qrcode);
-          equipmentService.saveOrUpdate(equipment);
-          return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @ApiOperation("修改设备管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Equipment equipment) throws AlipayApiException {
-        if (equipmentService.updateById(equipment)) {
-          // 生成二维码
-          String qrcode = createQrcode(equipment);
-          equipment.setQrcode(qrcode);
-          equipmentService.saveOrUpdate(equipment);
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @ApiOperation("绑定设备")
-    @PutMapping("/bind")
-    public ApiResult<?> bindEquipment(@RequestBody Equipment equipment) {
-      final Integer orderId = equipment.getOrderId();
-      final Order order = orderService.getById(orderId);
-      Equipment one = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentCode, equipment.getEquipmentCode()));
-      if(one == null){
-        return fail("设备不存在");
-      }
-      if(!one.getUserId().equals(0)){
-        return fail("该设备已被绑定");
-      }
-      Equipment saveData = new Equipment();
-      saveData.setEquipmentId(one.getEquipmentId());
-      saveData.setUserId(equipment.getUserId());
-      saveData.setOrderId(orderId);
-      if (equipmentService.updateById(saveData)) {
-        // 记录明细
-        EquipmentRecord record = new EquipmentRecord();
-        record.setEquipmentCode(one.getEquipmentCode());
-        record.setUserId(getLoginUserId());
-        record.setEventType(EVENT_TYPE_BIND);
-        record.setComments("订单号：".concat(Long.toString(order.getOrderNo())));
-        record.setMerchantCode(one.getMerchantCode());
-        equipmentRecordService.save(record);
-        // 订单发货
-        order.setDeliveryStatus(DELIVERY_STATUS_YES);
-        order.setOrderStatus(ORDER_STATUS_COMPLETED);
-        order.setReceiptStatus(RECEIPT_STATUS_YES);
-        order.setExpirationTime(DateUtil.nextMonth());
-        order.setEquipmentId(one.getEquipmentId());
-        orderService.updateById(order);
-        return success("绑定成功");
-      }
-      return fail("绑定失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:remove')")
-    @ApiOperation("删除设备管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:save')")
-    @ApiOperation("批量添加设备管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Equipment> list) {
-        if (equipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @ApiOperation("批量修改设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Equipment> batchParam) {
-        if (batchParam.update(equipmentService, "equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:remove')")
-    @ApiOperation("批量删除设备管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    // 生成支付宝小程序码
-    private String createQrcode(Equipment equipment) throws AlipayApiException{
-      // 实例化客户端
-      DefaultAlipayClient alipayClient = alipayConfig.alipayClient(getTenantId());
-
-      AlipayOpenAppQrcodeCreateRequest request = new AlipayOpenAppQrcodeCreateRequest();
-      AlipayOpenAppQrcodeCreateModel model = new AlipayOpenAppQrcodeCreateModel();
-      model.setUrlParam("pages/equipment/equipment");
-      System.out.println("equipment = " + equipment);
-      // __id__=2&merchantCode=M311539&merchantId=52
-      // pages/equipment/equipment
-
-//      Merchant merchant = merchantService.getMerchantByCode(equipment.getMerchantCode());
-//      if(merchant == null){
-//        throw new BusinessException("该商户不存在");
-//      }
-      model.setQueryParam("equipmentId=".concat(equipment.getEquipmentId().toString()));
-      model.setDescribe("扫码租赁电池");
-      request.setBizModel(model);
-      AlipayOpenAppQrcodeCreateResponse response = alipayClient.certificateExecute(request);
-      System.out.println(response.getBody());
-      if (response.isSuccess()) {
-        System.out.println("调用成功");
-        final JSONObject jsonObject = JSONObject.parseObject(response.getBody());
-        final String alipay_open_app_qrcode_create_response = jsonObject.getString("alipay_open_app_qrcode_create_response");
-        final JSONObject jsonObject1 = JSONObject.parseObject(alipay_open_app_qrcode_create_response);
-        return jsonObject1.getString("qr_code_url");
-      } else {
-        System.out.println("调用失败");
-        return null;
-      }
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @ApiOperation("确认收货")
-    @PostMapping("/receipt")
-    public ApiResult<?> receipt(@RequestBody Order order){
-      orderService.updateById(order);
-      return success("确认收货");
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java
deleted file mode 100644
index 0074bb9..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentFaultController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.EquipmentFaultService;
-import com.gxwebsoft.apps.entity.EquipmentFault;
-import com.gxwebsoft.apps.param.EquipmentFaultParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 故障电池控制器
- *
- * @author 科技小王子
- * @since 2022-12-01 18:40:25
- */
-@Api(tags = "故障电池管理")
-@RestController
-@RequestMapping("/api/apps/equipment-fault")
-public class EquipmentFaultController extends BaseController {
-    @Resource
-    private EquipmentFaultService equipmentFaultService;
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:list')")
-    @ApiOperation("分页查询故障电池")
-    @GetMapping("/page")
-    public ApiResult<PageResult<EquipmentFault>> page(EquipmentFaultParam param) {
-        PageParam<EquipmentFault, EquipmentFaultParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(equipmentFaultService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(equipmentFaultService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:list')")
-    @ApiOperation("查询全部故障电池")
-    @GetMapping()
-    public ApiResult<List<EquipmentFault>> list(EquipmentFaultParam param) {
-        PageParam<EquipmentFault, EquipmentFaultParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(equipmentFaultService.list(page.getOrderWrapper()));
-        // 使用关联查询
-//        return success(equipmentFaultService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:list')")
-    @ApiOperation("根据id查询故障电池")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentFault> get(@PathVariable("id") Integer id) {
-        return success(equipmentFaultService.getById(id));
-        // 使用关联查询
-        //return success(equipmentFaultService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:save')")
-    @ApiOperation("添加故障电池")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody EquipmentFault equipmentFault) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          equipmentFault.setUserId(loginUser.getUserId());
-          equipmentFault.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentFaultService.save(equipmentFault)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:update')")
-    @ApiOperation("修改故障电池")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody EquipmentFault equipmentFault) {
-        if (equipmentFaultService.updateById(equipmentFault)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:remove')")
-    @ApiOperation("删除故障电池")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentFaultService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:save')")
-    @ApiOperation("批量添加故障电池")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<EquipmentFault> list) {
-        if (equipmentFaultService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:update')")
-    @ApiOperation("批量修改故障电池")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentFault> batchParam) {
-        if (batchParam.update(equipmentFaultService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentFault:remove')")
-    @ApiOperation("批量删除故障电池")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentFaultService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java
deleted file mode 100644
index c200f39..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentGoodsController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.EquipmentGoodsService;
-import com.gxwebsoft.apps.entity.EquipmentGoods;
-import com.gxwebsoft.apps.param.EquipmentGoodsParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 电池管理记录表控制器
- *
- * @author 科技小王子
- * @since 2023-02-28 22:40:50
- */
-@Api(tags = "电池管理记录表管理")
-@RestController
-@RequestMapping("/api/apps/equipment-goods")
-public class EquipmentGoodsController extends BaseController {
-    @Resource
-    private EquipmentGoodsService equipmentGoodsService;
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
-    @ApiOperation("分页查询电池管理记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<EquipmentGoods>> page(EquipmentGoodsParam param) {
-        // 使用关联查询
-        return success(equipmentGoodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
-    @ApiOperation("查询全部电池管理记录表")
-    @GetMapping()
-    public ApiResult<List<EquipmentGoods>> list(EquipmentGoodsParam param) {
-        // 使用关联查询
-        return success(equipmentGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:list')")
-    @ApiOperation("根据id查询电池管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentGoods> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(equipmentGoodsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:save')")
-    @ApiOperation("添加电池管理记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody EquipmentGoods equipmentGoods) {
-      System.out.println("equipmentGoods = " + equipmentGoods);
-        if (equipmentGoodsService.save(equipmentGoods)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:update')")
-    @ApiOperation("修改电池管理记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody EquipmentGoods equipmentGoods) {
-        if (equipmentGoodsService.updateById(equipmentGoods)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:remove')")
-    @ApiOperation("删除电池管理记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentGoodsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:save')")
-    @ApiOperation("批量添加电池管理记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<EquipmentGoods> list) {
-        if (equipmentGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:update')")
-    @ApiOperation("批量修改电池管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentGoods> batchParam) {
-        if (batchParam.update(equipmentGoodsService, "goods_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentGoods:remove')")
-    @ApiOperation("批量删除电池管理记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentGoodsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java
deleted file mode 100644
index 28bf48b..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.EquipmentOrderService;
-import com.gxwebsoft.apps.entity.EquipmentOrder;
-import com.gxwebsoft.apps.param.EquipmentOrderParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 订单记录表控制器
- *
- * @author 科技小王子
- * @since 2023-04-14 21:24:31
- */
-@Api(tags = "订单记录表管理")
-@RestController
-@RequestMapping("/api/apps/equipment-order")
-public class EquipmentOrderController extends BaseController {
-    @Resource
-    private EquipmentOrderService equipmentOrderService;
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:list')")
-    @ApiOperation("分页查询订单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<EquipmentOrder>> page(EquipmentOrderParam param) {
-//        PageParam<EquipmentOrder, EquipmentOrderParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(equipmentOrderService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(equipmentOrderService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:list')")
-    @ApiOperation("查询全部订单记录表")
-    @GetMapping()
-    public ApiResult<List<EquipmentOrder>> list(EquipmentOrderParam param) {
-        PageParam<EquipmentOrder, EquipmentOrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(equipmentOrderService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(equipmentOrderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:list')")
-    @ApiOperation("根据id查询订单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentOrder> get(@PathVariable("id") Integer id) {
-        return success(equipmentOrderService.getById(id));
-        // 使用关联查询
-        //return success(equipmentOrderService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:save')")
-    @ApiOperation("添加订单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody EquipmentOrder equipmentOrder) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          equipmentOrder.setUserId(loginUser.getUserId());
-          equipmentOrder.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentOrderService.save(equipmentOrder)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:update')")
-    @ApiOperation("修改订单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody EquipmentOrder equipmentOrder) {
-        if (equipmentOrderService.updateById(equipmentOrder)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:remove')")
-    @ApiOperation("删除订单记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentOrderService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:save')")
-    @ApiOperation("批量添加订单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<EquipmentOrder> list) {
-        if (equipmentOrderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:update')")
-    @ApiOperation("批量修改订单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentOrder> batchParam) {
-        if (batchParam.update(equipmentOrderService, "order_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrder:remove')")
-    @ApiOperation("批量删除订单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentOrderService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java
deleted file mode 100644
index 96a2e95..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentOrderGoodsController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.EquipmentOrderGoodsService;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
-import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 电池管理记录表控制器
- *
- * @author 科技小王子
- * @since 2023-05-11 19:10:13
- */
-@Api(tags = "电池管理记录表管理")
-@RestController
-@RequestMapping("/api/apps/equipment-order-goods")
-public class EquipmentOrderGoodsController extends BaseController {
-    @Resource
-    private EquipmentOrderGoodsService equipmentOrderGoodsService;
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')")
-    @ApiOperation("分页查询电池管理记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<EquipmentOrderGoods>> page(EquipmentOrderGoodsParam param) {
-        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(equipmentOrderGoodsService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(equipmentOrderGoodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')")
-    @ApiOperation("查询全部电池管理记录表")
-    @GetMapping()
-    public ApiResult<List<EquipmentOrderGoods>> list(EquipmentOrderGoodsParam param) {
-//        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        System.out.println("param = " + param);
-//        final EquipmentOrderGoods eog = equipmentOrderGoodsService.getById(param.getGoodsId());
-//      System.out.println("eog = " + eog);
-//        eog.setOrderId(param.getOrderId());
-//        equipmentOrderGoodsService.updateById(eog);
-//
-//        final List<EquipmentOrderGoods> list = equipmentOrderGoodsService.list(page.getOrderWrapper());
-//
-//        return success(equipmentOrderGoodsService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(equipmentOrderGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:list')")
-    @ApiOperation("根据id查询电池管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentOrderGoods> get(@PathVariable("id") Integer id) {
-        return success(equipmentOrderGoodsService.getById(id));
-        // 使用关联查询
-        //return success(equipmentOrderGoodsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:save')")
-    @ApiOperation("添加电池管理记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody EquipmentOrderGoods equipmentOrderGoods) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          equipmentOrderGoods.setUserId(loginUser.getUserId());
-          equipmentOrderGoods.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentOrderGoodsService.save(equipmentOrderGoods)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')")
-    @ApiOperation("修改电池管理记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody EquipmentOrderGoods equipmentOrderGoods) {
-        if (equipmentOrderGoodsService.updateById(equipmentOrderGoods)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:remove')")
-    @ApiOperation("删除电池管理记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentOrderGoodsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:save')")
-    @ApiOperation("批量添加电池管理记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<EquipmentOrderGoods> list) {
-        if (equipmentOrderGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:update')")
-    @ApiOperation("批量修改电池管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentOrderGoods> batchParam) {
-        if (batchParam.update(equipmentOrderGoodsService, "order_goods_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentOrderGoods:remove')")
-    @ApiOperation("批量删除电池管理记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentOrderGoodsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java
deleted file mode 100644
index 995a65b..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentRecordController.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.EquipmentRecordService;
-import com.gxwebsoft.apps.entity.EquipmentRecord;
-import com.gxwebsoft.apps.param.EquipmentRecordParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 前世今生控制器
- *
- * @author 科技小王子
- * @since 2022-12-03 01:23:53
- */
-@Api(tags = "前世今生管理")
-@RestController
-@RequestMapping("/api/apps/equipment-record")
-public class EquipmentRecordController extends BaseController {
-    @Resource
-    private EquipmentRecordService equipmentRecordService;
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:list')")
-    @ApiOperation("分页查询前世今生")
-    @GetMapping("/page")
-    public ApiResult<PageResult<EquipmentRecord>> page(EquipmentRecordParam param) {
-        PageParam<EquipmentRecord, EquipmentRecordParam> page = new PageParam<>(param);
-        // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
-//        page.setDefaultOrder("create_time desc");
-//        return success(equipmentRecordService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(equipmentRecordService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:list')")
-    @ApiOperation("查询全部前世今生")
-    @GetMapping()
-    public ApiResult<List<EquipmentRecord>> list(EquipmentRecordParam param) {
-        PageParam<EquipmentRecord, EquipmentRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(equipmentRecordService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(equipmentRecordService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:list')")
-    @ApiOperation("根据id查询前世今生")
-    @GetMapping("/{id}")
-    public ApiResult<EquipmentRecord> get(@PathVariable("id") Integer id) {
-//        return success(equipmentRecordService.getById(id));
-        // 使用关联查询
-        return success(equipmentRecordService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:save')")
-    @ApiOperation("添加前世今生")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody EquipmentRecord equipmentRecord) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          equipmentRecord.setUserId(loginUser.getUserId());
-          equipmentRecord.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentRecordService.save(equipmentRecord)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:update')")
-    @ApiOperation("修改前世今生")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody EquipmentRecord equipmentRecord) {
-        if (equipmentRecordService.updateById(equipmentRecord)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')")
-    @ApiOperation("删除前世今生")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentRecordService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:save')")
-    @ApiOperation("批量添加前世今生")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<EquipmentRecord> list) {
-        if (equipmentRecordService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:update')")
-    @ApiOperation("批量修改前世今生")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<EquipmentRecord> batchParam) {
-        if (batchParam.update(equipmentRecordService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipmentRecord:remove')")
-    @ApiOperation("批量删除前世今生")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentRecordService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java
deleted file mode 100644
index 8d538c4..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardBenefitsController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.HualalaCardBenefitsService;
-import com.gxwebsoft.apps.entity.HualalaCardBenefits;
-import com.gxwebsoft.apps.param.HualalaCardBenefitsParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员权益控制器
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Api(tags = "会员权益管理")
-@RestController
-@RequestMapping("/api/apps/hualala-card-benefits")
-public class HualalaCardBenefitsController extends BaseController {
-    @Resource
-    private HualalaCardBenefitsService hualalaCardBenefitsService;
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')")
-    @ApiOperation("分页查询会员权益")
-    @GetMapping("/page")
-    public ApiResult<PageResult<HualalaCardBenefits>> page(HualalaCardBenefitsParam param) {
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaCardBenefitsService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(hualalaCardBenefitsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')")
-    @ApiOperation("查询全部会员权益")
-    @GetMapping()
-    public ApiResult<List<HualalaCardBenefits>> list(HualalaCardBenefitsParam param) {
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaCardBenefitsService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(hualalaCardBenefitsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:list')")
-    @ApiOperation("根据id查询会员权益")
-    @GetMapping("/{id}")
-    public ApiResult<HualalaCardBenefits> get(@PathVariable("id") Integer id) {
-        return success(hualalaCardBenefitsService.getById(id));
-        // 使用关联查询
-        //return success(hualalaCardBenefitsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:save')")
-    @ApiOperation("添加会员权益")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody HualalaCardBenefits hualalaCardBenefits) {
-        if (hualalaCardBenefitsService.save(hualalaCardBenefits)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')")
-    @ApiOperation("修改会员权益")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody HualalaCardBenefits hualalaCardBenefits) {
-        if (hualalaCardBenefitsService.updateById(hualalaCardBenefits)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')")
-    @ApiOperation("删除会员权益")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (hualalaCardBenefitsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:save')")
-    @ApiOperation("批量添加会员权益")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<HualalaCardBenefits> list) {
-        if (hualalaCardBenefitsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:update')")
-    @ApiOperation("批量修改会员权益")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCardBenefits> batchParam) {
-        if (batchParam.update(hualalaCardBenefitsService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCardBenefits:remove')")
-    @ApiOperation("批量删除会员权益")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (hualalaCardBenefitsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java
deleted file mode 100644
index 70f972b..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCardController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.HualalaCardService;
-import com.gxwebsoft.apps.entity.HualalaCard;
-import com.gxwebsoft.apps.param.HualalaCardParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 控制器
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Api(tags = "管理")
-@RestController
-@RequestMapping("/api/apps/hualala-card")
-public class HualalaCardController extends BaseController {
-    @Resource
-    private HualalaCardService hualalaCardService;
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:list')")
-    @ApiOperation("分页查询")
-    @GetMapping("/page")
-    public ApiResult<PageResult<HualalaCard>> page(HualalaCardParam param) {
-        PageParam<HualalaCard, HualalaCardParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaCardService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(hualalaCardService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:list')")
-    @ApiOperation("查询全部")
-    @GetMapping()
-    public ApiResult<List<HualalaCard>> list(HualalaCardParam param) {
-        PageParam<HualalaCard, HualalaCardParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaCardService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(hualalaCardService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:list')")
-    @ApiOperation("根据id查询")
-    @GetMapping("/{id}")
-    public ApiResult<HualalaCard> get(@PathVariable("id") Integer id) {
-        return success(hualalaCardService.getById(id));
-        // 使用关联查询
-        //return success(hualalaCardService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:save')")
-    @ApiOperation("添加")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody HualalaCard hualalaCard) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          hualalaCard.setUserId(loginUser.getUserId());
-          hualalaCard.setMerchantCode(getMerchantCode());
-        }
-        if (hualalaCardService.save(hualalaCard)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:update')")
-    @ApiOperation("修改")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody HualalaCard hualalaCard) {
-        if (hualalaCardService.updateById(hualalaCard)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:remove')")
-    @ApiOperation("删除")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (hualalaCardService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:save')")
-    @ApiOperation("批量添加")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<HualalaCard> list) {
-        if (hualalaCardService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:update')")
-    @ApiOperation("批量修改")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCard> batchParam) {
-        if (batchParam.update(hualalaCardService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCard:remove')")
-    @ApiOperation("批量删除")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (hualalaCardService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java
deleted file mode 100644
index 5037c20..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCart.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.entity.ItemVo;
-import com.gxwebsoft.apps.result.*;
-import com.gxwebsoft.apps.service.HualalaFoodService;
-import com.gxwebsoft.apps.service.HualalaService;
-import com.gxwebsoft.apps.service.HualalaShopService;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.val;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.http.*;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS;
-import static com.gxwebsoft.common.core.constants.RedisConstants.*;
-
-/**
- * 哗啦啦-购物车
- * 教程参考 https://blog.csdn.net/qq_34383510/article/details/127824628
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Api(tags = "哗啦啦-购物车")
-@RestController
-@RequestMapping("/api/apps/hualala-cart")
-public class HualalaCart extends BaseController {
-
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
-  private CacheClient cacheClient;
-  @Resource
-  private HualalaService hualalaService;
-  @Resource
-  private HualalaFoodService hualalaFoodService;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private OrderGoodsService orderGoodsService;
-  @Resource
-  private HualalaShopService hualalaShopService;
-
-  @ApiOperation("我的购物车")
-  @GetMapping()
-  public ApiResult<?> cart(ItemVo param) {
-    String key = getKey(param.getShopId());
-
-    return success("查询成功",showCart(key));
-  }
-
-  @ApiOperation("添加购物车")
-  @PostMapping("/addCart")
-  public ApiResult<?> addCart(@RequestBody ItemVo param) {
-    String key = getKey(param.getShopId());
-    cacheClient.hPut(key,param.getFoodId().toString(),JSONUtil.toJSONString(param));
-
-    return success("添加成功",showCart(key));
-  }
-
-  @ApiOperation("生成订单并清空购物车")
-  @PostMapping("/createOrder")
-  public ApiResult<?> createOrder(@RequestBody Order order){
-    String key = getKey(order.getShopId().toString());
-    // 记录当前登录用户id、租户id
-    User loginUser = getLoginUser();
-    if (loginUser != null) {
-      order.setUserId(loginUser.getUserId());
-    }
-    order.setMerchantCode(order.getShopId().toString());
-    order.setPayMethod("通联支付");
-    if (orderService.save(order)) {
-      // 添加订单商品
-      List<Object> hValues = cacheClient.hValues(key);
-      hValues.forEach(d -> {
-        JSONObject json = JSONObject.parseObject(d.toString());
-        OrderGoods orderGoods = new OrderGoods();
-        orderGoods.setOrderId(order.getOrderId());
-        orderGoods.setGoodsName(json.getString("foodName"));
-        orderGoods.setImageUrl(json.getString("imge"));
-        orderGoods.setTotalNum(Integer.valueOf(json.getString("num")));
-        orderGoods.setGoodsId(Integer.valueOf(json.getString("foodId")));
-        orderGoods.setGoodsSkuId(json.getString("foodUnitID"));
-        orderGoods.setUserId(getLoginUserId());
-        BigDecimal totalPrice = new BigDecimal(json.getString("price"));
-        orderGoods.setTotalPrice(totalPrice);
-        orderGoods.setTenantId(getTenantId());
-        orderGoodsService.save(orderGoods);
-      });
-
-      // 清空购物车
-      cacheClient.delete(key);
-      return success("订单创建成功",order);
-    }
-    return fail("订单创建失败");
-  }
-
-  @ApiOperation("通联支付")
-  @PostMapping("/allinPay")
-  public ApiResult<?> allinPay(@RequestBody Order order){
-    Order orderInfo = orderService.getById(order.getOrderId());
-    System.out.println("orderInfo = " + orderInfo);
-    final HualalaShop shop = hualalaShopService.getByIdRel(orderInfo.getShopId());
-    final String payMerchantNo = shop.getPayMerchantNo();
-    final String paySecret = shop.getPaySecret();
-    System.out.println("payMerchantNo = " + payMerchantNo);
-    System.out.println("paySecret = " + paySecret);
-
-    // 正式接口
-    String url = "https://interface.allinpaygx.com/api/access/payInterface/unifiedPay";
-    // 测试接口
-//    String url = "https://interfacetest.allinpaygx.com/api/access/payInterface/unifiedPay";
-//    System.out.println("接口地址 = " + url);
-    // map传参数
-    Map<String, Object> map = new HashMap<>();
-    // 计算金额
-    final BigDecimal orderPrice = orderInfo.getOrderPrice().multiply(new BigDecimal(100));
-    final int amount = Integer.parseInt(orderPrice.stripTrailingZeros().toPlainString());
-    map.put("merchantNo", payMerchantNo); // 正式商户
-//    map.put("merchantNo", "113201120053"); // 测试商户：113201120053
-    map.put("merchantOrderNo", orderInfo.getOrderNo());
-    map.put("amount",String.valueOf(amount));
-    map.put("notifyUrl","https://open.gxwebsoft.com/api/apps/hualala-cart/payNotify");
-    map.put("payType","W06S");
-    // 附加签名
-    String sign = getSign(map,paySecret);
-    System.out.println("sign = " + sign);
-    map.put("sign",sign);
-    System.out.println("请求参数 = " + map);
-    String result = HttpUtil.post(url,map);
-    System.out.println("result = " + result);
-    JSONObject resultObj = JSON.parseObject(result);
-    JSONObject payinfo = JSON.parseObject(resultObj.getString("payinfo"));
-    System.out.println("payinfo = " + payinfo);
-    return success("支付参数",payinfo);
-  }
-
-  public static String getSign(Map<String, Object> treeMap, String paySecret) {
-//    String secret = paySecret;  // 正式秘钥
-//    String secret = "aceb62c896d849c89d1c8b9a4416d1a7";  // 测试秘钥
-    TreeMap<String, String> tMap = new TreeMap<>();
-    for (Map.Entry<String, Object> entry : treeMap.entrySet()) {
-      if (!StrUtil.isEmpty(entry.getValue().toString()) && !entry.getKey().equals("sign")) {
-        tMap.put(entry.getKey(), entry.getValue().toString());
-      }
-    }
-    StringBuffer buf = new StringBuffer();
-    for (String key : tMap.keySet()) {
-      buf.append(key).append(treeMap.get(key));
-    }
-    buf.append(paySecret);
-    System.out.println("buf = " + buf);
-    return DigestUtil.md5Hex(buf.toString()).toUpperCase();
-  }
-
-  @ApiOperation("通联支付")
-  @PostMapping("/payNotify")
-  public String payNotify(@RequestParam Map<String, String> params){
-    // 支付成功
-    if (orderService.allinPay(params)) {
-      return "success";
-    }
-    return "error";
-
-  }
-
-  @ApiOperation("交易查询")
-  @PostMapping("/findOrderInfo")
-  public ApiResult<?> findOrderInfo(@RequestBody Order order){
-    final Order data = orderService.getByOutTradeNo(order.getOrderNo().toString());
-    return success("查询结果",data);
-  }
-
-
-  // 获取Key
-  private String getKey(String shopId) {
-    return HLL_CART_FOOD_KEY.concat(shopId).concat(":").concat(getLoginUserId().toString());
-  }
-
-  private OperateVo showCart(String key){
-    // 获取购物车数据
-    List<Object> values = cacheClient.hValues(key);
-//    System.out.println("values = " + values);
-    List<ItemVo> collect = values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), ItemVo.class)).collect(Collectors.toList());
-//    System.out.println("collect = " + collect);
-
-    // 封装数据结果
-    OperateVo operateVo = new OperateVo();
-    operateVo.setTotalNum(0);
-    operateVo.setTotalPrice(BigDecimal.valueOf(0));
-    operateVo.setItems(collect);
-    collect.forEach(d -> {
-//      System.out.println("operateVo.getTotalNum() + d.getNum() = " + operateVo.getTotalNum() + d.getNum());
-      operateVo.setTotalNum(operateVo.getTotalNum()+d.getNum());
-      operateVo.setTotalPrice(operateVo.getTotalPrice().add(d.getPrice().multiply(BigDecimal.valueOf(d.getNum()))));
-    });
-//    System.out.println("operateVo = " + operateVo);
-    return operateVo;
-  }
-
-
-  @ApiOperation("通联支付2")
-  @PostMapping("/test")
-  public ApiResult<?> test(){
-    final Order order = orderService.getByOutTradeNo("2023030149684157");
-    order.setPayStatus(PAY_STATUS_SUCCESS);
-    order.setPayPrice(order.getTotalPrice());
-    orderService.updateById(order);
-    return success("成功",order);
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java
deleted file mode 100644
index afb3ad0..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaCartFoodController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.HualalaCartFoodService;
-import com.gxwebsoft.apps.entity.HualalaCartFood;
-import com.gxwebsoft.apps.param.HualalaCartFoodParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 购物车商品控制器
- *
- * @author 科技小王子
- * @since 2023-01-14 14:46:44
- */
-@Api(tags = "购物车商品管理")
-@RestController
-@RequestMapping("/api/apps/hualala-cart-food")
-public class HualalaCartFoodController extends BaseController {
-    @Resource
-    private HualalaCartFoodService hualalaCartFoodService;
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')")
-    @ApiOperation("分页查询购物车商品")
-    @GetMapping("/page")
-    public ApiResult<PageResult<HualalaCartFood>> page(HualalaCartFoodParam param) {
-        PageParam<HualalaCartFood, HualalaCartFoodParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaCartFoodService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(hualalaCartFoodService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')")
-    @ApiOperation("查询全部购物车商品")
-    @GetMapping()
-    public ApiResult<List<HualalaCartFood>> list(HualalaCartFoodParam param) {
-        PageParam<HualalaCartFood, HualalaCartFoodParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaCartFoodService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(hualalaCartFoodService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:list')")
-    @ApiOperation("根据id查询购物车商品")
-    @GetMapping("/{id}")
-    public ApiResult<HualalaCartFood> get(@PathVariable("id") Integer id) {
-        return success(hualalaCartFoodService.getById(id));
-        // 使用关联查询
-        //return success(hualalaCartFoodService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:save')")
-    @ApiOperation("添加购物车商品")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody HualalaCartFood hualalaCartFood) {
-        if (hualalaCartFoodService.save(hualalaCartFood)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')")
-    @ApiOperation("修改购物车商品")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody HualalaCartFood hualalaCartFood) {
-        if (hualalaCartFoodService.updateById(hualalaCartFood)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')")
-    @ApiOperation("删除购物车商品")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (hualalaCartFoodService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:save')")
-    @ApiOperation("批量添加购物车商品")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<HualalaCartFood> list) {
-        if (hualalaCartFoodService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:update')")
-    @ApiOperation("批量修改购物车商品")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaCartFood> batchParam) {
-        if (batchParam.update(hualalaCartFoodService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaCartFood:remove')")
-    @ApiOperation("批量删除购物车商品")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (hualalaCartFoodService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java
deleted file mode 100644
index 1fe7a16..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaController.java
+++ /dev/null
@@ -1,384 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.entity.ItemVo;
-import com.gxwebsoft.apps.param.*;
-import com.gxwebsoft.apps.result.AllShopResult;
-import com.gxwebsoft.apps.result.FoodCategoryResult;
-import com.gxwebsoft.apps.result.OpenFoodResult;
-import com.gxwebsoft.apps.result.ShopBaseInfoResult;
-import com.gxwebsoft.apps.service.HualalaFoodCategoryService;
-import com.gxwebsoft.apps.service.HualalaFoodService;
-import com.gxwebsoft.apps.service.HualalaService;
-import com.gxwebsoft.apps.service.HualalaShopService;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.mapper.OrderGoodsMapper;
-import com.gxwebsoft.shop.param.MerchantParam;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.val;
-import org.springframework.data.geo.Point;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.*;
-
-/**
- * 哗啦啦接口
- * 桂小厨GO
- * AppID:wx445232847c503f1b
- * AppSecret:eb81fbcac21da949d819143b43d18636
- * 桂小厨+
- * AppID:wx445232847c503f1b
- * AppSecret:eb81fbcac21da949d819143b43d18636
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Api(tags = "哗啦啦接口")
-@RestController
-@RequestMapping("/api/apps/hualala")
-public class HualalaController extends BaseController {
-  @Resource
-  private HualalaService hualalaService;
-  @Resource
-  private HualalaShopService hualalaShopService;
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
-  private CacheClient cacheClient;
-  @Resource
-  private HualalaFoodService hualalaFoodService;
-  @Resource
-  private HualalaFoodCategoryService hualalaFoodCategoryService;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private OrderGoodsService orderGoodsService;
-  @Resource
-  private OrderGoodsMapper orderGoodsMapper;
-
-  @ApiOperation("哗啦啦万能接口")
-  @PostMapping()
-  public ApiResult<?> post(@RequestBody HualalaParam hualalaParam) {
-    // 接口
-    String apiUrl = hualalaParam.getApiUrl();
-    // 请求参数
-    HashMap<String, Object> params = hualalaParam.getParams();
-    // 执行请求
-    JSONObject response = hualalaService.doPost(apiUrl, params);
-    return success("请求成功",response);
-  }
-
-  @ApiOperation("查询集团店铺列表")
-  @PostMapping("/getAllShop")
-  public ApiResult<?> getAllShop(@RequestBody Map<String, Object> params) {
-    // 请求缓存数据
-    AllShopResult cache = cacheClient.get(getAllShop, AllShopResult.class);
-    if(cache != null){
-      return success("请求成功",cache.getShopInfoList());
-    }
-
-    // 执行请求解析data数据
-    JSONObject response = hualalaService.doPost("/doc/getAllShop", params);
-    AllShopResult result = JSONObject.parseObject(response.getString("data"), AllShopResult.class);
-    cacheClient.set(getAllShop,result);
-
-    List<HualalaShop> shopInfoList = result.getShopInfoList();
-    // 过滤非桂小厨品牌门店
-    List<HualalaShop> shops = shopInfoList.stream().filter(d -> d.getBrandName().equals("桂小厨")).collect(Collectors.toList());
-    shops.forEach(d -> {
-      d.setCreateTime(null);
-      d.setTenantId(getTenantId());
-      cacheClient.geoAdd(haulalaGeoKey,d.getMapLongitudeValueBaiDu(),d.getMapLatitudeValueBaiDu(),d.getShopId().toString());
-    });
-    hualalaShopService.saveBatch(shops);
-    return success("缓存成功",shops);
-
-
-//    try {
-//      // 执行请求解析data数据
-//      JSONObject response = hualalaService.doPost("/doc/getAllShop", params);
-//      AllShopResult result = JSONObject.parseObject(response.getString("data"), AllShopResult.class);
-//      cacheClient.set(getAllShop,result,1L,TimeUnit.DAYS);
-//      return success("请求成功",result);
-//    } catch (Exception e) {
-//      throw new RuntimeException();
-//    }
-  }
-
-
-  @ApiOperation("查询店铺信息")
-  @PostMapping("/getBaseInfo")
-  public ApiResult<?> getBaseInfo(@RequestBody Map<String, Object> params) {
-    // 请求缓存数据
-    String key = getBaseInfo.concat(":").concat(params.get("shopId").toString());
-    Merchant merchant = cacheClient.get(key, Merchant.class);
-    if(merchant != null){
-      return success("请求成功",merchant);
-    }
-    try {
-      // 执行请求解析data数据
-      JSONObject response = hualalaService.doPost("/doc/getBaseInfo", params);
-      ShopBaseInfoResult result = JSONObject.parseObject(response.getString("data"), ShopBaseInfoResult.class);
-      cacheClient.set(key,result);
-      return success("缓存成功",result);
-    } catch (Exception e) {
-      throw new RuntimeException();
-    }
-  }
-
-
-  @ApiOperation("查询店铺菜品分类")
-  @PostMapping("/getFoodClassCategory")
-  public ApiResult<?> getFoodClassCategory(@RequestBody Map<String, Object> params) {
-    // 只查询外卖菜品
-    params.put("type",1);
-    // 请求缓存数据
-    String key = getFoodClassCategory.concat(":").concat(params.get("shopId").toString());
-    FoodCategoryResult cache = cacheClient.get(key, FoodCategoryResult.class);
-    if(cache != null){
-      return success("请求成功",cache);
-    }
-
-    try {
-      // 执行请求解析data数据
-      JSONObject response = hualalaService.doPost("/doc/getFoodClassCategory", params);
-      FoodCategoryResult result = JSONObject.parseObject(response.getString("data"), FoodCategoryResult.class);
-      cacheClient.set(key,result);
-      return success("缓存成功",result);
-    } catch (Exception e) {
-      throw new RuntimeException();
-    }
-  }
-
-  @ApiOperation("查询店铺菜品列表")
-  @PostMapping("/getOpenFood")
-  public ApiResult<?> getOpenFood(@RequestBody Map<String, Object> params) {
-    // 请求缓存数据
-    String key = getOpenFood.concat(":").concat(params.get("shopId").toString());
-    OpenFoodResult cache = cacheClient.get(key, OpenFoodResult.class);
-    if(cache != null){
-      // 计算加入购物车的商品数量
-      List<HualalaFood> foodList = cache.getFoodList();
-      foodList.forEach(d -> {
-        String cartKey = HLL_CART_FOOD_KEY.concat(d.getShopId()).concat(":").concat(getLoginUserId().toString());
-        ItemVo item = cacheClient.hGet(cartKey, d.getFoodId(), ItemVo.class);
-        if(item != null){
-          d.setCartNum(item.getNum());
-        }
-      });
-//      List<HualalaFood> foods = CommonUtil.toTreeData(cache.getFoodList(), null, HualalaFood::getParentFoodId, HualalaFood::getFoodOnlineCategoryId, HualalaFood::setChildren);
-      Map<String, List<HualalaFood>> collect = foodList.stream().collect(Collectors.groupingBy(HualalaFood::getFoodOnlineCategoryId));
-      return success("请求成功",collect);
-    }
-
-    // 执行请求解析当前店铺的菜品数据
-    JSONObject response = hualalaService.doPost("/doc/getOpenFood", params);
-    OpenFoodResult result = JSONObject.parseObject(response.getString("data"), OpenFoodResult.class);
-    // 筛选出外卖菜品
-    List<HualalaFood> foodList = result.getFoodList();
-    List<HualalaFood> foodList2 = foodList.stream().filter(d -> d.getTakeawayTag().equals("2")).collect(Collectors.toList());
-    // 筛选出可以点单的菜品
-    List<HualalaFood> foods = foodList2.stream().filter(d -> d.getIsSingleSale().equals(1)).collect(Collectors.toList());
-    // 存入redis
-    result.setFoodList(foods);
-    result.setCount(foods.size());
-    cacheClient.set(key,result);
-    hualalaFoodService.saveBatch(foods);
-    return success("缓存成功",result.getFoodList());
-  }
-
-//  @ApiOperation("查询店铺菜品列表(备份)")
-//  @PostMapping("/getOpenFood2")
-//  public ApiResult<?> getOpenFood2(@RequestBody Map<String, Object> params) {
-//    // 请求缓存数据
-//    String key = getOpenFood.concat(":").concat(params.get("shopId").toString());
-//    OpenFoodResult cache = cacheClient.get(key, OpenFoodResult.class);
-//    if(cache != null){
-//      // 计算加入购物车的商品数量
-//      List<HualalaFood> foodList = cache.getFoodList();
-//      foodList.forEach(d -> {
-//        String cartKey = HLL_CART_FOOD_KEY.concat(d.getShopId()).concat(":").concat(getLoginUserId().toString());
-//        ItemVo item = cacheClient.hGet(cartKey, d.getFoodId(), ItemVo.class);
-//        if(item != null){
-//          d.setCartNum(item.getNum());
-//        }
-//      });
-//      return success("请求成功",foodList);
-//    }
-//    try {
-//      // 执行请求解析当前店铺的菜品数据
-//      JSONObject response = hualalaService.doPost("/doc/getOpenFood", params);
-//      OpenFoodResult result = JSONObject.parseObject(response.getString("data"), OpenFoodResult.class);
-//      // 筛选出外卖菜品
-//      List<HualalaFood> foodList = result.getFoodList();
-//      List<HualalaFood> foodList2 = foodList.stream().filter(d -> d.getTakeawayTag().equals("2")).collect(Collectors.toList());
-//      // 筛选出可以点单的菜品
-//      List<HualalaFood> foods = foodList2.stream().filter(d -> d.getIsSingleSale().equals(1)).collect(Collectors.toList());
-//      // 存入redis
-//      result.setFoodList(foods);
-//      result.setCount(foods.size());
-//      cacheClient.set(key,result);
-//      return success("缓存成功",result.getFoodList());
-//    } catch (Exception e) {
-//      throw new RuntimeException();
-//    }
-//  }
-
-  @PreAuthorize("hasAuthority('apps:hualala:list')")
-  @ApiOperation("保存菜品到redis（已废弃）")
-  @PostMapping("/setOpenFoodToRedis")
-  public ApiResult<?> setOpenFoodToRedis(@RequestBody HualalaFoodParam food) {
-    System.out.println("food = " + food);
-    String key = "cache:getOpenFood:shop-"+food.getShopId()+":category-"+food.getFoodCategoryCode()+":"+food.getFoodId();
-//    stringRedisTemplate.opsForHash().put(key,food.getFoodId(),food.getData().toString());
-    return success("请求成功",food);
-    // 请求缓存数据
-//    String key = getOpenFood + params.get("shopId");
-//    String jsonStr = stringRedisTemplate.opsForValue().get(key);
-//    if(StrUtil.isNotBlank(jsonStr)){
-//      return success("请求成功",JSON.parseObject(jsonStr));
-//    }
-//    try {
-//      // 执行请求解析data数据
-//      JSONObject response = hualalaService.doPost("/doc/getOpenFood", params);
-//      stringRedisTemplate.opsForValue().set(key, response.getString("data"),1,TimeUnit.DAYS);
-//      return success("请求成功",JSON.parseObject(response.getString("data")));
-//    } catch (Exception e) {
-//      throw new RuntimeException();
-//    }
-  }
-
-  @ApiOperation("根据定位查询附近的门店列表")
-  @PostMapping("/getListByGeo")
-  public ApiResult<List<HualalaShop>> getListByGeo(@RequestBody HualalaShopParam param) {
-    return success(hualalaShopService.listByGeo(param));
-  }
-
-  @PreAuthorize("hasAuthority('apps:hualala:list')")
-  @ApiOperation("把商户坐标写入redis缓存")
-  @PostMapping("/geoAdd")
-  public ApiResult<?> geoAdd(){
-    String key1 = "shop:geo:guixiaochu";
-    stringRedisTemplate.opsForGeo().add(key1,new Point(108.321614,22.815124),"76230180");
-    stringRedisTemplate.opsForGeo().add(key1,new Point(108.335703,22.813917),"76230181");
-    stringRedisTemplate.opsForGeo().add(key1,new Point(108.370343,22.830116),"76230179");
-    stringRedisTemplate.opsForGeo().add(key1,new Point(108.292017,22.869498),"76258872");
-    stringRedisTemplate.opsForGeo().add(key1,new Point(108.393005,22.81194),"76230126");
-    stringRedisTemplate.opsForGeo().add(key1,new Point(108.325202,22.785341),"76230178");
-    return success("添加完毕");
-  }
-
-  @ApiOperation("推送订单")
-  @PostMapping("/pushOrder")
-  public ApiResult<?> pushOrder(@RequestBody OrderParam param){
-    Integer orderId = param.getOrderId();
-    Order orderInfo = orderService.getById(orderId);
-    System.out.println("orderInfo = " + orderInfo);
-    final List<OrderGoods> goodsInfo = orderGoodsMapper.selectByOrderId(orderId);
-    System.out.println("goodsInfo = " + goodsInfo);
-    // 菜品信息
-    ArrayList<Object> orderItem = new ArrayList<>();
-    goodsInfo.forEach(goods -> {
-      JSONObject item = new JSONObject();
-      item.put("foodID",goods.getGoodsId());      // 菜品id
-      item.put("foodName",goods.getGoodsName());  // 菜品名称
-      item.put("foodUnit","份");                      // 规格名称
-      item.put("foodUnitID",goods.getGoodsSkuId());   // 菜品规格id
-      item.put("isSetFood",0);                        // 是/否套餐，0：非套餐 1：套餐
-      item.put("isBatching",0);                       // 0：正常菜，1：主菜，2：配菜，3：加价做法
-      item.put("foodCount",goods.getTotalNum());         // 菜品数量
-      item.put("originPrice",goods.getTotalPrice());  // 菜品原价
-      item.put("takeoutPackagingFee","0");            // 打包费
-      item.put("isDiscount",0);                       // 是/否打折 ，0：不是 1：是
-      item.put("duePrice",goods.getTotalPrice());     // TODO 菜品成售价
-      orderItem.add(item);
-    });
-
-    // 支付信息
-    ArrayList<Object> payInfo = new ArrayList<>();
-    JSONObject payItem = new JSONObject();
-    payItem.put("paymentSubjectID",Long.valueOf("51010440"));   // 科目id
-    payItem.put("paymentSubjectName","微信小程序实收");    // 科目名称
-    payItem.put("dueAmount",orderInfo.getPayPrice());    // TODO 实收金额
-    payItem.put("paymentStatus",20);      // 支付状态，15：未支付；20：已支付
-    payItem.put("payWay",70);             // 支付方式，70：商家自定义科目
-    payInfo.add(payItem);
-
-    // 用户信息
-    JSONObject userInfo = new JSONObject();
-    userInfo.put("userName","邓莉莉");
-    userInfo.put("userMobile","15878179339");
-    userInfo.put("shopMpID","wxa4e2b8bc9c14c743");
-    userInfo.put("userSex","0");           // 用户性别, 1:先生 0:女士 2:不显示，不传默认0 女士
-
-    // 订单信息
-    JSONObject order = new JSONObject();
-    order.put("orderSubType",20);         // 订单类型 20: 外送
-    order.put("orderStatus",20);          // 订单状态 20：已付款
-    order.put("discountTotalAmount","0"); // TODO 优惠金额
-    order.put("dinners",1);               // 用餐人数
-    // 期望送达时间
-    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmm");
-    order.put("orderTime",sdf1.format(orderInfo.getCreateTime()));
-    order.put("orderItem",orderItem);     // 菜品信息
-    order.put("takeoutAddress","南宁市良庆区五象大道401号五象航洋城1号楼1226室"); // TODO 外送地址
-    order.put("deliveryAmount","8.00");      // TODO 配送费
-    order.put("serviceAmount","0");       // 服务费，必传0
-    order.put("channelKey","399_weixin"); // 渠道:微信小程序
-    order.put("isAlreadyPaid","1");       // 是/否支付
-    order.put("orderMode",1);             // 1：先付，2：后付
-    order.put("OrderRemark","测试订单(不需要制作及发货)");          // TODO 订单备注
-    order.put("payment",payInfo);         // 支付信息
-    order.put("userInfo",userInfo);       // 用户信息
-
-    HashMap<String,Object> params = new HashMap<>();
-    params.put("shopID",Long.valueOf("76220517"));  // 店铺ID
-    params.put("isCheackOut",0);          // 0 ：默认 不需要收银台数据 1： 需要收银台数据
-    params.put("isThirdPay",2);           // 只有单纯核销哗啦啦会员卡时传1，其它都传2
-    params.put("bankCode","weChat");      // 支付方式，weChat微信 aliPay支付宝，非哗啦啦支付传weChat
-    params.put("order",order);            // 订单信息
-    params.put("isSentMsg",1);            // 下单后pos是/否显示订单，下单带支付科目信息先付传1，下单不带支付科目信息先付传0，后付传1
-    params.put("msgType",120);            // 消息类型，240： 堂食、闪吃，120：外送，121：自提 ，与order中orderSubType要对应
-    params.put("thirdOrderID",orderInfo.getOrderNo());   // 三方订单号，作用：十分钟内对相同的thirdOrderID进行去重处理，仅开放平台使用做去重处理，不会传到pos及报表
-
-    // 执行订单推送
-//    JSONObject response = hualalaService.doPost("/order/submitordernew", params);
-//    System.out .println("response = " + response);
-
-    // 同步配送平台
-//    JSONObject result = hualalaService.doExpress(orderInfo);
-
-    return success("推送成功",null);
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java
deleted file mode 100644
index d019ccd..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodCategoryController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.HualalaFoodCategoryService;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import com.gxwebsoft.apps.param.HualalaFoodCategoryParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 菜品分类控制器
- *
- * @author 科技小王子
- * @since 2023-01-12 09:49:46
- */
-@Api(tags = "菜品分类管理")
-@RestController
-@RequestMapping("/api/apps/hualala-food-category")
-public class HualalaFoodCategoryController extends BaseController {
-    @Resource
-    private HualalaFoodCategoryService hualalaFoodCategoryService;
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')")
-    @ApiOperation("分页查询菜品分类")
-    @GetMapping("/page")
-    public ApiResult<PageResult<HualalaFoodCategory>> page(HualalaFoodCategoryParam param) {
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaFoodCategoryService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(hualalaFoodCategoryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')")
-    @ApiOperation("查询全部菜品分类")
-    @GetMapping()
-    public ApiResult<List<HualalaFoodCategory>> list(HualalaFoodCategoryParam param) {
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaFoodCategoryService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(hualalaFoodCategoryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:list')")
-    @ApiOperation("根据id查询菜品分类")
-    @GetMapping("/{id}")
-    public ApiResult<HualalaFoodCategory> get(@PathVariable("id") Integer id) {
-        return success(hualalaFoodCategoryService.getById(id));
-        // 使用关联查询
-        //return success(hualalaFoodCategoryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:save')")
-    @ApiOperation("添加菜品分类")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody HualalaFoodCategory hualalaFoodCategory) {
-        if (hualalaFoodCategoryService.save(hualalaFoodCategory)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')")
-    @ApiOperation("修改菜品分类")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody HualalaFoodCategory hualalaFoodCategory) {
-        if (hualalaFoodCategoryService.updateById(hualalaFoodCategory)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')")
-    @ApiOperation("删除菜品分类")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (hualalaFoodCategoryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:save')")
-    @ApiOperation("批量添加菜品分类")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<HualalaFoodCategory> list) {
-        if (hualalaFoodCategoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:update')")
-    @ApiOperation("批量修改菜品分类")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaFoodCategory> batchParam) {
-        if (batchParam.update(hualalaFoodCategoryService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFoodCategory:remove')")
-    @ApiOperation("批量删除菜品分类")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (hualalaFoodCategoryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java
deleted file mode 100644
index 009a3c8..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaFoodController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.HualalaFoodService;
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.param.HualalaFoodParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 菜品分类控制器
- *
- * @author 科技小王子
- * @since 2023-01-12 15:34:55
- */
-@Api(tags = "菜品分类管理")
-@RestController
-@RequestMapping("/api/apps/hualala-food")
-public class HualalaFoodController extends BaseController {
-    @Resource
-    private HualalaFoodService hualalaFoodService;
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:list')")
-    @ApiOperation("分页查询菜品分类")
-    @GetMapping("/page")
-    public ApiResult<PageResult<HualalaFood>> page(HualalaFoodParam param) {
-        PageParam<HualalaFood, HualalaFoodParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaFoodService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(hualalaFoodService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:list')")
-    @ApiOperation("查询全部菜品分类")
-    @GetMapping()
-    public ApiResult<List<HualalaFood>> list(HualalaFoodParam param) {
-        PageParam<HualalaFood, HualalaFoodParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaFoodService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(hualalaFoodService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:list')")
-    @ApiOperation("根据id查询菜品分类")
-    @GetMapping("/{id}")
-    public ApiResult<HualalaFood> get(@PathVariable("id") Integer id) {
-        return success(hualalaFoodService.getById(id));
-        // 使用关联查询
-        //return success(hualalaFoodService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:save')")
-    @ApiOperation("添加菜品分类")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody HualalaFood hualalaFood) {
-        if (hualalaFoodService.save(hualalaFood)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:update')")
-    @ApiOperation("修改菜品分类")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody HualalaFood hualalaFood) {
-        if (hualalaFoodService.updateById(hualalaFood)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:remove')")
-    @ApiOperation("删除菜品分类")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (hualalaFoodService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:save')")
-    @ApiOperation("批量添加菜品分类")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<HualalaFood> list) {
-        if (hualalaFoodService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:update')")
-    @ApiOperation("批量修改菜品分类")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaFood> batchParam) {
-        if (batchParam.update(hualalaFoodService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaFood:remove')")
-    @ApiOperation("批量删除菜品分类")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (hualalaFoodService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java b/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java
deleted file mode 100644
index 5d20f77..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/HualalaShopController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.HualalaShopService;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.param.HualalaShopParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 哗啦啦门店管理控制器
- *
- * @author 科技小王子
- * @since 2023-01-12 18:24:44
- */
-@Api(tags = "哗啦啦门店管理管理")
-@RestController
-@RequestMapping("/api/apps/hualala-shop")
-public class HualalaShopController extends BaseController {
-    @Resource
-    private HualalaShopService hualalaShopService;
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:list')")
-    @ApiOperation("分页查询哗啦啦门店管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<HualalaShop>> page(HualalaShopParam param) {
-        PageParam<HualalaShop, HualalaShopParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaShopService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(hualalaShopService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:list')")
-    @ApiOperation("查询全部哗啦啦门店管理")
-    @GetMapping()
-    public ApiResult<List<HualalaShop>> list(HualalaShopParam param) {
-        PageParam<HualalaShop, HualalaShopParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(hualalaShopService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(hualalaShopService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:list')")
-    @ApiOperation("根据id查询哗啦啦门店管理")
-    @GetMapping("/{id}")
-    public ApiResult<HualalaShop> get(@PathVariable("id") Integer id) {
-        return success(hualalaShopService.getById(id));
-        // 使用关联查询
-        //return success(hualalaShopService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:save')")
-    @ApiOperation("添加哗啦啦门店管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody HualalaShop hualalaShop) {
-        if (hualalaShopService.save(hualalaShop)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:update')")
-    @ApiOperation("修改哗啦啦门店管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody HualalaShop hualalaShop) {
-        if (hualalaShopService.updateById(hualalaShop)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:remove')")
-    @ApiOperation("删除哗啦啦门店管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (hualalaShopService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:save')")
-    @ApiOperation("批量添加哗啦啦门店管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<HualalaShop> list) {
-        if (hualalaShopService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:update')")
-    @ApiOperation("批量修改哗啦啦门店管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<HualalaShop> batchParam) {
-        if (batchParam.update(hualalaShopService, "shop_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:hualalaShop:remove')")
-    @ApiOperation("批量删除哗啦啦门店管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (hualalaShopService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/LinkController.java b/src/main/java/com/gxwebsoft/apps/controller/LinkController.java
deleted file mode 100644
index da78b6c..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/LinkController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.LinkService;
-import com.gxwebsoft.apps.entity.Link;
-import com.gxwebsoft.apps.param.LinkParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 常用链接推荐记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Api(tags = "常用链接推荐记录表管理")
-@RestController
-@RequestMapping("/api/apps/link")
-public class LinkController extends BaseController {
-    @Resource
-    private LinkService linkService;
-
-    @PreAuthorize("hasAuthority('apps:link:list')")
-    @ApiOperation("分页查询常用链接推荐记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Link>> page(LinkParam param) {
-        PageParam<Link, LinkParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
-        return success(linkService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(linkService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:list')")
-    @ApiOperation("查询全部常用链接推荐记录表")
-    @GetMapping()
-    public ApiResult<List<Link>> list(LinkParam param) {
-        PageParam<Link, LinkParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
-        return success(linkService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(linkService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:list')")
-    @ApiOperation("根据id查询常用链接推荐记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Link> get(@PathVariable("id") Integer id) {
-        return success(linkService.getById(id));
-        // 使用关联查询
-        //return success(linkService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:save')")
-    @ApiOperation("添加常用链接推荐记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Link link) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          link.setUserId(loginUser.getUserId());
-          link.setMerchantCode(getMerchantCode());
-        }
-        if (linkService.save(link)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:update')")
-    @ApiOperation("修改常用链接推荐记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Link link) {
-        if (linkService.updateById(link)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:remove')")
-    @ApiOperation("删除常用链接推荐记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (linkService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:save')")
-    @ApiOperation("批量添加常用链接推荐记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Link> list) {
-        if (linkService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:update')")
-    @ApiOperation("批量修改常用链接推荐记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Link> batchParam) {
-        if (batchParam.update(linkService, "link_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:link:remove')")
-    @ApiOperation("批量删除常用链接推荐记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (linkService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java b/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java
deleted file mode 100644
index b152ece..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/SfExpress.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import lombok.val;
-import org.apache.commons.codec.binary.Base64;
-
-import java.security.MessageDigest;
-import java.util.Date;
-
-public class SfExpress {
-
-    //开发者id
-    private final Long devId= 1651421896L;
-    //开发者密钥
-    private final String devKey="2f10570c5057570fe0e488a425a6d813";
-    //正式环境
-    private final String serverHost="https://openic.sf-express.com";
-    //店铺ID
-    private final String shopId="3243279847393";
-
-
-
-
-    public static void main(String[] args) {
-        try {
-            SfExpress api = new SfExpress();
-            String postData = api.orderOnlineByJson();
-            String sign = generateOpenSign(postData,api.devId, api.devKey);
-            String url = api.serverHost.concat("/open/api/external/createorder?sign=").concat(sign);
-            String result = HttpUtil.post(url,postData);
-            System.out.println("result = " + result);
-            val resultObj = JSON.parseObject(result);
-            JSONObject resultData = JSON.parseObject(resultObj.getString("result"));
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static String generateOpenSign(String postData, Long appId, String appKey) throws Exception {
-      StringBuilder sb =  new StringBuilder();
-      sb.append(postData);
-      sb.append("&" + appId + "&" + appKey);
-      System.out.println("sb = " + sb);
-      MessageDigest md = MessageDigest.getInstance("MD5");
-      byte[] md5 = md.digest(sb.toString().getBytes("utf-8"));
-      int i;
-      StringBuffer buf = new StringBuffer("");
-      for (int offset = 0; offset < md5.length; offset++) {
-        i = md5[offset];
-        if (i < 0) {
-          i += 256;
-        }
-        if (i < 16) {
-          buf.append("0");
-        }
-        buf.append(Integer.toHexString(i));
-      }
-
-      return Base64.encodeBase64String(buf.toString().getBytes("utf-8"));
-    }
-
-    //即时查询接口
-    public String orderOnlineByJson() throws Exception{
-        // 组装应用级参数
-      JSONObject json = new JSONObject();
-        json.put("dev_id",devId);
-        json.put("shop_id",shopId);
-        json.put("shop_order_id", RandomUtil.randomNumbers(16));
-        json.put("order_source","1");
-      long timestamp = new Date().getTime();
-        json.put("order_time",timestamp/1000);
-        json.put("push_time",timestamp/1000);
-        json.put("version",19);
-      JSONObject receive = new JSONObject();
-        receive.put("user_name","顺丰同城");
-        receive.put("user_phone","18978189563");
-        receive.put("user_address","北京市海淀区学清嘉创大厦A座15层");
-        receive.put("user_lng","116.354787");
-        receive.put("user_lat","40.030613");
-        json.put("receive",receive);
-      JSONObject orderDetail = new JSONObject();
-        orderDetail.put("total_price",100);
-        orderDetail.put("product_type",1);
-        orderDetail.put("weight_gram",100);
-        orderDetail.put("product_num",1);
-        orderDetail.put("product_type_num",1);
-        json.put("order_detail",orderDetail);
-        return json.toString();
-    }
-  //中文转Unicode
-  /**
-   * @Title: unicodeEncode
-   * @Description: unicode编码 将中文字符转换成Unicode字符
-   * @param string
-   * @return
-   */
-  public String unicodeEncode(String string) {
-    char[] utfBytes = string.toCharArray();
-    String unicodeBytes = "";
-    for (int i = 0; i < utfBytes.length; i++) {
-      String hexB = Integer.toHexString(utfBytes[i]);
-      if (hexB.length() <= 2) {
-        hexB = "00" + hexB;
-      }
-      unicodeBytes = unicodeBytes + "\\u" + hexB;
-    }
-    return unicodeBytes;
-  }
-
-}
-
diff --git a/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java b/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java
deleted file mode 100644
index 0d4df5d..0000000
--- a/src/main/java/com/gxwebsoft/apps/controller/TestDataController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.gxwebsoft.apps.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.apps.service.TestDataService;
-import com.gxwebsoft.apps.entity.TestData;
-import com.gxwebsoft.apps.param.TestDataParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 测试数据表控制器
- *
- * @author 科技小王子
- * @since 2023-02-01 12:13:46
- */
-@Api(tags = "测试数据表管理")
-@RestController
-@RequestMapping("/api/apps/test-data")
-public class TestDataController extends BaseController {
-    @Resource
-    private TestDataService testDataService;
-
-    @PreAuthorize("hasAuthority('apps:testData:list')")
-    @ApiOperation("分页查询测试数据表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TestData>> page(TestDataParam param) {
-        PageParam<TestData, TestDataParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(testDataService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(testDataService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:list')")
-    @ApiOperation("查询全部测试数据表")
-    @GetMapping()
-    public ApiResult<List<TestData>> list(TestDataParam param) {
-        PageParam<TestData, TestDataParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(testDataService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(testDataService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:list')")
-    @ApiOperation("根据id查询测试数据表")
-    @GetMapping("/{id}")
-    public ApiResult<TestData> get(@PathVariable("id") Integer id) {
-        return success(testDataService.getById(id));
-        // 使用关联查询
-        //return success(testDataService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:save')")
-    @ApiOperation("添加测试数据表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TestData testData) {
-        if (testDataService.save(testData)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:update')")
-    @ApiOperation("修改测试数据表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TestData testData) {
-        if (testDataService.updateById(testData)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:remove')")
-    @ApiOperation("删除测试数据表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (testDataService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:save')")
-    @ApiOperation("批量添加测试数据表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TestData> list) {
-        if (testDataService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:update')")
-    @ApiOperation("批量修改测试数据表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TestData> batchParam) {
-        if (batchParam.update(testDataService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:testData:remove')")
-    @ApiOperation("批量删除测试数据表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (testDataService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java b/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java
deleted file mode 100644
index c6058e3..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcAgent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 代报餐管理
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcAgent对象", description = "代报餐管理")
-@TableName("apps_bc_agent")
-public class BcAgent implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "agent_id", type = IdType.AUTO)
-    private Integer agentId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "代报餐用户ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "加入时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "被代报餐职员")
-    @TableField(exist = false)
-    private User user;
-
-    @ApiModelProperty(value = "代报餐人员")
-    @TableField(exist = false)
-    private User parentUser;
-
-    @ApiModelProperty(value = "被代报餐职员")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "代报餐人员")
-    @TableField(exist = false)
-    private String parentName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcCart.java b/src/main/java/com/gxwebsoft/apps/entity/BcCart.java
deleted file mode 100644
index 450230a..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcCart.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * 报餐系统购物车
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "报餐系统购物车", description = "报餐系统购物车")
-@Data
-public class BcCart implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "预定日期")
-    @TableField(exist = false)
-    private String deliveryTime;
-
-    @ApiModelProperty(value = "商品ID")
-    @TableField(exist = false)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品价格")
-    @TableField(exist = false)
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "商品数量")
-    @TableField(exist = false)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "商品名称")
-    @TableField(exist = false)
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品描述")
-    @TableField(exist = false)
-    private String comments;
-
-    @ApiModelProperty(value = "商品封面图")
-    @TableField(exist = false)
-    private String image;
-
-    @ApiModelProperty(value = "商品分类")
-    @TableField(exist = false)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "物品档口")
-    @TableField(exist = false)
-    private Integer gear;
-
-    @ApiModelProperty(value = "用户ID")
-    @TableField(exist = false)
-    private Integer userId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java b/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java
deleted file mode 100644
index a9c02ec..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcCookbook.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 常用菜谱
- *
- * @author 科技小王子
- * @since 2023-05-05 14:56:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcCookbook对象", description = "常用菜谱")
-@TableName("apps_bc_cookbook")
-public class BcCookbook implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "cookbook_id", type = IdType.AUTO)
-    private Integer cookbookId;
-
-    @ApiModelProperty(value = "菜品计划")
-    private Integer planId;
-
-    @ApiModelProperty(value = "餐段 早餐 午餐 晚餐")
-    private String period;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "发布人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java b/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java
deleted file mode 100644
index d02992d..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcEquipment.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 报餐设备管理
- *
- * @author 科技小王子
- * @since 2023-05-02 10:34:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcEquipment对象", description = "报餐设备管理")
-@TableName("apps_bc_equipment")
-public class BcEquipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "设备ID")
-    @TableId(value = "bc_equipment_id", type = IdType.AUTO)
-    private Integer bcEquipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "所属档口")
-    private Integer gear;
-
-    @ApiModelProperty(value = "职员工号")
-    private Integer staffId;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "设备详情")
-    private String content;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcExport.java b/src/main/java/com/gxwebsoft/apps/entity/BcExport.java
deleted file mode 100644
index 3504526..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcExport.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 报餐统计导出
- *
- * @author 科技小王子
- * @since 2023-06-01 21:47:02
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcExport对象", description = "报餐统计导出")
-@TableName("apps_bc_export")
-public class BcExport implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "export_id", type = IdType.AUTO)
-    private Integer exportId;
-
-    @ApiModelProperty(value = "机构名称")
-    private String organizationName;
-
-    @ApiModelProperty(value = "昵称")
-    private String nickname;
-
-    @ApiModelProperty(value = "实际消费的金额(不含退款)")
-    private BigDecimal expendMoney;
-
-    @ApiModelProperty(value = "早餐报餐次数")
-    private Integer breakfastPost;
-
-    @ApiModelProperty(value = "早餐签到次数")
-    private Integer breakfastSign;
-
-    @ApiModelProperty(value = "午餐报餐次数")
-    private Integer lunchPost;
-
-    @ApiModelProperty(value = "午餐签到次数")
-    private Integer lunchSign;
-
-    @ApiModelProperty(value = "晚餐报餐次数")
-    private Integer dinnerPost;
-
-    @ApiModelProperty(value = "晚餐签到次数")
-    private Integer dinnerSign;
-
-    @ApiModelProperty(value = "食堂档口")
-    private Integer gear10;
-
-    @ApiModelProperty(value = "物品档口")
-    private Integer gear20;
-
-    @ApiModelProperty(value = "食堂档口")
-    private Integer signGear10;
-
-    @ApiModelProperty(value = "物品档口")
-    private Integer signGear20;
-
-    @ApiModelProperty(value = "商品价格(单价)")
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "午餐报餐次数")
-    private String lunchPostText;
-
-    @ApiModelProperty(value = "午餐报餐次数")
-    private String lunchSignText;
-
-    @ApiModelProperty(value = "发货时间")
-    private Date deliveryTime;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "订单号")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "机构id")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "发布人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcFood.java b/src/main/java/com/gxwebsoft/apps/entity/BcFood.java
deleted file mode 100644
index b33f9e2..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcFood.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 发布菜品明细
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcFood对象", description = "发布菜品明细")
-@TableName("apps_bc_food")
-public class BcFood implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "bc_food_id", type = IdType.AUTO)
-    private Integer bcFoodId;
-
-    @ApiModelProperty(value = "菜品计划")
-    private Integer planId;
-
-    @ApiModelProperty(value = "餐段 早餐 午餐 晚餐")
-    private String period;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "发布人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java b/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java
deleted file mode 100644
index 7c6d4e8..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcPlan.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.shop.entity.Goods;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 菜品发布管理
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcPlan对象", description = "菜品发布管理")
-@TableName("apps_bc_plan")
-public class BcPlan implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "bc_plan_id", type = IdType.AUTO)
-    private Integer bcPlanId;
-
-    @ApiModelProperty(value = "发布日期")
-    private Date dayTime;
-
-    @ApiModelProperty(value = "0星期日 1星期一 2星期二 3星期三 4星期四 5星期五 6星期六")
-    private Integer week;
-
-    @ApiModelProperty(value = "发布类型")
-    private String type;
-
-    @ApiModelProperty(value = "餐段")
-    private String period;
-
-    @ApiModelProperty(value = "多天菜品是否重复")
-    private Integer isRepeat;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "菜品ID")
-    private String goodsIds;
-
-    @ApiModelProperty(value = "商品列表")
-    @TableField(exist = false)
-    private List<Goods> goodsList;
-
-    @ApiModelProperty(value = "发布人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java b/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java
deleted file mode 100644
index 5baddb5..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/BcTemporary.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Value;
-
-/**
- * 临时报餐管理
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "BcTemporary对象", description = "临时报餐管理")
-@TableName("apps_bc_temporary")
-public class BcTemporary implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "temporary_id", type = IdType.AUTO)
-    private Integer temporaryId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "工单ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "申请状态")
-    private Integer applyStatus;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "加入时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "报餐日期")
-    private Date dayTime;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "失效时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "代报餐人员")
-    @TableField(exist = false)
-    private String dealerName;
-
-    @ApiModelProperty(value = "被代报餐职员")
-    @TableField(exist = false)
-    private User user;
-
-    @ApiModelProperty(value = "代报餐人员")
-    @TableField(exist = false)
-    private User parentUser;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/Cashier.java b/src/main/java/com/gxwebsoft/apps/entity/Cashier.java
deleted file mode 100644
index 838bbbc..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Cashier.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 海牛收银台记录表
- *
- * @author WebSoft
- * @since 2022-11-18 11:47:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Cashier对象", description = "海牛收银台记录表")
-@TableName("apps_cashier")
-public class Cashier implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "cashier_id", type = IdType.AUTO)
-    private Integer cashierId;
-
-    @ApiModelProperty(value = "客户ID")
-    private String buyerId;
-
-    @ApiModelProperty(value = "设备ID")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "支付标识")
-    private String code;
-
-    @ApiModelProperty(value = "返回消息")
-    private String msg;
-
-    @ApiModelProperty(value = "客户端交易订单编号")
-    private String outTradeNo;
-
-    @ApiModelProperty(value = "数量")
-    private String amount;
-
-    @ApiModelProperty(value = "支付时间")
-    private String payTime;
-
-    @ApiModelProperty(value = "支付方式")
-    private String payType;
-
-    @ApiModelProperty(value = "交易金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "实收金额")
-    private BigDecimal receiptAmount;
-
-    @ApiModelProperty(value = "第三方交易手续费")
-    private BigDecimal feeAmount;
-
-    @ApiModelProperty(value = "第三方结算金额")
-    private BigDecimal settleAmount;
-
-    @ApiModelProperty(value = "商户名称")
-    private String merchantName;
-
-    @ApiModelProperty(value = "手机号码")
-    private String mobile;
-
-    @ApiModelProperty(value = "订单备注")
-    private String orderRemark;
-
-    @ApiModelProperty(value = "订单状态")
-    private String orderStatus;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/Equipment.java b/src/main/java/com/gxwebsoft/apps/entity/Equipment.java
deleted file mode 100644
index f91fd16..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Equipment.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 设备管理
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Equipment对象", description = "设备管理")
-@TableName("apps_equipment")
-public class Equipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "设备ID")
-    @TableId(value = "equipment_id", type = IdType.AUTO)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty("设备分类")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "分类ID")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "头像")
-    private String equipmentAvatar;
-
-    @ApiModelProperty(value = "电池型号")
-    private String batteryModel;
-
-    @ApiModelProperty(value = "BMS")
-    private String bms;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "是否激活")
-    private String isCtive;
-
-    @ApiModelProperty(value = "工作状态")
-    private String workingStatus;
-
-    @ApiModelProperty(value = "租赁状态")
-    private String leaseStatus;
-
-    @ApiModelProperty(value = "电池状态")
-    private String batteryStatus;
-
-    @ApiModelProperty(value = "电池电量")
-    private String batteryPower;
-
-    @ApiModelProperty(value = "是否在线")
-    private String isOnline;
-
-    @ApiModelProperty(value = "总电压")
-    private String totalVoltage;
-
-    @ApiModelProperty(value = "BMS板供应商")
-    private String bmsBrand;
-
-    @ApiModelProperty(value = "剩余容量")
-    private String surplusCapacity;
-
-    @ApiModelProperty(value = "ICCID")
-    private String iccid;
-
-    @ApiModelProperty(value = "设备激活时间")
-    private Date ctiveTime;
-
-    @ApiModelProperty(value = "电池出厂时间")
-    private Date batteryDeliveryTime;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "所属商户ID")
-    @TableField(exist = false)
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "电池租金")
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池押金")
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "电池保险")
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "设备价格")
-    private BigDecimal batteryPrice;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "绑定的用户")
-    @TableField(exist = false)
-    private User user;
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java
deleted file mode 100644
index e23c581..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentAlarm.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 故障报警记录
- *
- * @author 科技小王子
- * @since 2022-12-01 23:49:44
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "EquipmentAlarm对象", description = "故障报警记录")
-@TableName("apps_equipment_alarm")
-public class EquipmentAlarm implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "处理时间")
-    private Date handleTime;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java
deleted file mode 100644
index 8fdc596..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentFault.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 故障电池
- *
- * @author 科技小王子
- * @since 2022-12-01 18:40:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "EquipmentFault对象", description = "故障电池")
-@TableName("apps_equipment_fault")
-public class EquipmentFault implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "故障原因")
-    private String faultType;
-
-    @ApiModelProperty(value = "上传图片")
-    private String image;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "处理时间")
-    private Date handleTime;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java
deleted file mode 100644
index c65c4eb..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentGoods.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 电池管理记录表
- *
- * @author 科技小王子
- * @since 2023-02-28 22:40:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "EquipmentGoods对象", description = "电池管理记录表")
-@TableName("apps_equipment_goods")
-public class EquipmentGoods implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品ID")
-    @TableId(value = "goods_id", type = IdType.AUTO)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "下单类型")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "分类ID")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "电池型号")
-    private String batteryModel;
-
-    @ApiModelProperty(value = "库存总量")
-    private Integer stockTotal;
-
-    @ApiModelProperty(value = "商品卖点")
-    private String sellingPoint;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "电池租金")
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池价格")
-    private BigDecimal batteryPrice;
-
-    @ApiModelProperty(value = "电池押金")
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "电池保险")
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "首付款")
-    private BigDecimal downPayment;
-
-    @ApiModelProperty(value = "分期期数")
-    private BigDecimal periods;
-
-    @ApiModelProperty(value = "每期还款")
-    private BigDecimal repayment;
-
-    @ApiModelProperty(value = "手续费")
-    private BigDecimal serviceCharges;
-
-    @ApiModelProperty(value = "分期方式")
-    private Integer periodsType;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "订单ID")
-    @TableField(exist = false)
-    private Integer orderId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java
deleted file mode 100644
index 476e4ac..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrder.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 订单记录表
- *
- * @author 科技小王子
- * @since 2023-04-14 21:24:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "EquipmentOrder对象", description = "订单记录表")
-@TableName("apps_equipment_order")
-public class EquipmentOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单ID")
-    @TableId(value = "order_id", type = IdType.AUTO)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单标题")
-    private String subject;
-
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
-
-    @ApiModelProperty(value = "商品总金额(不含优惠折扣)")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "订单金额(含优惠折扣)")
-    private BigDecimal orderPrice;
-
-    @ApiModelProperty(value = "优惠券ID")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券抵扣金额")
-    private BigDecimal couponMoney;
-
-    @ApiModelProperty(value = "积分抵扣金额")
-    private BigDecimal pointsMoney;
-
-    @ApiModelProperty(value = "积分抵扣数量")
-    private Integer pointsNum;
-
-    @ApiModelProperty(value = "实际付款金额(包含运费)")
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "第三方支付实收金额")
-    private BigDecimal receiptAmount;
-
-    @ApiModelProperty(value = "后台修改的订单金额(差价)")
-    private BigDecimal updatePrice;
-
-    @ApiModelProperty(value = "买家留言")
-    private String buyerRemark;
-
-    @ApiModelProperty(value = "支付方式(废弃)")
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付方式（余额10/微信20/支付宝30/通联支付40/其他支付50）")
-    private String payMethod;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "付款时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "第三方交易记录ID")
-    private String tradeId;
-
-    @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)")
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "自提门店ID")
-    private Integer extractShopId;
-
-    @ApiModelProperty(value = "核销店员ID")
-    private Integer extractClerkId;
-
-    @ApiModelProperty(value = "运费金额")
-    private BigDecimal expressPrice;
-
-    @ApiModelProperty(value = "物流公司ID (废弃)")
-    private Integer expressId;
-
-    @ApiModelProperty(value = "物流单号 (废弃)")
-    private String expressNo;
-
-    @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)")
-    private Integer deliveryStatus;
-
-    @ApiModelProperty(value = "发货时间")
-    private Date deliveryTime;
-
-    @ApiModelProperty(value = "收货状态(10未收货 20已收货)")
-    private Integer receiptStatus;
-
-    @ApiModelProperty(value = "收货时间")
-    private Date receiptTime;
-
-    @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)")
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "赠送的积分数量")
-    private Integer pointsBonus;
-
-    @ApiModelProperty(value = "商家备注")
-    private String merchantRemark;
-
-    @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)")
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "续租订单的关联单号")
-    private Integer rentOrderId;
-
-    @ApiModelProperty(value = "微信支付交易号(废弃)")
-    private String transactionId;
-
-    @ApiModelProperty(value = "是否已评价(0否 1是)")
-    private Integer isComment;
-
-    @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)")
-    private Integer orderSource;
-
-    @ApiModelProperty(value = "来源记录ID")
-    private Integer orderSourceId;
-
-    @ApiModelProperty(value = "来源记录的参数 (json格式)")
-    private String orderSourceData;
-
-    @ApiModelProperty(value = "电池租金")
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池押金")
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "保险")
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "购买月份数量")
-    private Integer month;
-
-    @ApiModelProperty(value = "服务到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "是否续费订单")
-    private Integer isRenew;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "电池商品ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java
deleted file mode 100644
index 51f5889..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentOrderGoods.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 电池管理记录表
- *
- * @author 科技小王子
- * @since 2023-05-11 19:10:13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "EquipmentOrderGoods对象", description = "电池管理记录表")
-@TableName("apps_equipment_order_goods")
-public class EquipmentOrderGoods implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品ID")
-    @TableId(value = "order_goods_id", type = IdType.AUTO)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "下单类型")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "分类ID")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "电池型号")
-    private String batteryModel;
-
-    @ApiModelProperty(value = "商品卖点")
-    private String sellingPoint;
-
-    @ApiModelProperty(value = "库存总量")
-    private Integer stockTotal;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "电池租金")
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池价格")
-    private BigDecimal batteryPrice;
-
-    @ApiModelProperty(value = "电池押金")
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "电池保险")
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "首付款")
-    private BigDecimal downPayment;
-
-    @ApiModelProperty(value = "分期期数")
-    private BigDecimal periods;
-
-    @ApiModelProperty(value = "分期还款")
-    private BigDecimal repayment;
-
-    @ApiModelProperty(value = "手续费")
-    private BigDecimal serviceCharges;
-
-    @ApiModelProperty(value = "分期方式 10按周 20按月")
-    private Integer periodsType;
-
-    @ApiModelProperty(value = "订单编号")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java b/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java
deleted file mode 100644
index 688db34..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/EquipmentRecord.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 前世今生
- *
- * @author 科技小王子
- * @since 2022-12-03 01:23:53
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "EquipmentRecord对象", description = "前世今生")
-@TableName("apps_equipment_record")
-public class EquipmentRecord implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "记录ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "事件类型")
-    private String eventType;
-
-    @ApiModelProperty(value = "请求参数")
-    private String params;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/Hualala.java b/src/main/java/com/gxwebsoft/apps/entity/Hualala.java
deleted file mode 100644
index 7d96aa7..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Hualala.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 常用链接推荐记录表
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Link对象", description = "常用链接推荐记录表")
-@TableName("apps_hualala")
-public class Hualala implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "当前请求的时间戳(毫秒)")
-    @TableField(exist = false)
-    private Long timestamp;
-
-    @ApiModelProperty(value = "服务器接口")
-    @TableField(exist = false)
-    private String apiUrl = "https://www-openapi.hualala.com";
-
-    @ApiModelProperty(value = "开发者Key")
-    @TableField(exist = false)
-    private String appKey = "2487";
-
-    @ApiModelProperty(value = "appSecret")
-    @TableField(exist = false)
-    private String appSecret = "Hgr520dQpEiFe0FV";
-
-    @ApiModelProperty(value = "集团ID")
-    @TableField(exist = false)
-    private String groupID = "1528";
-
-    @ApiModelProperty(value = "店铺ID")
-    @TableField(exist = false)
-    private String shopID = "76288809";
-
-    @ApiModelProperty(value = "签名")
-    @TableField(exist = false)
-    private String signature;
-
-    @ApiModelProperty(value = "版本号，固定传 3")
-    @TableField(exist = false)
-    private Integer version = 3;
-
-    @ApiModelProperty(value = "业务参数 格式为jsonString")
-    @TableField(exist = false)
-    private String requestBody;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java
deleted file mode 100644
index c48e776..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCard.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "HualalaCard对象", description = "")
-@TableName("apps_hualala_card")
-public class HualalaCard implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "groupID")
-    private String groupId;
-
-    @ApiModelProperty(value = "shopID")
-    private String shopId;
-
-    @ApiModelProperty(value = "网速会员id")
-    private Integer userId;
-
-    @ApiModelProperty(value = "会员卡ID")
-    private String cardId;
-
-    private String cardTypeId;
-
-    @ApiModelProperty(value = "会员卡等级ID")
-    private String cardLevelId;
-
-    @ApiModelProperty(value = "会员卡等级名称")
-    private String cardLevelName;
-
-    @ApiModelProperty(value = "卡状态　10：正常　20：挂失中　30：冻结　40：注销（作废）50：已过期")
-    private String cardStatus;
-
-    private String customerId;
-
-    @ApiModelProperty(value = "会员卡入会店铺字段")
-    private String createShopId;
-
-    @ApiModelProperty(value = "入会店铺名称")
-    private String createShopName;
-
-    @ApiModelProperty(value = "卡号")
-    private String cardNo;
-
-    @ApiModelProperty(value = "姓名")
-    private String customerName;
-
-    @ApiModelProperty(value = "	手机号")
-    private String customerMobile;
-
-    @ApiModelProperty(value = "性别 0：女 1：男 2：未知")
-    private Integer customerSex;
-
-    @ApiModelProperty(value = "生日")
-    private String customerBirthday;
-
-    @ApiModelProperty(value = "卡余额")
-    private BigDecimal cardBalance;
-
-    @ApiModelProperty(value = "积分余额")
-    private BigDecimal pointBalance;
-
-    @ApiModelProperty(value = "累计储值金额")
-    private BigDecimal saveMoneyTotal;
-
-    @ApiModelProperty(value = "累计消费金额")
-    private BigDecimal consumptionTotal;
-
-    @ApiModelProperty(value = "累计消费次数")
-    private Integer consumptionCount;
-
-    @ApiModelProperty(value = "当前等级积分")
-    private Integer grade;
-
-    @ApiModelProperty(value = "下一等级积分")
-    private Integer nextLevelGrade;
-
-    @ApiModelProperty(value = "有效期至(yyyyMMddHHmmss) 0：表示永久有效")
-    private String expireTime;
-
-    @ApiModelProperty(value = "最后一次交易时间")
-    private String lastTransTime;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java
deleted file mode 100644
index e0c0708..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCardBenefits.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员权益
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "HualalaCardBenefits对象", description = "会员权益")
-@TableName("apps_hualala_card_benefits")
-public class HualalaCardBenefits implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "会员等级名称")
-    private String cardLevelName;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "封面图")
-    private String image;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java
deleted file mode 100644
index 85730e1..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCart.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 购物车
- */
-@Data
-public class HualalaCart {
-  List<HualalaFood> items;// 商品列表
-  BigDecimal totalPrice; // 总结
-  int totalNum; // 总数
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java
deleted file mode 100644
index 560dbc4..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaCartFood.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 购物车商品
- *
- * @author 科技小王子
- * @since 2023-01-14 14:46:44
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "HualalaCartFood对象", description = "购物车商品")
-@TableName("apps_hualala_cart_food")
-public class HualalaCartFood implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "总数量")
-    private Integer foodId;
-
-    @ApiModelProperty(value = "菜品名称")
-    private String foodName;
-
-    @ApiModelProperty(value = "skuId")
-    private String skuId;
-
-    @ApiModelProperty(value = "店铺id")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "店铺名称")
-    private String shopName;
-
-    @ApiModelProperty(value = "店铺标志")
-    private String shopLogo;
-
-    @ApiModelProperty(value = "商品图")
-    private String coverUrl;
-
-    @ApiModelProperty(value = "已放入购物车数量")
-    @TableField(exist = false)
-    private Long num;
-
-    @ApiModelProperty(value = "售价")
-    private BigDecimal sellPrice;
-
-    @ApiModelProperty(value = "库存")
-    private Integer stock;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java
deleted file mode 100644
index 76b1196..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaFood.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 菜品分类
- *
- * @author 科技小王子
- * @since 2023-01-12 15:34:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "HualalaFood对象", description = "菜品分类")
-@TableName("apps_hualala_food")
-public class HualalaFood implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "菜品ID")
-    private String foodId;
-
-    @ApiModelProperty(value = "菜品Key")
-    private String foodKey;
-
-    @ApiModelProperty(value = "集团ID")
-    private String groupId;
-
-    @ApiModelProperty(value = "店铺ID")
-    private String shopId;
-
-    @ApiModelProperty(value = "菜品条目数")
-    private String foodCount;
-
-    @ApiModelProperty(value = "加入购物车数量")
-    @TableField(exist = false)
-    private Integer cartNum;
-
-    @ApiModelProperty(value = "售价")
-    @TableField(exist = false)
-    private BigDecimal sellPrice;
-
-    @ApiModelProperty("子菜单")
-    @TableField(exist = false)
-    private List<HualalaFood> children;
-//
-//    @ApiModelProperty(value = "pos菜品分类ID")
-//    private String foodCategoryId;
-//
-//    @ApiModelProperty(value = "pos菜品分类Key")
-//    private String foodCategoryKey;
-//
-//    @ApiModelProperty(value = "pos菜品分类名称")
-//    private String foodCategoryName;
-
-    @ApiModelProperty(value = "线上菜品分类ID")
-    private String foodOnlineCategoryId;
-
-    @ApiModelProperty(value = "线上菜品分类Key")
-    private String foodOnlineCategoryKey;
-
-    @ApiModelProperty(value = "线上菜品分类名称")
-    private String foodOnlineCategoryName;
-
-    @ApiModelProperty(value = "是/否是配料，false：不是 true：是")
-    private Integer isBatching;
-
-    @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售")
-    private Integer isSingleSale;
-
-    @ApiModelProperty(value = "此菜品关联的收入科目key，例如冷菜收入、热菜收入、酒水收入")
-    private String foodSubjectKey;
-
-    @ApiModelProperty(value = "对应出品部门Key列表")
-    private String departmentKeyLst;
-
-    @ApiModelProperty(value = "配菜的分类key,在这里选择配菜")
-    private String batchingFoodCategoryKey;
-
-    @ApiModelProperty(value = "菜品名称")
-    private String foodName;
-
-    @ApiModelProperty(value = "菜品编号 可用于与三方菜品数据做映射")
-    private String foodCode;
-
-    @ApiModelProperty(value = "菜品别名")
-    private String foodAliasName;
-
-    @ApiModelProperty(value = "菜品注记码")
-    private String foodMnemonicCode;
-
-    @ApiModelProperty(value = "配菜的分类key,在这里选择配菜")
-    private Integer isDiscount;
-
-    @ApiModelProperty(value = "规格")
-    private Object units;
-
-  @ApiModelProperty(value = "起售")
-  private String minOrderCount;
-
-  @ApiModelProperty(value = "分类编号")
-  private String foodCategoryCode;
-
-  @ApiModelProperty(value = "分类英文名")
-  private String foodCategoryEnName;
-
-  @ApiModelProperty(value = "分类分组名称")
-  private String foodCategoryGroupName;
-
-  @ApiModelProperty(value = "0:堂食 1:堂食，外送，自提 2:外送，自提 3:自提 4:外送 5:堂食，自提 6:堂食，外送")
-  private String takeawayTag;
-
-  @ApiModelProperty(value = "菜品图片")
-  private String imgePath;
-
-  @ApiModelProperty(value = "结算系数")
-  private String settlementProportion;
-
-  @ApiModelProperty(value = "分类显示排序值")
-  private Integer sortIndex;
-
-  @ApiModelProperty(value = "状态, 0正常, 1冻结")
-  private Integer status;
-
-  @ApiModelProperty(value = "是否删除, 0否, 1是")
-  @TableLogic
-  private Integer deleted;
-
-  @ApiModelProperty(value = "租户id")
-  private Integer tenantId;
-
-  @ApiModelProperty(value = "注册时间")
-  private Date createTime;
-
-  @ApiModelProperty(value = "修改时间")
-  private Date updateTime;
-
-//    private Integer isComments;
-//
-//    private Integer isActive;
-//
-//    private Integer isOpen;
-//
-//    private Integer isSetFood;
-//
-//    private Object setFoodDetailJson;
-//
-//    private Integer isTempFood;
-//
-//    private String py;
-//
-//
-//    private String tasteList;
-//
-//    private Object tasteGroupList;
-//
-//    private Object makingMethodList;
-//
-//    private Object makingMethodGroupList;
-//
-//    private Integer isSpecialty;
-//
-//    private Integer isRecommend;
-//
-//    private Integer isNews;
-//
-//    private String hotTag;
-//
-//    private String salesCount;
-//
-//    private Integer isNeedConfirmFoodNumber;
-//
-//    private String takeoutPackagingFee;
-//
-//    private String incrementUnit;
-
-//    private Integer isHasImage;
-//
-//    private String imageHwp;
-//
-//    private String starLevel;
-//
-//    private String foodTagIds;
-//
-    private String parentFoodId;
-//
-//    private String foodEnName;
-//
-//    private Integer isAutoAdd;
-//
-//    private Integer isCanRefund;
-//
-//    private Integer setPerson;
-//
-//    private Integer tasteIsRequired;
-//
-//    private Integer tasteIsMultiple;
-//
-//    private Integer makingMethodIsRequired;
-//
-//    private Integer makingMethodIsMultiple;
-//
-//    private String initClickAmount;
-//
-//    private String actualClickAmount;
-//
-//    private String recentClickAmount;
-//
-//    private String clickAlertMess;
-//
-//    private String sourceFoodId;
-//
-//    private String salesCommission;
-//
-//    private String foodKeyElementLst;
-//
-//    private String foodSortIndex;
-//
-//    private String actionTime;
-//
-//    private String foodSubjectName;
-//
-//    private String foodSubjectCode;
-//
-//    private String departmentId;
-//
-//    private String departmentKey;
-//
-//    private String popularity;
-//
-//    private String detailSplit;
-//
-//    private String batchingIsFoodNumberRate;
-
-//    @ApiModelProperty(value = "特价")
-//    private String specialPrice;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice2;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice3;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice4;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice5;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice6;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String onlineWmPrice;
-//
-//    @ApiModelProperty(value = "标签ids")
-//    private String tagIds;
-//
-//    @ApiModelProperty(value = "标签名称")
-//    private String tagNames;
-//
-//    @ApiModelProperty(value = "礼品券ID")
-//    private String giftItemId;
-//
-//    @ApiModelProperty(value = "礼品券有效期")
-//    private String giftValidPeriod;
-//
-//    @ApiModelProperty(value = "菜品分类说明")
-//    private String description;
-//
-//    @ApiModelProperty(value = "记录状态")
-//    private String action;
-
-//    @ApiModelProperty(value = "封面图")
-//    private String image;
-//
-//    @ApiModelProperty(value = "内容")
-//    private String content;
-//
-//    @ApiModelProperty(value = "排序(数字越小越靠前)")
-//    private Integer sortNumber;
-//
-//    @ApiModelProperty(value = "备注")
-//    private String comments;
-
-//  private String workingLunchTag;
-//
-//  private String adsId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java
deleted file mode 100644
index 3175e6d..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaFoodCategory.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 菜品分类
- *
- * @author 科技小王子
- * @since 2023-01-12 09:49:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "HualalaFoodCategory对象", description = "菜品分类")
-@TableName("apps_hualala_food_category")
-public class HualalaFoodCategory implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是")
-    private Integer type;
-
-    @ApiModelProperty(value = "名称")
-    private String foodCategoryName;
-
-    @ApiModelProperty(value = "收入名称")
-    private String foodSubjectName;
-
-    @ApiModelProperty(value = "菜品Key")
-    private String foodKey;
-
-    @ApiModelProperty(value = "菜品条目数")
-    private String foodCount;
-
-    @ApiModelProperty(value = "分类ID")
-    private String foodCategoryId;
-
-    @ApiModelProperty(value = "分类ID")
-    private String foodCategoryGroupName;
-
-    @ApiModelProperty(value = "分类Key")
-    private String foodCategoryKey;
-
-    @ApiModelProperty(value = "记录状态")
-    private String action;
-
-    @ApiModelProperty(value = "结算系数")
-    private String settlementProportion;
-
-    @ApiModelProperty(value = "是否启用")
-    private Integer isActive;
-
-    @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是")
-    private Integer isBatching;
-
-    @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售")
-    private Integer isSingleSale;
-
-    @ApiModelProperty(value = "分类显示排序值")
-    private Integer sortIndex;
-
-    @ApiModelProperty(value = "介绍页id")
-    private Integer adsId;
-
-    @ApiModelProperty(value = "店铺ID")
-    private String shopId;
-
-    @ApiModelProperty(value = "封面图")
-    private String image;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java b/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java
deleted file mode 100644
index f6c01b7..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/HualalaShop.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 哗啦啦门店管理
- *
- * @author 科技小王子
- * @since 2023-01-12 18:24:44
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "HualalaShop对象", description = "哗啦啦门店管理")
-@TableName("apps_hualala_shop")
-public class HualalaShop implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "店铺ID")
-    private Long shopId;
-
-    @ApiModelProperty(value = "店铺名称")
-    private String shopName;
-
-    @ApiModelProperty(value = "店铺logo")
-    private String logoUrl;
-
-    @ApiModelProperty(value = "所在城市ID")
-    private String shopCity;
-
-    @ApiModelProperty(value = "所在城市")
-    private String shopCityName;
-
-    @ApiModelProperty(value = "营业时间")
-    private String shopOpenTime;
-
-    @ApiModelProperty(value = "店内电话")
-    private String shopPhone;
-
-    @ApiModelProperty(value = "HLL")
-    private String acspType;
-
-    @ApiModelProperty(value = "1")
-    private String action;
-
-    @ApiModelProperty(value = "20230111104803")
-    private String actionTime;
-
-    @ApiModelProperty(value = "品牌ID")
-    private String brandId;
-
-    @ApiModelProperty(value = "品牌名称")
-    private String brandName;
-
-    @ApiModelProperty(value = "1")
-    private String businessModel;
-
-    @ApiModelProperty(value = "图片")
-    private String imagePath;
-
-    @ApiModelProperty(value = "22.7913010")
-    private Double mapLatitudeValueBaiDu;
-
-    @ApiModelProperty(value = "108.3312800")
-    private Double mapLongitudeValueBaiDu;
-
-    @ApiModelProperty(value = "0")
-    private Integer operationMode;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "小通云缴商户号")
-    private String payMerchantNo;
-
-    @ApiModelProperty(value = "小通云缴秘钥")
-    private String paySecret;
-
-    @ApiModelProperty(value = "客户ID")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "距离")
-    @TableField(exist = false)
-    private Double distance;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java b/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java
deleted file mode 100644
index 60b37f6..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/ItemVo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 操作购物车信息
- */
-@Data
-public class ItemVo {
-  private String userId;        // 用户ID
-  private String shopId;        // 店铺ID
-  private Integer foodId;       // 菜品ID
-  private Integer num;          // 数量
-  private BigDecimal price;     // 售价
-  private String imge;          // 菜品图片
-  private String foodName;      // 菜品名称
-  private String foodUnitID;    // 规格ID
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/Link.java b/src/main/java/com/gxwebsoft/apps/entity/Link.java
deleted file mode 100644
index 006b829..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/Link.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 常用链接推荐记录表
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Link对象", description = "常用链接推荐记录表")
-@TableName("apps_link")
-public class Link implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "链接ID")
-    @TableId(value = "link_id", type = IdType.AUTO)
-    private Integer linkId;
-
-    @ApiModelProperty(value = "链接名称")
-    private String linkName;
-
-    @ApiModelProperty(value = "链接图标")
-    private String linkIcon;
-
-    @ApiModelProperty(value = "路由地址")
-    private String linkPath;
-
-    @ApiModelProperty(value = "组件路径")
-    private String linkComponent;
-
-    @ApiModelProperty(value = "链接类型")
-    private String type;
-
-    @ApiModelProperty(value = "点击次数")
-    private Integer clicks;
-
-    @ApiModelProperty(value = "推荐理由")
-    private String comments;
-
-    @ApiModelProperty(value = "文章排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/entity/TestData.java b/src/main/java/com/gxwebsoft/apps/entity/TestData.java
deleted file mode 100644
index 232e598..0000000
--- a/src/main/java/com/gxwebsoft/apps/entity/TestData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 测试数据表
- *
- * @author 科技小王子
- * @since 2023-02-01 12:13:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TestData对象", description = "测试数据表")
-@TableName("apps_test_data")
-public class TestData implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java
deleted file mode 100644
index cbb956a..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcAgentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcAgent;
-import com.gxwebsoft.apps.param.BcAgentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 代报餐管理Mapper
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-public interface BcAgentMapper extends BaseMapper<BcAgent> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcAgent>
-     */
-    List<BcAgent> selectPageRel(@Param("page") IPage<BcAgent> page,
-                             @Param("param") BcAgentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcAgent> selectListRel(@Param("param") BcAgentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java
deleted file mode 100644
index 06c057f..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcCookbookMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcCookbook;
-import com.gxwebsoft.apps.param.BcCookbookParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 常用菜谱Mapper
- *
- * @author 科技小王子
- * @since 2023-05-05 14:56:54
- */
-public interface BcCookbookMapper extends BaseMapper<BcCookbook> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcCookbook>
-     */
-    List<BcCookbook> selectPageRel(@Param("page") IPage<BcCookbook> page,
-                             @Param("param") BcCookbookParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcCookbook> selectListRel(@Param("param") BcCookbookParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java
deleted file mode 100644
index 4a9b7b1..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcEquipmentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcEquipment;
-import com.gxwebsoft.apps.param.BcEquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 报餐设备管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-02 10:34:40
- */
-public interface BcEquipmentMapper extends BaseMapper<BcEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcEquipment>
-     */
-    List<BcEquipment> selectPageRel(@Param("page") IPage<BcEquipment> page,
-                             @Param("param") BcEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcEquipment> selectListRel(@Param("param") BcEquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java
deleted file mode 100644
index 75345d9..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcExportMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcExport;
-import com.gxwebsoft.apps.param.BcExportParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 报餐统计导出Mapper
- *
- * @author 科技小王子
- * @since 2023-06-01 21:47:02
- */
-public interface BcExportMapper extends BaseMapper<BcExport> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcExport>
-     */
-    List<BcExport> selectPageRel(@Param("page") IPage<BcExport> page,
-                             @Param("param") BcExportParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcExport> selectListRel(@Param("param") BcExportParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java
deleted file mode 100644
index 957d632..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcFoodMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcFood;
-import com.gxwebsoft.apps.param.BcFoodParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 发布菜品明细Mapper
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-public interface BcFoodMapper extends BaseMapper<BcFood> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcFood>
-     */
-    List<BcFood> selectPageRel(@Param("page") IPage<BcFood> page,
-                             @Param("param") BcFoodParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcFood> selectListRel(@Param("param") BcFoodParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java
deleted file mode 100644
index bc93d98..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcPlanMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.param.BcPlanParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 菜品发布管理Mapper
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-public interface BcPlanMapper extends BaseMapper<BcPlan> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcPlan>
-     */
-    List<BcPlan> selectPageRel(@Param("page") IPage<BcPlan> page,
-                             @Param("param") BcPlanParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcPlan> selectListRel(@Param("param") BcPlanParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java
deleted file mode 100644
index 22cebef..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/BcTemporaryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.BcTemporary;
-import com.gxwebsoft.apps.param.BcTemporaryParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 临时报餐管理Mapper
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-public interface BcTemporaryMapper extends BaseMapper<BcTemporary> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<BcTemporary>
-     */
-    List<BcTemporary> selectPageRel(@Param("page") IPage<BcTemporary> page,
-                             @Param("param") BcTemporaryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<BcTemporary> selectListRel(@Param("param") BcTemporaryParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java
deleted file mode 100644
index 7e5585e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/CashierMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.Cashier;
-import com.gxwebsoft.apps.param.CashierParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 海牛收银台记录表Mapper
- *
- * @author WebSoft
- * @since 2022-11-18 11:47:09
- */
-public interface CashierMapper extends BaseMapper<Cashier> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Cashier>
-     */
-    List<Cashier> selectPageRel(@Param("page") IPage<Cashier> page,
-                             @Param("param") CashierParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Cashier> selectListRel(@Param("param") CashierParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java
deleted file mode 100644
index 9131be8..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentAlarmMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.EquipmentAlarm;
-import com.gxwebsoft.apps.param.EquipmentAlarmParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 故障报警记录Mapper
- *
- * @author 科技小王子
- * @since 2022-12-01 23:49:44
- */
-public interface EquipmentAlarmMapper extends BaseMapper<EquipmentAlarm> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentAlarm>
-     */
-    List<EquipmentAlarm> selectPageRel(@Param("page") IPage<EquipmentAlarm> page,
-                             @Param("param") EquipmentAlarmParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentAlarm> selectListRel(@Param("param") EquipmentAlarmParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java
deleted file mode 100644
index 9b7f9f8..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentFaultMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.EquipmentFault;
-import com.gxwebsoft.apps.param.EquipmentFaultParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 故障电池Mapper
- *
- * @author 科技小王子
- * @since 2022-12-01 18:40:25
- */
-public interface EquipmentFaultMapper extends BaseMapper<EquipmentFault> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentFault>
-     */
-    List<EquipmentFault> selectPageRel(@Param("page") IPage<EquipmentFault> page,
-                             @Param("param") EquipmentFaultParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentFault> selectListRel(@Param("param") EquipmentFaultParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java
deleted file mode 100644
index bbe47c9..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentGoodsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.EquipmentGoods;
-import com.gxwebsoft.apps.param.EquipmentGoodsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 电池管理记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-02-28 22:40:50
- */
-public interface EquipmentGoodsMapper extends BaseMapper<EquipmentGoods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentGoods>
-     */
-    List<EquipmentGoods> selectPageRel(@Param("page") IPage<EquipmentGoods> page,
-                             @Param("param") EquipmentGoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentGoods> selectListRel(@Param("param") EquipmentGoodsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java
deleted file mode 100644
index 905ba86..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.param.EquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 设备管理Mapper
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-public interface EquipmentMapper extends BaseMapper<Equipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Equipment>
-     */
-    List<Equipment> selectPageRel(@Param("page") IPage<Equipment> page,
-                             @Param("param") EquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Equipment> selectListRel(@Param("param") EquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java
deleted file mode 100644
index 88c3887..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderGoodsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
-import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 电池管理记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-05-11 19:10:13
- */
-public interface EquipmentOrderGoodsMapper extends BaseMapper<EquipmentOrderGoods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentOrderGoods>
-     */
-    List<EquipmentOrderGoods> selectPageRel(@Param("page") IPage<EquipmentOrderGoods> page,
-                             @Param("param") EquipmentOrderGoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentOrderGoods> selectListRel(@Param("param") EquipmentOrderGoodsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java
deleted file mode 100644
index f3ba899..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentOrderMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.EquipmentOrder;
-import com.gxwebsoft.apps.param.EquipmentOrderParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 订单记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-14 21:24:31
- */
-public interface EquipmentOrderMapper extends BaseMapper<EquipmentOrder> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentOrder>
-     */
-    List<EquipmentOrder> selectPageRel(@Param("page") IPage<EquipmentOrder> page,
-                             @Param("param") EquipmentOrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentOrder> selectListRel(@Param("param") EquipmentOrderParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java
deleted file mode 100644
index 7f9244f..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/EquipmentRecordMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.EquipmentRecord;
-import com.gxwebsoft.apps.param.EquipmentRecordParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 前世今生Mapper
- *
- * @author 科技小王子
- * @since 2022-12-03 01:23:53
- */
-public interface EquipmentRecordMapper extends BaseMapper<EquipmentRecord> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<EquipmentRecord>
-     */
-    List<EquipmentRecord> selectPageRel(@Param("page") IPage<EquipmentRecord> page,
-                             @Param("param") EquipmentRecordParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<EquipmentRecord> selectListRel(@Param("param") EquipmentRecordParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java
deleted file mode 100644
index 139a468..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardBenefitsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.HualalaCardBenefits;
-import com.gxwebsoft.apps.param.HualalaCardBenefitsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员权益Mapper
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-public interface HualalaCardBenefitsMapper extends BaseMapper<HualalaCardBenefits> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaCardBenefits>
-     */
-    List<HualalaCardBenefits> selectPageRel(@Param("page") IPage<HualalaCardBenefits> page,
-                             @Param("param") HualalaCardBenefitsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaCardBenefits> selectListRel(@Param("param") HualalaCardBenefitsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java
deleted file mode 100644
index 3f64ff3..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCardMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.HualalaCard;
-import com.gxwebsoft.apps.param.HualalaCardParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * Mapper
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-public interface HualalaCardMapper extends BaseMapper<HualalaCard> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaCard>
-     */
-    List<HualalaCard> selectPageRel(@Param("page") IPage<HualalaCard> page,
-                             @Param("param") HualalaCardParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaCard> selectListRel(@Param("param") HualalaCardParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java
deleted file mode 100644
index 7f1cedd..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaCartFoodMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.HualalaCartFood;
-import com.gxwebsoft.apps.param.HualalaCartFoodParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 购物车商品Mapper
- *
- * @author 科技小王子
- * @since 2023-01-14 14:46:44
- */
-public interface HualalaCartFoodMapper extends BaseMapper<HualalaCartFood> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaCartFood>
-     */
-    List<HualalaCartFood> selectPageRel(@Param("page") IPage<HualalaCartFood> page,
-                             @Param("param") HualalaCartFoodParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaCartFood> selectListRel(@Param("param") HualalaCartFoodParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java
deleted file mode 100644
index b4f33c3..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodCategoryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import com.gxwebsoft.apps.param.HualalaFoodCategoryParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 菜品分类Mapper
- *
- * @author 科技小王子
- * @since 2023-01-12 09:49:46
- */
-public interface HualalaFoodCategoryMapper extends BaseMapper<HualalaFoodCategory> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaFoodCategory>
-     */
-    List<HualalaFoodCategory> selectPageRel(@Param("page") IPage<HualalaFoodCategory> page,
-                             @Param("param") HualalaFoodCategoryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaFoodCategory> selectListRel(@Param("param") HualalaFoodCategoryParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java
deleted file mode 100644
index 3886d45..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaFoodMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.param.HualalaFoodParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 菜品分类Mapper
- *
- * @author 科技小王子
- * @since 2023-01-12 15:34:55
- */
-public interface HualalaFoodMapper extends BaseMapper<HualalaFood> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaFood>
-     */
-    List<HualalaFood> selectPageRel(@Param("page") IPage<HualalaFood> page,
-                             @Param("param") HualalaFoodParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaFood> selectListRel(@Param("param") HualalaFoodParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java
deleted file mode 100644
index 286aeef..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.Hualala;
-import com.gxwebsoft.apps.entity.Link;
-import com.gxwebsoft.apps.param.LinkParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 哗啦啦Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-public interface HualalaMapper extends BaseMapper<Hualala> {
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java
deleted file mode 100644
index 84eff72..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/HualalaShopMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.param.HualalaShopParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 哗啦啦门店管理Mapper
- *
- * @author 科技小王子
- * @since 2023-01-12 18:24:44
- */
-public interface HualalaShopMapper extends BaseMapper<HualalaShop> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<HualalaShop>
-     */
-    List<HualalaShop> selectPageRel(@Param("page") IPage<HualalaShop> page,
-                             @Param("param") HualalaShopParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<HualalaShop> selectListRel(@Param("param") HualalaShopParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java
deleted file mode 100644
index 5a2c573..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/LinkMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.Link;
-import com.gxwebsoft.apps.param.LinkParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 常用链接推荐记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-public interface LinkMapper extends BaseMapper<Link> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Link>
-     */
-    List<Link> selectPageRel(@Param("page") IPage<Link> page,
-                             @Param("param") LinkParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Link> selectListRel(@Param("param") LinkParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java b/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java
deleted file mode 100644
index ddb858e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/TestDataMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.apps.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.apps.entity.TestData;
-import com.gxwebsoft.apps.param.TestDataParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 测试数据表Mapper
- *
- * @author 科技小王子
- * @since 2023-02-01 12:13:46
- */
-public interface TestDataMapper extends BaseMapper<TestData> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TestData>
-     */
-    List<TestData> selectPageRel(@Param("page") IPage<TestData> page,
-                             @Param("param") TestDataParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TestData> selectListRel(@Param("param") TestDataParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml
deleted file mode 100644
index b0c71fb..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcAgentMapper.xml
+++ /dev/null
@@ -1,44 +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="com.gxwebsoft.apps.mapper.BcAgentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,c.nickname as parentName
-        FROM apps_bc_agent a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN sys_user c ON a.parent_id = c.user_id
-        <where>
-            <if test="param.agentId != null">
-                AND a.agent_id = #{param.agentId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            AND b.deleted = 0 AND c.deleted = 0
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcAgent">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcAgent">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml
deleted file mode 100644
index 577901f..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcCookbookMapper.xml
+++ /dev/null
@@ -1,53 +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="com.gxwebsoft.apps.mapper.BcCookbookMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_bc_cookbook a
-        <where>
-            <if test="param.cookbookId != null">
-                AND a.cookbook_id = #{param.cookbookId}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.period != null">
-                AND a.period LIKE CONCAT('%', #{param.period}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcCookbook">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcCookbook">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml
deleted file mode 100644
index 2461118..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcEquipmentMapper.xml
+++ /dev/null
@@ -1,65 +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="com.gxwebsoft.apps.mapper.BcEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_bc_equipment a
-        <where>
-            <if test="param.bcEquipmentId != null">
-                AND a.bc_equipment_id = #{param.bcEquipmentId}
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml
deleted file mode 100644
index 75c3fb8..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcExportMapper.xml
+++ /dev/null
@@ -1,83 +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="com.gxwebsoft.apps.mapper.BcExportMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_bc_export a
-        <where>
-            <if test="param.exportId != null">
-                AND a.export_id = #{param.exportId}
-            </if>
-            <if test="param.organizationName != null">
-                AND a.organization_name LIKE CONCAT('%', #{param.organizationName}, '%')
-            </if>
-            <if test="param.expendMoney != null">
-                AND a.expend_money = #{param.expendMoney}
-            </if>
-            <if test="param.breakfastPost != null">
-                AND a.breakfast_post = #{param.breakfastPost}
-            </if>
-            <if test="param.breakfastSign != null">
-                AND a.breakfast_sign = #{param.breakfastSign}
-            </if>
-            <if test="param.lunchPost != null">
-                AND a.lunch_post = #{param.lunchPost}
-            </if>
-            <if test="param.lunchSign != null">
-                AND a.lunch_sign = #{param.lunchSign}
-            </if>
-            <if test="param.dinnerPost != null">
-                AND a.dinner_post = #{param.dinnerPost}
-            </if>
-            <if test="param.dinnerSign != null">
-                AND a.dinner_sign = #{param.dinnerSign}
-            </if>
-            <if test="param.goodsPrice != null">
-                AND a.goods_price = #{param.goodsPrice}
-            </if>
-            <if test="param.deliveryTime != null">
-                AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcExport">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcExport">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml
deleted file mode 100644
index d0fbaaf..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcFoodMapper.xml
+++ /dev/null
@@ -1,57 +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="com.gxwebsoft.apps.mapper.BcFoodMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname
-        FROM apps_bc_food a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.bcFoodId != null">
-                AND a.bc_food_id = #{param.bcFoodId}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.period != null">
-                AND a.period LIKE CONCAT('%', #{param.period}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcFood">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcFood">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml
deleted file mode 100644
index e7732c7..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcPlanMapper.xml
+++ /dev/null
@@ -1,67 +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="com.gxwebsoft.apps.mapper.BcPlanMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname
-        FROM apps_bc_plan a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.bcPlanId != null">
-                AND a.bc_plan_id = #{param.bcPlanId}
-            </if>
-            <if test="param.dayTime != null">
-                AND a.day_time LIKE CONCAT('%', #{param.dayTime}, '%')
-            </if>
-            <if test="param.week != null">
-                AND a.week = #{param.week}
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.day_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.day_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.oldTime != null">
-              AND a.day_time = #{param.oldTime}
-            </if>
-
-            <if test="param.keywords != null">
-              AND ( b.nickname LIKE CONCAT('%', #{param.keywords}, '%') OR a.day_time LIKE CONCAT('%', #{param.keywords}, '%') )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml
deleted file mode 100644
index a82fdc4..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/BcTemporaryMapper.xml
+++ /dev/null
@@ -1,54 +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="com.gxwebsoft.apps.mapper.BcTemporaryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname
-        FROM apps_bc_temporary a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.temporaryId != null">
-                AND a.temporary_id = #{param.temporaryId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.applyStatus != null">
-              AND a.apply_status = #{param.applyStatus}
-            </if>
-            <if test="param.dayTime != null">
-              AND a.expiration_time >= #{param.dayTime}
-            </if>
-            <if test="param.deleted != null">
-              AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-              AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.BcTemporary">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.BcTemporary">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml
deleted file mode 100644
index 5a9e915..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/CashierMapper.xml
+++ /dev/null
@@ -1,86 +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="com.gxwebsoft.apps.mapper.CashierMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_cashier a
-        <where>
-            <if test="param.cashierId != null">
-                AND a.cashier_id = #{param.cashierId}
-            </if>
-            <if test="param.buyerId != null">
-                AND a.buyer_id LIKE CONCAT('%', #{param.buyerId}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.code != null">
-                AND a.code LIKE CONCAT('%', #{param.code}, '%')
-            </if>
-            <if test="param.msg != null">
-                AND a.msg LIKE CONCAT('%', #{param.msg}, '%')
-            </if>
-            <if test="param.outTradeNo != null">
-                AND a.out_trade_no LIKE CONCAT('%', #{param.outTradeNo}, '%')
-            </if>
-            <if test="param.amount != null">
-                AND a.amount LIKE CONCAT('%', #{param.amount}, '%')
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%')
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type LIKE CONCAT('%', #{param.payType}, '%')
-            </if>
-            <if test="param.totalAmount != null">
-                AND a.total_amount = #{param.totalAmount}
-            </if>
-            <if test="param.receiptAmount != null">
-                AND a.receipt_amount = #{param.receiptAmount}
-            </if>
-            <if test="param.feeAmount != null">
-                AND a.fee_amount = #{param.feeAmount}
-            </if>
-            <if test="param.settleAmount != null">
-                AND a.settle_amount = #{param.settleAmount}
-            </if>
-            <if test="param.merchantName != null">
-                AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.mobile != null">
-                AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%')
-            </if>
-            <if test="param.orderRemark != null">
-                AND a.order_remark LIKE CONCAT('%', #{param.orderRemark}, '%')
-            </if>
-            <if test="param.orderStatus != null">
-                AND a.order_status LIKE CONCAT('%', #{param.orderStatus}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.Cashier">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.Cashier">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml
deleted file mode 100644
index e8860d3..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentAlarmMapper.xml
+++ /dev/null
@@ -1,70 +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="com.gxwebsoft.apps.mapper.EquipmentAlarmMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-            b.merchant_name,b.merchant_code
-        FROM apps_equipment_alarm a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.alarmType != null">
-                AND a.alarm_type LIKE CONCAT('%', #{param.alarmType}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.handleTime != null">
-                AND a.handle_time LIKE CONCAT('%', #{param.handleTime}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.merchantName != null">
-              AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-              AND b.merchant_code = #{param.merchantCode}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentAlarm">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentAlarm">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml
deleted file mode 100644
index ce6bf2e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentFaultMapper.xml
+++ /dev/null
@@ -1,70 +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="com.gxwebsoft.apps.mapper.EquipmentFaultMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.merchant_name,b.merchant_code
-        FROM apps_equipment_fault a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code = #{param.equipmentCode}
-            </if>
-            <if test="param.faultType != null">
-                AND a.fault_type LIKE CONCAT('%', #{param.faultType}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.handleTime != null">
-                AND a.handle_time LIKE CONCAT('%', #{param.handleTime}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentFault">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentFault">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml
deleted file mode 100644
index 7136e08..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentGoodsMapper.xml
+++ /dev/null
@@ -1,94 +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="com.gxwebsoft.apps.mapper.EquipmentGoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-      b.merchant_name,b.merchant_code
-        FROM apps_equipment_goods a
-      LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        <where>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.equipmentCategory != null">
-                AND a.equipment_category LIKE CONCAT('%', #{param.equipment_category}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-          <if test="param.goodsName != null">
-            AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%')
-          </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
-            </if>
-            <if test="param.batteryModel != null">
-                AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.batteryRent != null">
-                AND a.battery_rent = #{param.batteryRent}
-            </if>
-            <if test="param.batteryPrice != null">
-                AND a.battery_price = #{param.batteryPrice}
-            </if>
-            <if test="param.batteryDeposit != null">
-                AND a.battery_deposit = #{param.batteryDeposit}
-            </if>
-            <if test="param.batteryInsurance != null">
-                AND a.battery_insurance = #{param.batteryInsurance}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantCode != null">
-            AND a.merchant_code &lt;= #{param.merchantCode}
-          </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name &lt;= #{param.merchantName}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml
deleted file mode 100644
index 043de45..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentMapper.xml
+++ /dev/null
@@ -1,121 +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="com.gxwebsoft.apps.mapper.EquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.merchant_name,b.merchant_code
-        FROM apps_equipment a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        <where>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.equipmentCategory != null">
-              AND a.equipment_category LIKE CONCAT('%', #{param.equipmentCategory}, '%')
-            </if>
-            <if test="param.equipmentAvatar != null">
-                AND a.equipment_avatar LIKE CONCAT('%', #{param.equipmentAvatar}, '%')
-            </if>
-            <if test="param.batteryModel != null">
-                AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%')
-            </if>
-            <if test="param.bms != null">
-                AND a.bms LIKE CONCAT('%', #{param.bms}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.isCtive != null">
-                AND a.is_ctive LIKE CONCAT('%', #{param.isCtive}, '%')
-            </if>
-            <if test="param.workingStatus != null">
-                AND a.working_status LIKE CONCAT('%', #{param.workingStatus}, '%')
-            </if>
-            <if test="param.leaseStatus != null">
-                AND a.lease_status LIKE CONCAT('%', #{param.leaseStatus}, '%')
-            </if>
-            <if test="param.batteryStatus != null">
-                AND a.battery_status LIKE CONCAT('%', #{param.batteryStatus}, '%')
-            </if>
-            <if test="param.batteryPower != null">
-                AND a.battery_power LIKE CONCAT('%', #{param.batteryPower}, '%')
-            </if>
-            <if test="param.isOnline != null">
-                AND a.is_online LIKE CONCAT('%', #{param.isOnline}, '%')
-            </if>
-            <if test="param.totalVoltage != null">
-                AND a.total_voltage LIKE CONCAT('%', #{param.totalVoltage}, '%')
-            </if>
-            <if test="param.bmsBrand != null">
-                AND a.bms_brand LIKE CONCAT('%', #{param.bmsBrand}, '%')
-            </if>
-            <if test="param.surplusCapacity != null">
-                AND a.surplus_capacity LIKE CONCAT('%', #{param.surplusCapacity}, '%')
-            </if>
-            <if test="param.iccid != null">
-                AND a.iccid LIKE CONCAT('%', #{param.iccid}, '%')
-            </if>
-            <if test="param.ctiveTime != null">
-                AND a.ctive_time LIKE CONCAT('%', #{param.ctiveTime}, '%')
-            </if>
-            <if test="param.batteryDeliveryTime != null">
-                AND a.battery_delivery_time LIKE CONCAT('%', #{param.batteryDeliveryTime}, '%')
-            </if>
-            <if test="param.orderId != null">
-              AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.Equipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.Equipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml
deleted file mode 100644
index 0a75b05..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderGoodsMapper.xml
+++ /dev/null
@@ -1,110 +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="com.gxwebsoft.apps.mapper.EquipmentOrderGoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_equipment_order_goods a
-        <where>
-            <if test="param.orderGoodsId != null">
-                AND a.order_goods_id = #{param.orderGoodsId}
-            </if>
-            <if test="param.goodsName != null">
-                AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%')
-            </if>
-            <if test="param.equipmentCategory != null">
-                AND a.equipment_category LIKE CONCAT('%', #{param.equipmentCategory}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
-            </if>
-            <if test="param.batteryModel != null">
-                AND a.battery_model LIKE CONCAT('%', #{param.batteryModel}, '%')
-            </if>
-            <if test="param.sellingPoint != null">
-                AND a.selling_point LIKE CONCAT('%', #{param.sellingPoint}, '%')
-            </if>
-            <if test="param.stockTotal != null">
-                AND a.stock_total = #{param.stockTotal}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.batteryRent != null">
-                AND a.battery_rent = #{param.batteryRent}
-            </if>
-            <if test="param.batteryPrice != null">
-                AND a.battery_price = #{param.batteryPrice}
-            </if>
-            <if test="param.batteryDeposit != null">
-                AND a.battery_deposit = #{param.batteryDeposit}
-            </if>
-            <if test="param.batteryInsurance != null">
-                AND a.battery_insurance = #{param.batteryInsurance}
-            </if>
-            <if test="param.downPayment != null">
-                AND a.down_payment = #{param.downPayment}
-            </if>
-            <if test="param.periods != null">
-                AND a.periods = #{param.periods}
-            </if>
-            <if test="param.repayment != null">
-                AND a.repayment = #{param.repayment}
-            </if>
-            <if test="param.serviceCharges != null">
-                AND a.service_charges = #{param.serviceCharges}
-            </if>
-            <if test="param.periodsType != null">
-                AND a.periods_type = #{param.periodsType}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrderGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrderGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml
deleted file mode 100644
index bf65d02..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentOrderMapper.xml
+++ /dev/null
@@ -1,194 +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="com.gxwebsoft.apps.mapper.EquipmentOrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_equipment_order a
-        <where>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.subject != null">
-                AND a.subject LIKE CONCAT('%', #{param.subject}, '%')
-            </if>
-            <if test="param.orderNo != null">
-                AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%')
-            </if>
-            <if test="param.totalPrice != null">
-                AND a.total_price = #{param.totalPrice}
-            </if>
-            <if test="param.orderPrice != null">
-                AND a.order_price = #{param.orderPrice}
-            </if>
-            <if test="param.couponId != null">
-                AND a.coupon_id = #{param.couponId}
-            </if>
-            <if test="param.couponMoney != null">
-                AND a.coupon_money = #{param.couponMoney}
-            </if>
-            <if test="param.pointsMoney != null">
-                AND a.points_money = #{param.pointsMoney}
-            </if>
-            <if test="param.pointsNum != null">
-                AND a.points_num = #{param.pointsNum}
-            </if>
-            <if test="param.payPrice != null">
-                AND a.pay_price = #{param.payPrice}
-            </if>
-            <if test="param.receiptAmount != null">
-                AND a.receipt_amount = #{param.receiptAmount}
-            </if>
-            <if test="param.updatePrice != null">
-                AND a.update_price = #{param.updatePrice}
-            </if>
-            <if test="param.buyerRemark != null">
-                AND a.buyer_remark LIKE CONCAT('%', #{param.buyerRemark}, '%')
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type = #{param.payType}
-            </if>
-            <if test="param.payMethod != null">
-                AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%')
-            </if>
-            <if test="param.payStatus != null">
-                AND a.pay_status = #{param.payStatus}
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%')
-            </if>
-            <if test="param.tradeId != null">
-                AND a.trade_id LIKE CONCAT('%', #{param.tradeId}, '%')
-            </if>
-            <if test="param.deliveryType != null">
-                AND a.delivery_type = #{param.deliveryType}
-            </if>
-            <if test="param.extractShopId != null">
-                AND a.extract_shop_id = #{param.extractShopId}
-            </if>
-            <if test="param.extractClerkId != null">
-                AND a.extract_clerk_id = #{param.extractClerkId}
-            </if>
-            <if test="param.expressPrice != null">
-                AND a.express_price = #{param.expressPrice}
-            </if>
-            <if test="param.expressId != null">
-                AND a.express_id = #{param.expressId}
-            </if>
-            <if test="param.expressNo != null">
-                AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%')
-            </if>
-            <if test="param.deliveryStatus != null">
-                AND a.delivery_status = #{param.deliveryStatus}
-            </if>
-            <if test="param.deliveryTime != null">
-                AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%')
-            </if>
-            <if test="param.receiptStatus != null">
-                AND a.receipt_status = #{param.receiptStatus}
-            </if>
-            <if test="param.receiptTime != null">
-                AND a.receipt_time LIKE CONCAT('%', #{param.receiptTime}, '%')
-            </if>
-            <if test="param.orderStatus != null">
-                AND a.order_status = #{param.orderStatus}
-            </if>
-            <if test="param.pointsBonus != null">
-                AND a.points_bonus = #{param.pointsBonus}
-            </if>
-            <if test="param.merchantRemark != null">
-                AND a.merchant_remark LIKE CONCAT('%', #{param.merchantRemark}, '%')
-            </if>
-            <if test="param.isSettled != null">
-                AND a.is_settled = #{param.isSettled}
-            </if>
-            <if test="param.rentOrderId != null">
-                AND a.rent_order_id = #{param.rentOrderId}
-            </if>
-            <if test="param.transactionId != null">
-                AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%')
-            </if>
-            <if test="param.isComment != null">
-                AND a.is_comment = #{param.isComment}
-            </if>
-            <if test="param.orderSource != null">
-                AND a.order_source = #{param.orderSource}
-            </if>
-            <if test="param.orderSourceId != null">
-                AND a.order_source_id = #{param.orderSourceId}
-            </if>
-            <if test="param.orderSourceData != null">
-                AND a.order_source_data LIKE CONCAT('%', #{param.orderSourceData}, '%')
-            </if>
-            <if test="param.batteryRent != null">
-                AND a.battery_rent = #{param.batteryRent}
-            </if>
-            <if test="param.batteryDeposit != null">
-                AND a.battery_deposit = #{param.batteryDeposit}
-            </if>
-            <if test="param.batteryInsurance != null">
-                AND a.battery_insurance = #{param.batteryInsurance}
-            </if>
-            <if test="param.month != null">
-                AND a.month = #{param.month}
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.platform != null">
-                AND a.platform LIKE CONCAT('%', #{param.platform}, '%')
-            </if>
-            <if test="param.isRenew != null">
-                AND a.is_renew = #{param.isRenew}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml
deleted file mode 100644
index 7213717..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/EquipmentRecordMapper.xml
+++ /dev/null
@@ -1,78 +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="com.gxwebsoft.apps.mapper.EquipmentRecordMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.merchant_name,b.merchant_code,
-               c.nickname,c.user_id
-        FROM apps_equipment_record a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.equipmentCode != null">
-                AND a.equipment_code LIKE CONCAT('%', #{param.equipmentCode}, '%')
-            </if>
-            <if test="param.eventType != null">
-                AND a.event_type LIKE CONCAT('%', #{param.eventType}, '%')
-            </if>
-            <if test="param.params != null">
-                AND a.params LIKE CONCAT('%', #{param.params}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.createTimeEnd != null">
-            AND a.create_time &lt;= #{param.createTimeEnd}
-          </if>
-          <if test="param.orderId != null">
-            AND a.order_id = #{param.orderId}
-          </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.EquipmentRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.EquipmentRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml
deleted file mode 100644
index 4614721..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardBenefitsMapper.xml
+++ /dev/null
@@ -1,62 +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="com.gxwebsoft.apps.mapper.HualalaCardBenefitsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_card_benefits a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.cardLevelName != null">
-                AND a.card_level_name LIKE CONCAT('%', #{param.cardLevelName}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaCardBenefits">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaCardBenefits">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml
deleted file mode 100644
index 1ff3515..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCardMapper.xml
+++ /dev/null
@@ -1,125 +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="com.gxwebsoft.apps.mapper.HualalaCardMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_card a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.groupId != null">
-                AND a.group_id LIKE CONCAT('%', #{param.groupId}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.cardId != null">
-                AND a.card_id LIKE CONCAT('%', #{param.cardId}, '%')
-            </if>
-            <if test="param.cardTypeId != null">
-                AND a.card_type_id LIKE CONCAT('%', #{param.cardTypeId}, '%')
-            </if>
-            <if test="param.cardLevelId != null">
-                AND a.card_level_id LIKE CONCAT('%', #{param.cardLevelId}, '%')
-            </if>
-            <if test="param.cardLevelName != null">
-                AND a.card_level_name LIKE CONCAT('%', #{param.cardLevelName}, '%')
-            </if>
-            <if test="param.cardStatus != null">
-                AND a.card_status LIKE CONCAT('%', #{param.cardStatus}, '%')
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id LIKE CONCAT('%', #{param.customerId}, '%')
-            </if>
-            <if test="param.createShopId != null">
-                AND a.create_shop_id LIKE CONCAT('%', #{param.createShopId}, '%')
-            </if>
-            <if test="param.createShopName != null">
-                AND a.create_shop_name LIKE CONCAT('%', #{param.createShopName}, '%')
-            </if>
-            <if test="param.cardNo != null">
-                AND a.card_no LIKE CONCAT('%', #{param.cardNo}, '%')
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.customerMobile != null">
-                AND a.customer_mobile LIKE CONCAT('%', #{param.customerMobile}, '%')
-            </if>
-            <if test="param.customerSex != null">
-                AND a.customer_sex = #{param.customerSex}
-            </if>
-            <if test="param.customerBirthday != null">
-                AND a.customer_birthday LIKE CONCAT('%', #{param.customerBirthday}, '%')
-            </if>
-            <if test="param.cardBalance != null">
-                AND a.card_balance = #{param.cardBalance}
-            </if>
-            <if test="param.pointBalance != null">
-                AND a.point_balance = #{param.pointBalance}
-            </if>
-            <if test="param.saveMoneyTotal != null">
-                AND a.save_money_total = #{param.saveMoneyTotal}
-            </if>
-            <if test="param.consumptionTotal != null">
-                AND a.consumption_total = #{param.consumptionTotal}
-            </if>
-            <if test="param.consumptionCount != null">
-                AND a.consumption_count = #{param.consumptionCount}
-            </if>
-            <if test="param.grade != null">
-                AND a.grade = #{param.grade}
-            </if>
-            <if test="param.nextLevelGrade != null">
-                AND a.next_level_grade = #{param.nextLevelGrade}
-            </if>
-            <if test="param.expireTime != null">
-                AND a.expire_time LIKE CONCAT('%', #{param.expireTime}, '%')
-            </if>
-            <if test="param.lastTransTime != null">
-                AND a.last_trans_time LIKE CONCAT('%', #{param.lastTransTime}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaCard">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaCard">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml
deleted file mode 100644
index e4d0a9d..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaCartFoodMapper.xml
+++ /dev/null
@@ -1,62 +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="com.gxwebsoft.apps.mapper.HualalaCartFoodMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_cart_food a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.foodId != null">
-                AND a.food_id = #{param.foodId}
-            </if>
-            <if test="param.foodName != null">
-                AND a.food_name LIKE CONCAT('%', #{param.foodName}, '%')
-            </if>
-            <if test="param.skuId != null">
-                AND a.sku_id LIKE CONCAT('%', #{param.skuId}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.shopName != null">
-                AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%')
-            </if>
-            <if test="param.shopLogo != null">
-                AND a.shop_logo LIKE CONCAT('%', #{param.shopLogo}, '%')
-            </if>
-            <if test="param.coverUrl != null">
-                AND a.cover_url LIKE CONCAT('%', #{param.coverUrl}, '%')
-            </if>
-            <if test="param.sellPrice != null">
-                AND a.sell_price = #{param.sellPrice}
-            </if>
-            <if test="param.stock != null">
-                AND a.stock = #{param.stock}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaCartFood">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaCartFood">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml
deleted file mode 100644
index 8d9040e..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodCategoryMapper.xml
+++ /dev/null
@@ -1,104 +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="com.gxwebsoft.apps.mapper.HualalaFoodCategoryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_food_category a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.foodCategoryName != null">
-                AND a.food_category_name LIKE CONCAT('%', #{param.foodCategoryName}, '%')
-            </if>
-            <if test="param.foodSubjectName != null">
-                AND a.food_subject_name LIKE CONCAT('%', #{param.foodSubjectName}, '%')
-            </if>
-            <if test="param.foodKey != null">
-                AND a.food_key LIKE CONCAT('%', #{param.foodKey}, '%')
-            </if>
-            <if test="param.foodCount != null">
-                AND a.food_count LIKE CONCAT('%', #{param.foodCount}, '%')
-            </if>
-            <if test="param.foodCategoryId != null">
-                AND a.food_category_id LIKE CONCAT('%', #{param.foodCategoryId}, '%')
-            </if>
-            <if test="param.foodCategoryGroupName != null">
-                AND a.food_category_group_name LIKE CONCAT('%', #{param.foodCategoryGroupName}, '%')
-            </if>
-            <if test="param.foodCategoryKey != null">
-                AND a.food_category_key LIKE CONCAT('%', #{param.foodCategoryKey}, '%')
-            </if>
-            <if test="param.action != null">
-                AND a.action LIKE CONCAT('%', #{param.action}, '%')
-            </if>
-            <if test="param.settlementProportion != null">
-                AND a.settlement_proportion LIKE CONCAT('%', #{param.settlementProportion}, '%')
-            </if>
-            <if test="param.isActive != null">
-                AND a.is_active = #{param.isActive}
-            </if>
-            <if test="param.isBatching != null">
-                AND a.is_batching = #{param.isBatching}
-            </if>
-            <if test="param.isSingleSale != null">
-                AND a.is_single_sale = #{param.isSingleSale}
-            </if>
-            <if test="param.sortIndex != null">
-                AND a.sort_index = #{param.sortIndex}
-            </if>
-            <if test="param.adsId != null">
-                AND a.ads_id = #{param.adsId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%')
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaFoodCategory">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaFoodCategory">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml
deleted file mode 100644
index 0e56981..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaFoodMapper.xml
+++ /dev/null
@@ -1,335 +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="com.gxwebsoft.apps.mapper.HualalaFoodMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_food a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.foodId != null">
-                AND a.food_id LIKE CONCAT('%', #{param.foodId}, '%')
-            </if>
-            <if test="param.foodKey != null">
-                AND a.food_key LIKE CONCAT('%', #{param.foodKey}, '%')
-            </if>
-            <if test="param.groupId != null">
-                AND a.group_id LIKE CONCAT('%', #{param.groupId}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id LIKE CONCAT('%', #{param.shopId}, '%')
-            </if>
-            <if test="param.foodCount != null">
-                AND a.food_count LIKE CONCAT('%', #{param.foodCount}, '%')
-            </if>
-            <if test="param.foodCategoryId != null">
-                AND a.food_category_id LIKE CONCAT('%', #{param.foodCategoryId}, '%')
-            </if>
-            <if test="param.foodCategoryKey != null">
-                AND a.food_category_key LIKE CONCAT('%', #{param.foodCategoryKey}, '%')
-            </if>
-            <if test="param.foodCategoryName != null">
-                AND a.food_category_name LIKE CONCAT('%', #{param.foodCategoryName}, '%')
-            </if>
-            <if test="param.foodOnlineCategoryId != null">
-                AND a.food_online_category_id LIKE CONCAT('%', #{param.foodOnlineCategoryId}, '%')
-            </if>
-            <if test="param.foodOnlineCategoryKey != null">
-                AND a.food_online_category_key LIKE CONCAT('%', #{param.foodOnlineCategoryKey}, '%')
-            </if>
-            <if test="param.foodOnlineCategoryName != null">
-                AND a.food_online_category_name LIKE CONCAT('%', #{param.foodOnlineCategoryName}, '%')
-            </if>
-            <if test="param.isBatching != null">
-                AND a.is_batching = #{param.isBatching}
-            </if>
-            <if test="param.isSingleSale != null">
-                AND a.is_single_sale = #{param.isSingleSale}
-            </if>
-            <if test="param.foodSubjectKey != null">
-                AND a.food_subject_key LIKE CONCAT('%', #{param.foodSubjectKey}, '%')
-            </if>
-            <if test="param.departmentKeyLst != null">
-                AND a.department_key_lst LIKE CONCAT('%', #{param.departmentKeyLst}, '%')
-            </if>
-            <if test="param.batchingFoodCategoryKey != null">
-                AND a.batching_food_category_key LIKE CONCAT('%', #{param.batchingFoodCategoryKey}, '%')
-            </if>
-            <if test="param.foodName != null">
-                AND a.food_name LIKE CONCAT('%', #{param.foodName}, '%')
-            </if>
-            <if test="param.foodCode != null">
-                AND a.food_code LIKE CONCAT('%', #{param.foodCode}, '%')
-            </if>
-            <if test="param.foodAliasName != null">
-                AND a.food_alias_name LIKE CONCAT('%', #{param.foodAliasName}, '%')
-            </if>
-            <if test="param.foodMnemonicCode != null">
-                AND a.food_mnemonic_code LIKE CONCAT('%', #{param.foodMnemonicCode}, '%')
-            </if>
-            <if test="param.isDiscount != null">
-                AND a.is_discount = #{param.isDiscount}
-            </if>
-            <if test="param.isComments != null">
-                AND a.is_comments = #{param.isComments}
-            </if>
-            <if test="param.isActive != null">
-                AND a.is_active = #{param.isActive}
-            </if>
-            <if test="param.isOpen != null">
-                AND a.is_open = #{param.isOpen}
-            </if>
-            <if test="param.isSetFood != null">
-                AND a.is_set_food = #{param.isSetFood}
-            </if>
-            <if test="param.setFoodDetailJson != null">
-                AND a.set_food_detail_json LIKE CONCAT('%', #{param.setFoodDetailJson}, '%')
-            </if>
-            <if test="param.isTempFood != null">
-                AND a.is_temp_food = #{param.isTempFood}
-            </if>
-            <if test="param.units != null">
-                AND a.units LIKE CONCAT('%', #{param.units}, '%')
-            </if>
-            <if test="param.py != null">
-                AND a.py LIKE CONCAT('%', #{param.py}, '%')
-            </if>
-            <if test="param.minOrderCount != null">
-                AND a.min_order_count LIKE CONCAT('%', #{param.minOrderCount}, '%')
-            </if>
-            <if test="param.tasteList != null">
-                AND a.taste_list LIKE CONCAT('%', #{param.tasteList}, '%')
-            </if>
-            <if test="param.tasteGroupList != null">
-                AND a.taste_group_list LIKE CONCAT('%', #{param.tasteGroupList}, '%')
-            </if>
-            <if test="param.makingMethodList != null">
-                AND a.making_method_list LIKE CONCAT('%', #{param.makingMethodList}, '%')
-            </if>
-            <if test="param.makingMethodGroupList != null">
-                AND a.making_method_group_list LIKE CONCAT('%', #{param.makingMethodGroupList}, '%')
-            </if>
-            <if test="param.isSpecialty != null">
-                AND a.is_specialty = #{param.isSpecialty}
-            </if>
-            <if test="param.isRecommend != null">
-                AND a.is_recommend = #{param.isRecommend}
-            </if>
-            <if test="param.isNews != null">
-                AND a.is_news = #{param.isNews}
-            </if>
-            <if test="param.hotTag != null">
-                AND a.hot_tag LIKE CONCAT('%', #{param.hotTag}, '%')
-            </if>
-            <if test="param.salesCount != null">
-                AND a.sales_count LIKE CONCAT('%', #{param.salesCount}, '%')
-            </if>
-            <if test="param.isNeedConfirmFoodNumber != null">
-                AND a.is_need_confirm_food_number = #{param.isNeedConfirmFoodNumber}
-            </if>
-            <if test="param.takeoutPackagingFee != null">
-                AND a.takeout_packaging_fee LIKE CONCAT('%', #{param.takeoutPackagingFee}, '%')
-            </if>
-            <if test="param.incrementUnit != null">
-                AND a.increment_unit LIKE CONCAT('%', #{param.incrementUnit}, '%')
-            </if>
-            <if test="param.takeawayTag != null">
-                AND a.takeaway_tag LIKE CONCAT('%', #{param.takeawayTag}, '%')
-            </if>
-            <if test="param.workingLunchTag != null">
-                AND a.working_lunch_tag LIKE CONCAT('%', #{param.workingLunchTag}, '%')
-            </if>
-            <if test="param.adsId != null">
-                AND a.ads_id LIKE CONCAT('%', #{param.adsId}, '%')
-            </if>
-            <if test="param.imgePath != null">
-                AND a.imge_path LIKE CONCAT('%', #{param.imgePath}, '%')
-            </if>
-            <if test="param.isHasImage != null">
-                AND a.is_has_image = #{param.isHasImage}
-            </if>
-            <if test="param.imageHwp != null">
-                AND a.image_hwp LIKE CONCAT('%', #{param.imageHwp}, '%')
-            </if>
-            <if test="param.starLevel != null">
-                AND a.star_level LIKE CONCAT('%', #{param.starLevel}, '%')
-            </if>
-            <if test="param.foodTagIds != null">
-                AND a.food_tag_ids LIKE CONCAT('%', #{param.foodTagIds}, '%')
-            </if>
-            <if test="param.parentFoodId != null">
-                AND a.parent_food_id LIKE CONCAT('%', #{param.parentFoodId}, '%')
-            </if>
-            <if test="param.foodEnName != null">
-                AND a.food_en_name LIKE CONCAT('%', #{param.foodEnName}, '%')
-            </if>
-            <if test="param.isAutoAdd != null">
-                AND a.is_auto_add = #{param.isAutoAdd}
-            </if>
-            <if test="param.isCanRefund != null">
-                AND a.is_can_refund = #{param.isCanRefund}
-            </if>
-            <if test="param.setPerson != null">
-                AND a.set_person = #{param.setPerson}
-            </if>
-            <if test="param.tasteIsRequired != null">
-                AND a.taste_is_required = #{param.tasteIsRequired}
-            </if>
-            <if test="param.tasteIsMultiple != null">
-                AND a.taste_is_multiple = #{param.tasteIsMultiple}
-            </if>
-            <if test="param.makingMethodIsRequired != null">
-                AND a.making_method_is_required = #{param.makingMethodIsRequired}
-            </if>
-            <if test="param.makingMethodIsMultiple != null">
-                AND a.making_method_is_multiple = #{param.makingMethodIsMultiple}
-            </if>
-            <if test="param.initClickAmount != null">
-                AND a.init_click_amount LIKE CONCAT('%', #{param.initClickAmount}, '%')
-            </if>
-            <if test="param.actualClickAmount != null">
-                AND a.actual_click_amount LIKE CONCAT('%', #{param.actualClickAmount}, '%')
-            </if>
-            <if test="param.recentClickAmount != null">
-                AND a.recent_click_amount LIKE CONCAT('%', #{param.recentClickAmount}, '%')
-            </if>
-            <if test="param.clickAlertMess != null">
-                AND a.click_alert_mess LIKE CONCAT('%', #{param.clickAlertMess}, '%')
-            </if>
-            <if test="param.sourceFoodId != null">
-                AND a.source_food_id LIKE CONCAT('%', #{param.sourceFoodId}, '%')
-            </if>
-            <if test="param.salesCommission != null">
-                AND a.sales_commission LIKE CONCAT('%', #{param.salesCommission}, '%')
-            </if>
-            <if test="param.foodKeyElementLst != null">
-                AND a.food_key_element_lst LIKE CONCAT('%', #{param.foodKeyElementLst}, '%')
-            </if>
-            <if test="param.foodSortIndex != null">
-                AND a.food_sort_index LIKE CONCAT('%', #{param.foodSortIndex}, '%')
-            </if>
-            <if test="param.actionTime != null">
-                AND a.action_time LIKE CONCAT('%', #{param.actionTime}, '%')
-            </if>
-            <if test="param.foodSubjectName != null">
-                AND a.food_subject_name LIKE CONCAT('%', #{param.foodSubjectName}, '%')
-            </if>
-            <if test="param.foodSubjectCode != null">
-                AND a.food_subject_code LIKE CONCAT('%', #{param.foodSubjectCode}, '%')
-            </if>
-            <if test="param.departmentId != null">
-                AND a.department_id LIKE CONCAT('%', #{param.departmentId}, '%')
-            </if>
-            <if test="param.departmentKey != null">
-                AND a.department_key LIKE CONCAT('%', #{param.departmentKey}, '%')
-            </if>
-            <if test="param.popularity != null">
-                AND a.popularity LIKE CONCAT('%', #{param.popularity}, '%')
-            </if>
-            <if test="param.detailSplit != null">
-                AND a.detail_split LIKE CONCAT('%', #{param.detailSplit}, '%')
-            </if>
-            <if test="param.batchingIsFoodNumberRate != null">
-                AND a.batching_is_food_number_rate LIKE CONCAT('%', #{param.batchingIsFoodNumberRate}, '%')
-            </if>
-            <if test="param.foodCategoryCode != null">
-                AND a.food_category_code LIKE CONCAT('%', #{param.foodCategoryCode}, '%')
-            </if>
-            <if test="param.foodCategoryEnName != null">
-                AND a.food_category_en_name LIKE CONCAT('%', #{param.foodCategoryEnName}, '%')
-            </if>
-            <if test="param.foodCategoryGroupName != null">
-                AND a.food_category_group_name LIKE CONCAT('%', #{param.foodCategoryGroupName}, '%')
-            </if>
-            <if test="param.specialPrice != null">
-                AND a.special_price LIKE CONCAT('%', #{param.specialPrice}, '%')
-            </if>
-            <if test="param.specialPrice2 != null">
-                AND a.special_price2 LIKE CONCAT('%', #{param.specialPrice2}, '%')
-            </if>
-            <if test="param.specialPrice3 != null">
-                AND a.special_price3 LIKE CONCAT('%', #{param.specialPrice3}, '%')
-            </if>
-            <if test="param.specialPrice4 != null">
-                AND a.special_price4 LIKE CONCAT('%', #{param.specialPrice4}, '%')
-            </if>
-            <if test="param.specialPrice5 != null">
-                AND a.special_price5 LIKE CONCAT('%', #{param.specialPrice5}, '%')
-            </if>
-            <if test="param.specialPrice6 != null">
-                AND a.special_price6 LIKE CONCAT('%', #{param.specialPrice6}, '%')
-            </if>
-            <if test="param.onlineWmPrice != null">
-                AND a.online_wm_price LIKE CONCAT('%', #{param.onlineWmPrice}, '%')
-            </if>
-            <if test="param.tagIds != null">
-                AND a.tag_ids LIKE CONCAT('%', #{param.tagIds}, '%')
-            </if>
-            <if test="param.tagNames != null">
-                AND a.tag_names LIKE CONCAT('%', #{param.tagNames}, '%')
-            </if>
-            <if test="param.giftItemId != null">
-                AND a.gift_item_id LIKE CONCAT('%', #{param.giftItemId}, '%')
-            </if>
-            <if test="param.giftValidPeriod != null">
-                AND a.gift_valid_period LIKE CONCAT('%', #{param.giftValidPeriod}, '%')
-            </if>
-            <if test="param.description != null">
-                AND a.description LIKE CONCAT('%', #{param.description}, '%')
-            </if>
-            <if test="param.action != null">
-                AND a.action LIKE CONCAT('%', #{param.action}, '%')
-            </if>
-            <if test="param.settlementProportion != null">
-                AND a.settlement_proportion LIKE CONCAT('%', #{param.settlementProportion}, '%')
-            </if>
-            <if test="param.sortIndex != null">
-                AND a.sort_index = #{param.sortIndex}
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaFood">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaFood">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml
deleted file mode 100644
index 83ff23d..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaMapper.xml
+++ /dev/null
@@ -1,5 +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="com.gxwebsoft.apps.mapper.HualalaMapper">
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml
deleted file mode 100644
index ba77d82..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/HualalaShopMapper.xml
+++ /dev/null
@@ -1,98 +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="com.gxwebsoft.apps.mapper.HualalaShopMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_hualala_shop a
-        <where>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.shopName != null">
-                AND a.shop_name LIKE CONCAT('%', #{param.shopName}, '%')
-            </if>
-            <if test="param.logoUrl != null">
-                AND a.logo_url LIKE CONCAT('%', #{param.logoUrl}, '%')
-            </if>
-            <if test="param.shopCity != null">
-                AND a.shop_city LIKE CONCAT('%', #{param.shopCity}, '%')
-            </if>
-            <if test="param.shopCityName != null">
-                AND a.shop_city_name LIKE CONCAT('%', #{param.shopCityName}, '%')
-            </if>
-            <if test="param.shopOpenTime != null">
-                AND a.shop_open_time LIKE CONCAT('%', #{param.shopOpenTime}, '%')
-            </if>
-            <if test="param.shopPhone != null">
-                AND a.shop_phone LIKE CONCAT('%', #{param.shopPhone}, '%')
-            </if>
-            <if test="param.acspType != null">
-                AND a.acsp_type LIKE CONCAT('%', #{param.acspType}, '%')
-            </if>
-            <if test="param.action != null">
-                AND a.action LIKE CONCAT('%', #{param.action}, '%')
-            </if>
-            <if test="param.actionTime != null">
-                AND a.action_time LIKE CONCAT('%', #{param.actionTime}, '%')
-            </if>
-            <if test="param.brandId != null">
-                AND a.brand_id LIKE CONCAT('%', #{param.brandId}, '%')
-            </if>
-            <if test="param.brandName != null">
-                AND a.brand_name LIKE CONCAT('%', #{param.brandName}, '%')
-            </if>
-            <if test="param.businessModel != null">
-                AND a.business_model LIKE CONCAT('%', #{param.businessModel}, '%')
-            </if>
-            <if test="param.imagePath != null">
-                AND a.image_path LIKE CONCAT('%', #{param.imagePath}, '%')
-            </if>
-            <if test="param.mapLatitudeValueBaiDu != null">
-                AND a.map_latitude_value_bai_du LIKE CONCAT('%', #{param.mapLatitudeValueBaiDu}, '%')
-            </if>
-            <if test="param.mapLongitudeValueBaiDu != null">
-                AND a.map_longitude_value_bai_du LIKE CONCAT('%', #{param.mapLongitudeValueBaiDu}, '%')
-            </if>
-            <if test="param.operationMode != null">
-                AND a.operation_mode = #{param.operationMode}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.HualalaShop">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.HualalaShop">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml
deleted file mode 100644
index e16e103..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/LinkMapper.xml
+++ /dev/null
@@ -1,71 +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="com.gxwebsoft.apps.mapper.LinkMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_link a
-        <where>
-            <if test="param.linkId != null">
-                AND a.link_id = #{param.linkId}
-            </if>
-            <if test="param.linkName != null">
-                AND a.link_name LIKE CONCAT('%', #{param.linkName}, '%')
-            </if>
-            <if test="param.linkIcon != null">
-                AND a.link_icon LIKE CONCAT('%', #{param.linkIcon}, '%')
-            </if>
-            <if test="param.linkPath != null">
-                AND a.link_path LIKE CONCAT('%', #{param.linkPath}, '%')
-            </if>
-            <if test="param.linkComponent != null">
-                AND a.link_component LIKE CONCAT('%', #{param.linkComponent}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.clicks != null">
-                AND a.clicks = #{param.clicks}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.merchantCode != null">
-              AND a.merchant_code = #{param.merchantCode}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.Link">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.Link">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml b/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml
deleted file mode 100644
index 88d5d46..0000000
--- a/src/main/java/com/gxwebsoft/apps/mapper/xml/TestDataMapper.xml
+++ /dev/null
@@ -1,38 +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="com.gxwebsoft.apps.mapper.TestDataMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM apps_test_data a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.title != null">
-                AND a.title LIKE CONCAT('%', #{param.title}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.apps.entity.TestData">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.apps.entity.TestData">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java b/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java
deleted file mode 100644
index 2a660c3..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcAgentParam.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 代报餐管理查询参数
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcAgentParam对象", description = "代报餐管理查询参数")
-public class BcAgentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer agentId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "工单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java b/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java
deleted file mode 100644
index 0079279..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcCookbookParam.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 常用菜谱查询参数
- *
- * @author 科技小王子
- * @since 2023-05-05 14:56:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcCookbookParam对象", description = "常用菜谱查询参数")
-public class BcCookbookParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer cookbookId;
-
-    @ApiModelProperty(value = "菜品计划")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "餐段 早餐 午餐 晚餐")
-    private String period;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "发布人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java b/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java
deleted file mode 100644
index d787b36..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcEquipmentParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 报餐设备管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-02 10:34:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcEquipmentParam对象", description = "报餐设备管理查询参数")
-public class BcEquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "设备ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer bcEquipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "所属档口")
-    private Integer gear;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "员工工号")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java b/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java
deleted file mode 100644
index 4c9b1bb..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcExportParam.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 报餐统计导出查询参数
- *
- * @author 科技小王子
- * @since 2023-06-01 21:47:02
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcExportParam对象", description = "报餐统计导出查询参数")
-public class BcExportParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer exportId;
-
-    @ApiModelProperty(value = "机构名称")
-    private String organizationName;
-
-    @ApiModelProperty(value = "实际消费的金额(不含退款)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal expendMoney;
-
-    @ApiModelProperty(value = "早餐报餐次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer breakfastPost;
-
-    @ApiModelProperty(value = "早餐签到次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer breakfastSign;
-
-    @ApiModelProperty(value = "午餐报餐次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer lunchPost;
-
-    @ApiModelProperty(value = "午餐签到次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer lunchSign;
-
-    @ApiModelProperty(value = "晚餐报餐次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer dinnerPost;
-
-    @ApiModelProperty(value = "晚餐签到次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer dinnerSign;
-
-    @ApiModelProperty(value = "商品价格(单价)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "发货时间")
-    private String deliveryTime;
-
-    @ApiModelProperty(value = "起始时间")
-    private String deliveryTimeStart;
-
-    @ApiModelProperty(value = "结束时间")
-    private String deliveryTimeEnd;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "订单号")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "机构id")
-    @QueryField(type = QueryType.EQ)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "发布人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java b/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java
deleted file mode 100644
index 73f43e7..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcFoodParam.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 发布菜品明细查询参数
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcFoodParam对象", description = "发布菜品明细查询参数")
-public class BcFoodParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer bcFoodId;
-
-    @ApiModelProperty(value = "菜品计划")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "餐段 早餐 午餐 晚餐")
-    private String period;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "发布人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java b/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java
deleted file mode 100644
index 001ba13..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcPlanParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 菜品发布管理查询参数
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcPlanParam对象", description = "菜品发布管理查询参数")
-public class BcPlanParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer bcPlanId;
-
-    @ApiModelProperty(value = "发布日期")
-    private String dayTime;
-
-    @ApiModelProperty(value = "星期几")
-    private Integer week;
-
-    @ApiModelProperty(value = "发布类型")
-    private String type;
-
-    @ApiModelProperty(value = "餐段")
-    private String period;
-
-    @ApiModelProperty(value = "多天菜品是否重复")
-    private Integer isRepeat;
-
-    @ApiModelProperty(value = "菜品分类")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "失效时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "发布人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "使用往日菜单")
-    @QueryField(type = QueryType.EQ)
-    private String oldTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java b/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java
deleted file mode 100644
index 9c32893..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/BcTemporaryParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 临时报餐管理查询参数
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "BcTemporaryParam对象", description = "临时报餐管理查询参数")
-public class BcTemporaryParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer temporaryId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "工单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "申请状态")
-    @QueryField(type = QueryType.EQ)
-    private Integer applyStatus;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "报餐日期")
-    private Date dayTime;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "失效时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "昵称")
-    private String nickname;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/CashierParam.java b/src/main/java/com/gxwebsoft/apps/param/CashierParam.java
deleted file mode 100644
index 7413dc5..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/CashierParam.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 海牛收银台记录表查询参数
- *
- * @author WebSoft
- * @since 2022-11-18 11:47:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CashierParam对象", description = "海牛收银台记录表查询参数")
-public class CashierParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer cashierId;
-
-    @ApiModelProperty(value = "客户ID")
-    private String buyerId;
-
-    @ApiModelProperty(value = "设备ID")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "支付标识")
-    private String code;
-
-    @ApiModelProperty(value = "返回消息")
-    private String msg;
-
-    @ApiModelProperty(value = "客户端交易订单编号")
-    private String outTradeNo;
-
-    @ApiModelProperty(value = "数量")
-    private String amount;
-
-    @ApiModelProperty(value = "支付时间")
-    private String payTime;
-
-    @ApiModelProperty(value = "支付方式")
-    private String payType;
-
-    @ApiModelProperty(value = "交易金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "实收金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal receiptAmount;
-
-    @ApiModelProperty(value = "第三方交易手续费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal feeAmount;
-
-    @ApiModelProperty(value = "第三方结算金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal settleAmount;
-
-    @ApiModelProperty(value = "商户名称")
-    private String merchantName;
-
-    @ApiModelProperty(value = "手机号码")
-    private String mobile;
-
-    @ApiModelProperty(value = "订单备注")
-    private String orderRemark;
-
-    @ApiModelProperty(value = "订单状态")
-    private String orderStatus;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java
deleted file mode 100644
index 2705b6d..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentAlarmParam.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 故障报警记录查询参数
- *
- * @author 科技小王子
- * @since 2022-12-01 23:49:44
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentAlarmParam对象", description = "故障报警记录查询参数")
-public class EquipmentAlarmParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "报警类型")
-    private String alarmType;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "处理时间")
-    private String handleTime;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java
deleted file mode 100644
index 46f6368..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentFaultParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 故障电池查询参数
- *
- * @author 科技小王子
- * @since 2022-12-01 18:40:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentFaultParam对象", description = "故障电池查询参数")
-public class EquipmentFaultParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "设备编号")
-    @QueryField(type = QueryType.EQ)
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "故障原因")
-    private String faultType;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "处理时间")
-    private String handleTime;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @QueryField(type = QueryType.EQ)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java
deleted file mode 100644
index 1aaf3a1..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentGoodsParam.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 电池管理记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-02-28 22:40:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentGoodsParam对象", description = "电池管理记录表查询参数")
-public class EquipmentGoodsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    @QueryField(type = QueryType.LIKE)
-    private String goodsName;
-
-    @ApiModelProperty(value = "下单类型")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "电池型号")
-    private String batteryModel;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "商品卖点")
-    @QueryField(type = QueryType.LIKE)
-    private String sellingPoint;
-
-    @ApiModelProperty(value = "电池租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryPrice;
-
-    @ApiModelProperty(value = "电池押金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "电池保险")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "首付款")
-    private BigDecimal downPayment;
-
-    @ApiModelProperty(value = "分期期数")
-    private BigDecimal periods;
-
-    @ApiModelProperty(value = "每期还款")
-    private BigDecimal repayment;
-
-    @ApiModelProperty(value = "手续费")
-    private BigDecimal serviceCharges;
-
-    @ApiModelProperty(value = "分期方式")
-    private Integer periodsType;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java
deleted file mode 100644
index 218ba59..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderGoodsParam.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 电池管理记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-05-11 19:10:13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentOrderGoodsParam对象", description = "电池管理记录表查询参数")
-public class EquipmentOrderGoodsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "下单类型")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "电池型号")
-    private String batteryModel;
-
-    @ApiModelProperty(value = "商品卖点")
-    private String sellingPoint;
-
-    @ApiModelProperty(value = "库存总量")
-    @QueryField(type = QueryType.EQ)
-    private Integer stockTotal;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "电池租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryPrice;
-
-    @ApiModelProperty(value = "电池押金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "电池保险")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "首付款")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal downPayment;
-
-    @ApiModelProperty(value = "分期期数")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal periods;
-
-    @ApiModelProperty(value = "分期还款")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal repayment;
-
-    @ApiModelProperty(value = "手续费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal serviceCharges;
-
-    @ApiModelProperty(value = "分期方式 10按周 20按月")
-    @QueryField(type = QueryType.EQ)
-    private Integer periodsType;
-
-    @ApiModelProperty(value = "订单编号")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "旧商品ID")
-    private Integer goodsId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java
deleted file mode 100644
index 865e3eb..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentOrderParam.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 订单记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-14 21:24:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentOrderParam对象", description = "订单记录表查询参数")
-public class EquipmentOrderParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单标题")
-    private String subject;
-
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
-
-    @ApiModelProperty(value = "商品总金额(不含优惠折扣)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "订单金额(含优惠折扣)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal orderPrice;
-
-    @ApiModelProperty(value = "优惠券ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券抵扣金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal couponMoney;
-
-    @ApiModelProperty(value = "积分抵扣金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal pointsMoney;
-
-    @ApiModelProperty(value = "积分抵扣数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer pointsNum;
-
-    @ApiModelProperty(value = "实际付款金额(包含运费)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "第三方支付实收金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal receiptAmount;
-
-    @ApiModelProperty(value = "后台修改的订单金额(差价)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal updatePrice;
-
-    @ApiModelProperty(value = "买家留言")
-    private String buyerRemark;
-
-    @ApiModelProperty(value = "支付方式(废弃)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付方式（余额10/微信20/支付宝30/通联支付40/其他支付50）")
-    private String payMethod;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "付款时间")
-    private String payTime;
-
-    @ApiModelProperty(value = "第三方交易记录ID")
-    private String tradeId;
-
-    @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "自提门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer extractShopId;
-
-    @ApiModelProperty(value = "核销店员ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer extractClerkId;
-
-    @ApiModelProperty(value = "运费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal expressPrice;
-
-    @ApiModelProperty(value = "物流公司ID (废弃)")
-    @QueryField(type = QueryType.EQ)
-    private Integer expressId;
-
-    @ApiModelProperty(value = "物流单号 (废弃)")
-    private String expressNo;
-
-    @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryStatus;
-
-    @ApiModelProperty(value = "发货时间")
-    private String deliveryTime;
-
-    @ApiModelProperty(value = "收货状态(10未收货 20已收货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer receiptStatus;
-
-    @ApiModelProperty(value = "收货时间")
-    private String receiptTime;
-
-    @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "赠送的积分数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer pointsBonus;
-
-    @ApiModelProperty(value = "商家备注")
-    private String merchantRemark;
-
-    @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "续租订单的关联单号")
-    @QueryField(type = QueryType.EQ)
-    private Integer rentOrderId;
-
-    @ApiModelProperty(value = "微信支付交易号(废弃)")
-    private String transactionId;
-
-    @ApiModelProperty(value = "是否已评价(0否 1是)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isComment;
-
-    @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderSource;
-
-    @ApiModelProperty(value = "来源记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderSourceId;
-
-    @ApiModelProperty(value = "来源记录的参数 (json格式)")
-    private String orderSourceData;
-
-    @ApiModelProperty(value = "电池租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池押金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "保险")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "购买月份数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer month;
-
-    @ApiModelProperty(value = "服务到期时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "是否续费订单")
-    @QueryField(type = QueryType.EQ)
-    private Integer isRenew;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "电池商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java
deleted file mode 100644
index 4500138..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentParam.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 设备管理查询参数
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentParam对象", description = "设备管理查询参数")
-public class EquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "设备ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "设备分类")
-    private String equipmentCategory;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "商品分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "头像")
-    private String equipmentAvatar;
-
-    @ApiModelProperty(value = "电池型号")
-    private String batteryModel;
-
-    @ApiModelProperty(value = "BMS")
-    private String bms;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "是否激活")
-    private String isCtive;
-
-    @ApiModelProperty(value = "工作状态")
-    private String workingStatus;
-
-    @ApiModelProperty(value = "租赁状态")
-    private String leaseStatus;
-
-    @ApiModelProperty(value = "电池状态")
-    private String batteryStatus;
-
-    @ApiModelProperty(value = "电池电量")
-    private String batteryPower;
-
-    @ApiModelProperty(value = "是否在线")
-    private String isOnline;
-
-    @ApiModelProperty(value = "总电压")
-    private String totalVoltage;
-
-    @ApiModelProperty(value = "BMS板供应商")
-    private String bmsBrand;
-
-    @ApiModelProperty(value = "剩余容量")
-    private String surplusCapacity;
-
-    @ApiModelProperty(value = "ICCID")
-    private String iccid;
-
-    @ApiModelProperty(value = "设备激活时间")
-    private String ctiveTime;
-
-    @ApiModelProperty(value = "电池出厂时间")
-    private String batteryDeliveryTime;
-
-    @ApiModelProperty(value = "绑定的订单")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    @QueryField(type = QueryType.LIKE)
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "所属商户ID")
-    @TableField(exist = false)
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "商户编号")
-    @QueryField(type = QueryType.EQ)
-    private String merchantCode;
-
-    @ApiModelProperty(value = "所属商户名称")
-    @QueryField(type = QueryType.EQ)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java b/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java
deleted file mode 100644
index c0cf3bb..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/EquipmentRecordParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 前世今生查询参数
- *
- * @author 科技小王子
- * @since 2022-12-03 01:23:53
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "EquipmentRecordParam对象", description = "前世今生查询参数")
-public class EquipmentRecordParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "设备编码")
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "事件类型")
-    private String eventType;
-
-    @ApiModelProperty(value = "请求参数")
-    private String params;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    @QueryField(type = QueryType.EQ)
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @QueryField(type = QueryType.LIKE)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java
deleted file mode 100644
index a7b47a5..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaCardBenefitsParam.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员权益查询参数
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaCardBenefitsParam对象", description = "会员权益查询参数")
-public class HualalaCardBenefitsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "会员等级名称")
-    private String cardLevelName;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "封面图")
-    private String image;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java
deleted file mode 100644
index 399f08a..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaCardParam.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 查询参数
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaCardParam对象", description = "查询参数")
-public class HualalaCardParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "groupID")
-    private String groupId;
-
-    @ApiModelProperty(value = "shopID")
-    private String shopId;
-
-    @ApiModelProperty(value = "网速会员id")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "会员卡ID")
-    private String cardId;
-
-    private String cardTypeId;
-
-    @ApiModelProperty(value = "会员卡等级ID")
-    private String cardLevelId;
-
-    @ApiModelProperty(value = "会员卡等级名称")
-    private String cardLevelName;
-
-    @ApiModelProperty(value = "卡状态　10：正常　20：挂失中　30：冻结　40：注销（作废）50：已过期")
-    private String cardStatus;
-
-    private String customerId;
-
-    @ApiModelProperty(value = "会员卡入会店铺字段")
-    private String createShopId;
-
-    @ApiModelProperty(value = "入会店铺名称")
-    private String createShopName;
-
-    @ApiModelProperty(value = "卡号")
-    private String cardNo;
-
-    @ApiModelProperty(value = "姓名")
-    private String customerName;
-
-    @ApiModelProperty(value = "	手机号")
-    private String customerMobile;
-
-    @ApiModelProperty(value = "性别 0：女 1：男 2：未知")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerSex;
-
-    @ApiModelProperty(value = "生日")
-    private String customerBirthday;
-
-    @ApiModelProperty(value = "卡余额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal cardBalance;
-
-    @ApiModelProperty(value = "积分余额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal pointBalance;
-
-    @ApiModelProperty(value = "累计储值金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal saveMoneyTotal;
-
-    @ApiModelProperty(value = "累计消费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal consumptionTotal;
-
-    @ApiModelProperty(value = "累计消费次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer consumptionCount;
-
-    @ApiModelProperty(value = "当前等级积分")
-    @QueryField(type = QueryType.EQ)
-    private Integer grade;
-
-    @ApiModelProperty(value = "下一等级积分")
-    @QueryField(type = QueryType.EQ)
-    private Integer nextLevelGrade;
-
-    @ApiModelProperty(value = "有效期至(yyyyMMddHHmmss) 0：表示永久有效")
-    private String expireTime;
-
-    @ApiModelProperty(value = "最后一次交易时间")
-    private String lastTransTime;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java
deleted file mode 100644
index ded0f37..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaCartFoodParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 购物车商品查询参数
- *
- * @author 科技小王子
- * @since 2023-01-14 14:46:44
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaCartFoodParam对象", description = "购物车商品查询参数")
-public class HualalaCartFoodParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "总数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer foodId;
-
-    @ApiModelProperty(value = "菜品名称")
-    private String foodName;
-
-    @ApiModelProperty(value = "skuId")
-    private String skuId;
-
-    @ApiModelProperty(value = "店铺id")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "店铺名称")
-    private String shopName;
-
-    @ApiModelProperty(value = "店铺标志")
-    private String shopLogo;
-
-    @ApiModelProperty(value = "商品图")
-    private String coverUrl;
-
-    @ApiModelProperty(value = "售价")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal sellPrice;
-
-    @ApiModelProperty(value = "库存")
-    @QueryField(type = QueryType.EQ)
-    private Integer stock;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java
deleted file mode 100644
index acd1cde..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodCategoryParam.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 菜品分类查询参数
- *
- * @author 科技小王子
- * @since 2023-01-12 09:49:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaFoodCategoryParam对象", description = "菜品分类查询参数")
-public class HualalaFoodCategoryParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "名称")
-    private String foodCategoryName;
-
-    @ApiModelProperty(value = "收入名称")
-    private String foodSubjectName;
-
-    @ApiModelProperty(value = "菜品Key")
-    private String foodKey;
-
-    @ApiModelProperty(value = "菜品条目数")
-    private String foodCount;
-
-    @ApiModelProperty(value = "分类ID")
-    private String foodCategoryId;
-
-    @ApiModelProperty(value = "分类ID")
-    private String foodCategoryGroupName;
-
-    @ApiModelProperty(value = "分类Key")
-    private String foodCategoryKey;
-
-    @ApiModelProperty(value = "记录状态")
-    private String action;
-
-    @ApiModelProperty(value = "结算系数")
-    private String settlementProportion;
-
-    @ApiModelProperty(value = "是否启用")
-    @QueryField(type = QueryType.EQ)
-    private Integer isActive;
-
-    @ApiModelProperty(value = "是/否配料分类 0：不是（默认） 1：是")
-    @QueryField(type = QueryType.EQ)
-    private Integer isBatching;
-
-    @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售")
-    @QueryField(type = QueryType.EQ)
-    private Integer isSingleSale;
-
-    @ApiModelProperty(value = "分类显示排序值")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortIndex;
-
-    @ApiModelProperty(value = "介绍页id")
-    @QueryField(type = QueryType.EQ)
-    private Integer adsId;
-
-    @ApiModelProperty(value = "店铺ID")
-    private String shopId;
-
-    @ApiModelProperty(value = "封面图")
-    private String image;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java
deleted file mode 100644
index a0b33d2..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaFoodParam.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 菜品分类查询参数
- *
- * @author 科技小王子
- * @since 2023-01-12 15:34:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaFoodParam对象", description = "菜品分类查询参数")
-public class HualalaFoodParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "菜品ID")
-    private String foodId;
-
-    @ApiModelProperty(value = "菜品Key")
-    private String foodKey;
-
-    @ApiModelProperty(value = "集团ID")
-    private String groupId;
-
-    @ApiModelProperty(value = "店铺ID")
-    private String shopId;
-
-    @ApiModelProperty(value = "菜品条目数")
-    private String foodCount;
-
-    @ApiModelProperty(value = "pos菜品分类ID")
-    private String foodCategoryId;
-
-    @ApiModelProperty(value = "pos菜品分类Key")
-    private String foodCategoryKey;
-
-    @ApiModelProperty(value = "pos菜品分类名称")
-    private String foodCategoryName;
-
-    @ApiModelProperty(value = "线上菜品分类ID")
-    private String foodOnlineCategoryId;
-
-    @ApiModelProperty(value = "线上菜品分类Key")
-    private String foodOnlineCategoryKey;
-
-    @ApiModelProperty(value = "线上菜品分类名称")
-    private String foodOnlineCategoryName;
-
-    @ApiModelProperty(value = "是/否是配料，false：不是 true：是")
-    @QueryField(type = QueryType.EQ)
-    private Integer isBatching;
-
-    @ApiModelProperty(value = "是/否可单独销售 0：不单独销售（默认） 1：可单独销售")
-    @QueryField(type = QueryType.EQ)
-    private Integer isSingleSale;
-
-//    @ApiModelProperty(value = "此菜品关联的收入科目key，例如冷菜收入、热菜收入、酒水收入")
-//    private String foodSubjectKey;
-//
-//    @ApiModelProperty(value = "对应出品部门Key列表")
-//    private String departmentKeyLst;
-//
-//    @ApiModelProperty(value = "配菜的分类key,在这里选择配菜")
-//    private String batchingFoodCategoryKey;
-//
-//    @ApiModelProperty(value = "菜品名称")
-//    private String foodName;
-//
-//    @ApiModelProperty(value = "菜品编号 可用于与三方菜品数据做映射")
-//    private String foodCode;
-//
-//    @ApiModelProperty(value = "菜品别名")
-//    private String foodAliasName;
-//
-//    @ApiModelProperty(value = "菜品注记码")
-//    private String foodMnemonicCode;
-//
-//    @ApiModelProperty(value = "配菜的分类key,在这里选择配菜")
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isDiscount;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isComments;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isActive;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isOpen;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isSetFood;
-//
-//    private String setFoodDetailJson;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isTempFood;
-//
-//    private String units;
-//
-//    private String py;
-//
-//    private String minOrderCount;
-//
-//    private String tasteList;
-//
-//    private String tasteGroupList;
-//
-//    private String makingMethodList;
-//
-//    private String makingMethodGroupList;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isSpecialty;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isRecommend;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isNews;
-//
-//    private String hotTag;
-//
-//    private String salesCount;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isNeedConfirmFoodNumber;
-//
-//    private String takeoutPackagingFee;
-//
-//    private String incrementUnit;
-//
-//    @ApiModelProperty(value = "0:堂食 1:堂食，外送，自提 2:外送，自提 3:自提 4:外送 5:堂食，自提 6:堂食，外送")
-//    private String takeawayTag;
-//
-//    private String workingLunchTag;
-//
-//    private String adsId;
-//
-//    private String imgePath;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isHasImage;
-//
-//    private String imageHwp;
-//
-//    private String starLevel;
-//
-//    private String foodTagIds;
-//
-//    private String parentFoodId;
-//
-//    private String foodEnName;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isAutoAdd;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer isCanRefund;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer setPerson;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer tasteIsRequired;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer tasteIsMultiple;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer makingMethodIsRequired;
-//
-//    @QueryField(type = QueryType.EQ)
-//    private Integer makingMethodIsMultiple;
-//
-//    private String initClickAmount;
-//
-//    private String actualClickAmount;
-//
-//    private String recentClickAmount;
-//
-//    private String clickAlertMess;
-//
-//    private String sourceFoodId;
-//
-//    private String salesCommission;
-//
-//    private String foodKeyElementLst;
-//
-//    private String foodSortIndex;
-//
-//    private String actionTime;
-//
-//    private String foodSubjectName;
-//
-//    private String foodSubjectCode;
-//
-//    private String departmentId;
-//
-//    private String departmentKey;
-//
-//    private String popularity;
-//
-//    private String detailSplit;
-//
-//    private String batchingIsFoodNumberRate;
-//
-    @ApiModelProperty(value = "分类编号")
-    private String foodCategoryCode;
-//
-//    @ApiModelProperty(value = "分类英文名")
-//    private String foodCategoryEnName;
-//
-//    @ApiModelProperty(value = "分类分组名称")
-//    private String foodCategoryGroupName;
-//
-//    @ApiModelProperty(value = "特价")
-//    private String specialPrice;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice2;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice3;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice4;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice5;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String specialPrice6;
-//
-//    @ApiModelProperty(value = "特价2")
-//    private String onlineWmPrice;
-//
-//    @ApiModelProperty(value = "标签ids")
-//    private String tagIds;
-//
-//    @ApiModelProperty(value = "标签名称")
-//    private String tagNames;
-//
-//    @ApiModelProperty(value = "礼品券ID")
-//    private String giftItemId;
-//
-//    @ApiModelProperty(value = "礼品券有效期")
-//    private String giftValidPeriod;
-//
-//    @ApiModelProperty(value = "菜品分类说明")
-//    private String description;
-//
-//    @ApiModelProperty(value = "记录状态")
-//    private String action;
-//
-//    @ApiModelProperty(value = "结算系数")
-//    private String settlementProportion;
-//
-//    @ApiModelProperty(value = "分类显示排序值")
-//    @QueryField(type = QueryType.EQ)
-//    private Integer sortIndex;
-//
-//    @ApiModelProperty(value = "封面图")
-//    private String image;
-//
-//    @ApiModelProperty(value = "内容")
-//    private String content;
-//
-//    @ApiModelProperty(value = "排序(数字越小越靠前)")
-//    @QueryField(type = QueryType.EQ)
-//    private Integer sortNumber;
-//
-//    @ApiModelProperty(value = "备注")
-//    private String comments;
-//
-//    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-//    @QueryField(type = QueryType.EQ)
-//    private Integer status;
-//
-//    @ApiModelProperty(value = "是否删除, 0否, 1是")
-//    @QueryField(type = QueryType.EQ)
-//    private Integer deleted;
-//
-//    @ApiModelProperty(value = "商户编码")
-//    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java
deleted file mode 100644
index 256288d..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.HashMap;
-
-/**
- * 常用链接推荐记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaParam对象", description = "哗啦啦请求参数")
-public class HualalaParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "接口地址")
-    private String apiUrl;
-
-    @ApiModelProperty(value = "请求参数")
-    private HashMap<String,Object> params;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java b/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java
deleted file mode 100644
index 295711d..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HualalaShopParam.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 哗啦啦门店管理查询参数
- *
- * @author 科技小王子
- * @since 2023-01-12 18:24:44
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "HualalaShopParam对象", description = "哗啦啦门店管理查询参数")
-public class HualalaShopParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "店铺ID")
-    @QueryField(type = QueryType.EQ)
-    private Long shopId;
-
-    @ApiModelProperty(value = "店铺名称")
-    private String shopName;
-
-    @ApiModelProperty(value = "店铺logo")
-    private String logoUrl;
-
-    @ApiModelProperty(value = "所在城市ID")
-    private String shopCity;
-
-    @ApiModelProperty(value = "所在城市")
-    private String shopCityName;
-
-    @ApiModelProperty(value = "营业时间")
-    private String shopOpenTime;
-
-    @ApiModelProperty(value = "店内电话")
-    private String shopPhone;
-
-    @ApiModelProperty(value = "HLL")
-    private String acspType;
-
-    @ApiModelProperty(value = "1")
-    private String action;
-
-    @ApiModelProperty(value = "20230111104803")
-    private String actionTime;
-
-    @ApiModelProperty(value = "品牌ID")
-    private String brandId;
-
-    @ApiModelProperty(value = "品牌名称")
-    private String brandName;
-
-    @ApiModelProperty(value = "1")
-    private String businessModel;
-
-    @ApiModelProperty(value = "图片")
-    private String imagePath;
-
-    @ApiModelProperty(value = "22.7913010")
-    private String mapLatitudeValueBaiDu;
-
-    @ApiModelProperty(value = "108.3312800")
-    private String mapLongitudeValueBaiDu;
-
-    @ApiModelProperty(value = "0")
-    @QueryField(type = QueryType.EQ)
-    private Integer operationMode;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "客户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/HxzParam.java b/src/main/java/com/gxwebsoft/apps/param/HxzParam.java
deleted file mode 100644
index 7f8b7a0..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/HxzParam.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 消费机请求参数
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "消费机请求参数", description = "消费机请求参数")
-public class HxzParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "交易模式（0:扣费 1：充值3:信息查询）")
-    @TableField(exist = false)
-    private String Mode;
-
-    @ApiModelProperty(value = "扣费类型（0:手动 1：菜单 2：定值 3：取餐 4：计时）")
-    @TableField(exist = false)
-    private Integer PayType;
-
-    @ApiModelProperty(value = "消费金额(Mode为3时，此字段传入值可能为0)")
-    @TableField(exist = false)
-    private BigDecimal Amount;
-
-    @ApiModelProperty(value = "消费菜品列表")
-    @TableField(exist = false)
-    private List<Object> Menus;
-
-    @ApiModelProperty(value = "扫描到的二维码字符串（最大长度为200）")
-    @TableField(exist = false)
-    private String QR;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/LinkParam.java b/src/main/java/com/gxwebsoft/apps/param/LinkParam.java
deleted file mode 100644
index 30cf914..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/LinkParam.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 常用链接推荐记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "LinkParam对象", description = "常用链接推荐记录表查询参数")
-public class LinkParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "链接ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer linkId;
-
-    @ApiModelProperty(value = "链接名称")
-    private String linkName;
-
-    @ApiModelProperty(value = "链接图标")
-    private String linkIcon;
-
-    @ApiModelProperty(value = "路由地址")
-    private String linkPath;
-
-    @ApiModelProperty(value = "组件路径")
-    private String linkComponent;
-
-    @ApiModelProperty(value = "链接类型")
-    private String type;
-
-    @ApiModelProperty(value = "点击次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer clicks;
-
-    @ApiModelProperty(value = "推荐理由")
-    private String comments;
-
-    @ApiModelProperty(value = "文章排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "商户编号")
-    @QueryField(type = QueryType.EQ)
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java b/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java
deleted file mode 100644
index 44d6d61..0000000
--- a/src/main/java/com/gxwebsoft/apps/param/TestDataParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gxwebsoft.apps.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 测试数据表查询参数
- *
- * @author 科技小王子
- * @since 2023-02-01 12:13:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TestDataParam对象", description = "测试数据表查询参数")
-public class TestDataParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java b/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java
deleted file mode 100644
index 0416489..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/AllShopResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gxwebsoft.apps.result;
-
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.shop.entity.Merchant;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 店铺菜品返回结果
- *
- * @author WebSoft
- * @since 2021-08-30 17:35:16
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel(description = "店铺详情结果")
-public class AllShopResult implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("返回参数")
-    private Object result;
-
-    @ApiModelProperty("店铺详情")
-    private List<HualalaShop> shopInfoList;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/CartResult.java b/src/main/java/com/gxwebsoft/apps/result/CartResult.java
deleted file mode 100644
index 524d75d..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/CartResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.gxwebsoft.apps.result;
-
-import com.gxwebsoft.apps.entity.BcCart;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 操作购物车信息
- */
-@Data
-public class CartResult {
-  String deliveryTime; // 预定日期
-  Integer totalNum; // 总数
-  BigDecimal totalPrice; // 总结
-  List<BcCart> items;// 商品列表
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java b/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java
deleted file mode 100644
index 0b10470..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/FoodCategoryResult.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gxwebsoft.apps.result;
-
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 店铺菜品返回结果
- *
- * @author WebSoft
- * @since 2021-08-30 17:35:16
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel(description = "店铺菜品结果")
-public class FoodCategoryResult implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("公共返回参数")
-    private Object result;
-
-    @ApiModelProperty("菜品分类")
-    private List<Object> foodCategory;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java b/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java
deleted file mode 100644
index bbefe3e..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/OpenFoodResult.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.gxwebsoft.apps.result;
-
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.shop.entity.Merchant;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 店铺菜品返回结果
- *
- * @author WebSoft
- * @since 2021-08-30 17:35:16
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel(description = "店铺菜品列表结果")
-public class OpenFoodResult implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("返回参数")
-    private Object result;
-
-    @ApiModelProperty("店铺菜品列表")
-    private List<HualalaFood> foodList;
-
-    @ApiModelProperty(value = "记录数")
-    private Integer count;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/OperateVo.java b/src/main/java/com/gxwebsoft/apps/result/OperateVo.java
deleted file mode 100644
index 6c36a3f..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/OperateVo.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gxwebsoft.apps.result;
-
-import com.gxwebsoft.apps.entity.ItemVo;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 操作购物车信息
- */
-@Data
-public class OperateVo {
-  private Integer totalNum;// 总数
-  private BigDecimal totalPrice;// 售价
-  private List<ItemVo> items; // 菜品列表列表（选择购物车时使用）
-}
diff --git a/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java b/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java
deleted file mode 100644
index 5567476..0000000
--- a/src/main/java/com/gxwebsoft/apps/result/ShopBaseInfoResult.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.gxwebsoft.apps.result;
-
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 店铺菜品返回结果
- *
- * @author WebSoft
- * @since 2021-08-30 17:35:16
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel(description = "店铺详情结果")
-public class ShopBaseInfoResult implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("返回参数")
-    private Object result;
-
-    @ApiModelProperty("店铺详情")
-    private Object shopBaseInfo;
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java b/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java
deleted file mode 100644
index 53cf4e5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcAgentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcAgent;
-import com.gxwebsoft.apps.param.BcAgentParam;
-
-import java.util.List;
-
-/**
- * 代报餐管理Service
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-public interface BcAgentService extends IService<BcAgent> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcAgent>
-     */
-    PageResult<BcAgent> pageRel(BcAgentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcAgent>
-     */
-    List<BcAgent> listRel(BcAgentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param agentId 自增ID
-     * @return BcAgent
-     */
-    BcAgent getByIdRel(Integer agentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java b/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java
deleted file mode 100644
index 3f69500..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcCookbookService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcCookbook;
-import com.gxwebsoft.apps.param.BcCookbookParam;
-
-import java.util.List;
-
-/**
- * 常用菜谱Service
- *
- * @author 科技小王子
- * @since 2023-05-05 14:56:54
- */
-public interface BcCookbookService extends IService<BcCookbook> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcCookbook>
-     */
-    PageResult<BcCookbook> pageRel(BcCookbookParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcCookbook>
-     */
-    List<BcCookbook> listRel(BcCookbookParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param cookbookId 自增ID
-     * @return BcCookbook
-     */
-    BcCookbook getByIdRel(Integer cookbookId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java b/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java
deleted file mode 100644
index 242e855..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcEquipment;
-import com.gxwebsoft.apps.param.BcEquipmentParam;
-
-import java.util.List;
-
-/**
- * 报餐设备管理Service
- *
- * @author 科技小王子
- * @since 2023-05-02 10:34:40
- */
-public interface BcEquipmentService extends IService<BcEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcEquipment>
-     */
-    PageResult<BcEquipment> pageRel(BcEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcEquipment>
-     */
-    List<BcEquipment> listRel(BcEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param bcEquipmentId 设备ID
-     * @return BcEquipment
-     */
-    BcEquipment getByIdRel(Integer bcEquipmentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcExportService.java b/src/main/java/com/gxwebsoft/apps/service/BcExportService.java
deleted file mode 100644
index 48b1cb5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcExportService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcExport;
-import com.gxwebsoft.apps.param.BcExportParam;
-
-import java.util.List;
-
-/**
- * 报餐统计导出Service
- *
- * @author 科技小王子
- * @since 2023-06-01 21:47:02
- */
-public interface BcExportService extends IService<BcExport> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcExport>
-     */
-    PageResult<BcExport> pageRel(BcExportParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcExport>
-     */
-    List<BcExport> listRel(BcExportParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param exportId 自增ID
-     * @return BcExport
-     */
-    BcExport getByIdRel(Integer exportId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java b/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java
deleted file mode 100644
index 6add5ff..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcFoodService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcFood;
-import com.gxwebsoft.apps.param.BcFoodParam;
-
-import java.util.List;
-
-/**
- * 发布菜品明细Service
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-public interface BcFoodService extends IService<BcFood> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcFood>
-     */
-    PageResult<BcFood> pageRel(BcFoodParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcFood>
-     */
-    List<BcFood> listRel(BcFoodParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param bcFoodId 自增ID
-     * @return BcFood
-     */
-    BcFood getByIdRel(Integer bcFoodId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java b/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java
deleted file mode 100644
index f47d9c0..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcPlanService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.param.BcPlanParam;
-
-import java.util.List;
-
-/**
- * 菜品发布管理Service
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-public interface BcPlanService extends IService<BcPlan> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcPlan>
-     */
-    PageResult<BcPlan> pageRel(BcPlanParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcPlan>
-     */
-    List<BcPlan> listRel(BcPlanParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param bcPlanId 自增ID
-     * @return BcPlan
-     */
-    BcPlan getByIdRel(Integer bcPlanId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java b/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java
deleted file mode 100644
index d56f39b..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/BcTemporaryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.BcTemporary;
-import com.gxwebsoft.apps.param.BcTemporaryParam;
-
-import java.util.List;
-
-/**
- * 临时报餐管理Service
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-public interface BcTemporaryService extends IService<BcTemporary> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<BcTemporary>
-     */
-    PageResult<BcTemporary> pageRel(BcTemporaryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<BcTemporary>
-     */
-    List<BcTemporary> listRel(BcTemporaryParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param temporaryId 自增ID
-     * @return BcTemporary
-     */
-    BcTemporary getByIdRel(Integer temporaryId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/CashierService.java b/src/main/java/com/gxwebsoft/apps/service/CashierService.java
deleted file mode 100644
index 918f481..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/CashierService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.Cashier;
-import com.gxwebsoft.apps.param.CashierParam;
-
-import java.util.List;
-
-/**
- * 海牛收银台记录表Service
- *
- * @author WebSoft
- * @since 2022-11-18 11:47:09
- */
-public interface CashierService extends IService<Cashier> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Cashier>
-     */
-    PageResult<Cashier> pageRel(CashierParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Cashier>
-     */
-    List<Cashier> listRel(CashierParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param cashierId ID
-     * @return Cashier
-     */
-    Cashier getByIdRel(Integer cashierId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java
deleted file mode 100644
index 5c46a13..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentAlarmService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.EquipmentAlarm;
-import com.gxwebsoft.apps.param.EquipmentAlarmParam;
-
-import java.util.List;
-
-/**
- * 故障报警记录Service
- *
- * @author 科技小王子
- * @since 2022-12-01 23:49:44
- */
-public interface EquipmentAlarmService extends IService<EquipmentAlarm> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentAlarm>
-     */
-    PageResult<EquipmentAlarm> pageRel(EquipmentAlarmParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentAlarm>
-     */
-    List<EquipmentAlarm> listRel(EquipmentAlarmParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 记录ID
-     * @return EquipmentAlarm
-     */
-    EquipmentAlarm getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java
deleted file mode 100644
index 513bed5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentFaultService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.EquipmentFault;
-import com.gxwebsoft.apps.param.EquipmentFaultParam;
-
-import java.util.List;
-
-/**
- * 故障电池Service
- *
- * @author 科技小王子
- * @since 2022-12-01 18:40:25
- */
-public interface EquipmentFaultService extends IService<EquipmentFault> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentFault>
-     */
-    PageResult<EquipmentFault> pageRel(EquipmentFaultParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentFault>
-     */
-    List<EquipmentFault> listRel(EquipmentFaultParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 记录ID
-     * @return EquipmentFault
-     */
-    EquipmentFault getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java
deleted file mode 100644
index 26b88d7..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentGoodsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.EquipmentGoods;
-import com.gxwebsoft.apps.param.EquipmentGoodsParam;
-
-import java.util.List;
-
-/**
- * 电池管理记录表Service
- *
- * @author 科技小王子
- * @since 2023-02-28 22:40:50
- */
-public interface EquipmentGoodsService extends IService<EquipmentGoods> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentGoods>
-     */
-    PageResult<EquipmentGoods> pageRel(EquipmentGoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentGoods>
-     */
-    List<EquipmentGoods> listRel(EquipmentGoodsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param goodsId 商品ID
-     * @return EquipmentGoods
-     */
-    EquipmentGoods getByIdRel(Integer goodsId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java
deleted file mode 100644
index 3b96ce5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderGoodsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
-import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam;
-
-import java.util.List;
-
-/**
- * 电池管理记录表Service
- *
- * @author 科技小王子
- * @since 2023-05-11 19:10:13
- */
-public interface EquipmentOrderGoodsService extends IService<EquipmentOrderGoods> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentOrderGoods>
-     */
-    PageResult<EquipmentOrderGoods> pageRel(EquipmentOrderGoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentOrderGoods>
-     */
-    List<EquipmentOrderGoods> listRel(EquipmentOrderGoodsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderGoodsId 商品ID
-     * @return EquipmentOrderGoods
-     */
-    EquipmentOrderGoods getByIdRel(Integer orderGoodsId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java
deleted file mode 100644
index c754615..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentOrderService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.EquipmentOrder;
-import com.gxwebsoft.apps.param.EquipmentOrderParam;
-
-import java.util.List;
-
-/**
- * 订单记录表Service
- *
- * @author 科技小王子
- * @since 2023-04-14 21:24:31
- */
-public interface EquipmentOrderService extends IService<EquipmentOrder> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentOrder>
-     */
-    PageResult<EquipmentOrder> pageRel(EquipmentOrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentOrder>
-     */
-    List<EquipmentOrder> listRel(EquipmentOrderParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderId 订单ID
-     * @return EquipmentOrder
-     */
-    EquipmentOrder getByIdRel(Integer orderId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java
deleted file mode 100644
index d4655a2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentRecordService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.EquipmentRecord;
-import com.gxwebsoft.apps.param.EquipmentRecordParam;
-
-import java.util.List;
-
-/**
- * 前世今生Service
- *
- * @author 科技小王子
- * @since 2022-12-03 01:23:53
- */
-public interface EquipmentRecordService extends IService<EquipmentRecord> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<EquipmentRecord>
-     */
-    PageResult<EquipmentRecord> pageRel(EquipmentRecordParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<EquipmentRecord>
-     */
-    List<EquipmentRecord> listRel(EquipmentRecordParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 记录ID
-     * @return EquipmentRecord
-     */
-    EquipmentRecord getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java b/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java
deleted file mode 100644
index 246e367..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/EquipmentService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.param.EquipmentParam;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * 设备管理Service
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-public interface EquipmentService extends IService<Equipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Equipment>
-     */
-    PageResult<Equipment> pageRel(EquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Equipment>
-     */
-    List<Equipment> listRel(EquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param equipmentId 设备ID
-     * @return Equipment
-     */
-    Equipment getByIdRel(Integer equipmentId);
-
-    Equipment getByEquipmentCode(String equipmentCode);
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java
deleted file mode 100644
index d23c787..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaCardBenefitsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.HualalaCardBenefits;
-import com.gxwebsoft.apps.param.HualalaCardBenefitsParam;
-
-import java.util.List;
-
-/**
- * 会员权益Service
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-public interface HualalaCardBenefitsService extends IService<HualalaCardBenefits> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaCardBenefits>
-     */
-    PageResult<HualalaCardBenefits> pageRel(HualalaCardBenefitsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaCardBenefits>
-     */
-    List<HualalaCardBenefits> listRel(HualalaCardBenefitsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 
-     * @return HualalaCardBenefits
-     */
-    HualalaCardBenefits getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java
deleted file mode 100644
index 2d2da4b..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaCardService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.HualalaCard;
-import com.gxwebsoft.apps.param.HualalaCardParam;
-
-import java.util.List;
-
-/**
- * Service
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-public interface HualalaCardService extends IService<HualalaCard> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaCard>
-     */
-    PageResult<HualalaCard> pageRel(HualalaCardParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaCard>
-     */
-    List<HualalaCard> listRel(HualalaCardParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 
-     * @return HualalaCard
-     */
-    HualalaCard getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java
deleted file mode 100644
index 4c6a591..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaCartFoodService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.HualalaCartFood;
-import com.gxwebsoft.apps.param.HualalaCartFoodParam;
-
-import java.util.List;
-
-/**
- * 购物车商品Service
- *
- * @author 科技小王子
- * @since 2023-01-14 14:46:44
- */
-public interface HualalaCartFoodService extends IService<HualalaCartFood> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaCartFood>
-     */
-    PageResult<HualalaCartFood> pageRel(HualalaCartFoodParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaCartFood>
-     */
-    List<HualalaCartFood> listRel(HualalaCartFoodParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id ID
-     * @return HualalaCartFood
-     */
-    HualalaCartFood getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java
deleted file mode 100644
index 33b298f..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodCategoryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import com.gxwebsoft.apps.param.HualalaFoodCategoryParam;
-
-import java.util.List;
-
-/**
- * 菜品分类Service
- *
- * @author 科技小王子
- * @since 2023-01-12 09:49:46
- */
-public interface HualalaFoodCategoryService extends IService<HualalaFoodCategory> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaFoodCategory>
-     */
-    PageResult<HualalaFoodCategory> pageRel(HualalaFoodCategoryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaFoodCategory>
-     */
-    List<HualalaFoodCategory> listRel(HualalaFoodCategoryParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 
-     * @return HualalaFoodCategory
-     */
-    HualalaFoodCategory getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java
deleted file mode 100644
index 6da9cb5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaFoodService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.param.HualalaFoodParam;
-
-import java.util.List;
-
-/**
- * 菜品分类Service
- *
- * @author 科技小王子
- * @since 2023-01-12 15:34:55
- */
-public interface HualalaFoodService extends IService<HualalaFood> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaFood>
-     */
-    PageResult<HualalaFood> pageRel(HualalaFoodParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaFood>
-     */
-    List<HualalaFood> listRel(HualalaFoodParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id
-     * @return HualalaFood
-     */
-    HualalaFood getByIdRel(Integer id);
-
-    HualalaFood getByFoodId(Integer foodId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaService.java
deleted file mode 100644
index a64d839..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.apps.entity.Hualala;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.entity.Link;
-import com.gxwebsoft.apps.param.HualalaShopParam;
-import com.gxwebsoft.apps.param.LinkParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Order;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 哗啦啦Service
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-public interface HualalaService extends IService<Hualala> {
-
-  /**
-   * 请求哗啦啦接口并返回结果
-   * @param requestBody
-   * @return
-   */
-  JSONObject doPost(String url, Map<String, Object> requestBody);
-
-  JSONObject doExpress(Order orderInfo);
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java b/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java
deleted file mode 100644
index f4b73a5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/HualalaShopService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.param.HualalaShopParam;
-
-import java.util.List;
-
-/**
- * 哗啦啦门店管理Service
- *
- * @author 科技小王子
- * @since 2023-01-12 18:24:44
- */
-public interface HualalaShopService extends IService<HualalaShop> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<HualalaShop>
-     */
-    PageResult<HualalaShop> pageRel(HualalaShopParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<HualalaShop>
-     */
-    List<HualalaShop> listRel(HualalaShopParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param shopId 店铺ID
-     * @return HualalaShop
-     */
-    HualalaShop getByIdRel(Integer shopId);
-
-  List<HualalaShop> listByGeo(HualalaShopParam param);
-  void saveGeoPointToRedis();
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/LinkService.java b/src/main/java/com/gxwebsoft/apps/service/LinkService.java
deleted file mode 100644
index 29291d3..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/LinkService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.Link;
-import com.gxwebsoft.apps.param.LinkParam;
-
-import java.util.List;
-
-/**
- * 常用链接推荐记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-public interface LinkService extends IService<Link> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Link>
-     */
-    PageResult<Link> pageRel(LinkParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Link>
-     */
-    List<Link> listRel(LinkParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param linkId 链接ID
-     * @return Link
-     */
-    Link getByIdRel(Integer linkId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/TestDataService.java b/src/main/java/com/gxwebsoft/apps/service/TestDataService.java
deleted file mode 100644
index e5878f2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/TestDataService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.apps.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.apps.entity.TestData;
-import com.gxwebsoft.apps.param.TestDataParam;
-
-import java.util.List;
-
-/**
- * 测试数据表Service
- *
- * @author 科技小王子
- * @since 2023-02-01 12:13:46
- */
-public interface TestDataService extends IService<TestData> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TestData>
-     */
-    PageResult<TestData> pageRel(TestDataParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TestData>
-     */
-    List<TestData> listRel(TestDataParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 主键ID
-     * @return TestData
-     */
-    TestData getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java
deleted file mode 100644
index 87416aa..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcAgentServiceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcAgentMapper;
-import com.gxwebsoft.apps.service.BcAgentService;
-import com.gxwebsoft.apps.entity.BcAgent;
-import com.gxwebsoft.apps.param.BcAgentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.service.UserService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 代报餐管理Service实现
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-@Service
-public class BcAgentServiceImpl extends ServiceImpl<BcAgentMapper, BcAgent> implements BcAgentService {
-
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<BcAgent> pageRel(BcAgentParam param) {
-        PageParam<BcAgent, BcAgentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<BcAgent> list = baseMapper.selectPageRel(page, param);
-//        list.forEach( d-> {
-//          d.setUser(userService.getById(d.getUserId()));
-//          d.setParentUser(userService.getById(d.getParentId()));
-//        });
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcAgent> listRel(BcAgentParam param) {
-        List<BcAgent> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcAgent, BcAgentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcAgent getByIdRel(Integer agentId) {
-        BcAgentParam param = new BcAgentParam();
-        param.setAgentId(agentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java
deleted file mode 100644
index 826e319..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcCookbookServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcCookbookMapper;
-import com.gxwebsoft.apps.service.BcCookbookService;
-import com.gxwebsoft.apps.entity.BcCookbook;
-import com.gxwebsoft.apps.param.BcCookbookParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 常用菜谱Service实现
- *
- * @author 科技小王子
- * @since 2023-05-05 14:56:54
- */
-@Service
-public class BcCookbookServiceImpl extends ServiceImpl<BcCookbookMapper, BcCookbook> implements BcCookbookService {
-
-    @Override
-    public PageResult<BcCookbook> pageRel(BcCookbookParam param) {
-        PageParam<BcCookbook, BcCookbookParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcCookbook> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcCookbook> listRel(BcCookbookParam param) {
-        List<BcCookbook> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcCookbook, BcCookbookParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcCookbook getByIdRel(Integer cookbookId) {
-        BcCookbookParam param = new BcCookbookParam();
-        param.setCookbookId(cookbookId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java
deleted file mode 100644
index e6a59d9..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcEquipmentMapper;
-import com.gxwebsoft.apps.service.BcEquipmentService;
-import com.gxwebsoft.apps.entity.BcEquipment;
-import com.gxwebsoft.apps.param.BcEquipmentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 报餐设备管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-02 10:34:40
- */
-@Service
-public class BcEquipmentServiceImpl extends ServiceImpl<BcEquipmentMapper, BcEquipment> implements BcEquipmentService {
-
-    @Override
-    public PageResult<BcEquipment> pageRel(BcEquipmentParam param) {
-        PageParam<BcEquipment, BcEquipmentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcEquipment> listRel(BcEquipmentParam param) {
-        List<BcEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcEquipment, BcEquipmentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcEquipment getByIdRel(Integer bcEquipmentId) {
-        BcEquipmentParam param = new BcEquipmentParam();
-        param.setBcEquipmentId(bcEquipmentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java
deleted file mode 100644
index 3bb6921..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcExportServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcExportMapper;
-import com.gxwebsoft.apps.service.BcExportService;
-import com.gxwebsoft.apps.entity.BcExport;
-import com.gxwebsoft.apps.param.BcExportParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 报餐统计导出Service实现
- *
- * @author 科技小王子
- * @since 2023-06-01 21:47:02
- */
-@Service
-public class BcExportServiceImpl extends ServiceImpl<BcExportMapper, BcExport> implements BcExportService {
-
-    @Override
-    public PageResult<BcExport> pageRel(BcExportParam param) {
-        PageParam<BcExport, BcExportParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcExport> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcExport> listRel(BcExportParam param) {
-        List<BcExport> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcExport, BcExportParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcExport getByIdRel(Integer exportId) {
-        BcExportParam param = new BcExportParam();
-        param.setExportId(exportId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java
deleted file mode 100644
index 8ba309f..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcFoodServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcFoodMapper;
-import com.gxwebsoft.apps.service.BcFoodService;
-import com.gxwebsoft.apps.entity.BcFood;
-import com.gxwebsoft.apps.param.BcFoodParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 发布菜品明细Service实现
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Service
-public class BcFoodServiceImpl extends ServiceImpl<BcFoodMapper, BcFood> implements BcFoodService {
-
-    @Override
-    public PageResult<BcFood> pageRel(BcFoodParam param) {
-        PageParam<BcFood, BcFoodParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<BcFood> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcFood> listRel(BcFoodParam param) {
-        List<BcFood> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcFood, BcFoodParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcFood getByIdRel(Integer bcFoodId) {
-        BcFoodParam param = new BcFoodParam();
-        param.setBcFoodId(bcFoodId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java
deleted file mode 100644
index 1e01cb2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcPlanServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcPlanMapper;
-import com.gxwebsoft.apps.service.BcPlanService;
-import com.gxwebsoft.apps.entity.BcPlan;
-import com.gxwebsoft.apps.param.BcPlanParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 菜品发布管理Service实现
- *
- * @author 科技小王子
- * @since 2023-04-27 17:59:40
- */
-@Service
-public class BcPlanServiceImpl extends ServiceImpl<BcPlanMapper, BcPlan> implements BcPlanService {
-
-    @Override
-    public PageResult<BcPlan> pageRel(BcPlanParam param) {
-        PageParam<BcPlan, BcPlanParam> page = new PageParam<>(param);
-        page.setDefaultOrder("day_time desc, create_time desc");
-        List<BcPlan> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcPlan> listRel(BcPlanParam param) {
-        List<BcPlan> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcPlan, BcPlanParam> page = new PageParam<>();
-        page.setDefaultOrder("day_time desc, create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcPlan getByIdRel(Integer bcPlanId) {
-        BcPlanParam param = new BcPlanParam();
-        param.setBcPlanId(bcPlanId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java
deleted file mode 100644
index e261632..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/BcTemporaryServiceImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.BcTemporaryMapper;
-import com.gxwebsoft.apps.service.BcTemporaryService;
-import com.gxwebsoft.apps.entity.BcTemporary;
-import com.gxwebsoft.apps.param.BcTemporaryParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 临时报餐管理Service实现
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-@Service
-public class BcTemporaryServiceImpl extends ServiceImpl<BcTemporaryMapper, BcTemporary> implements BcTemporaryService {
-
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<BcTemporary> pageRel(BcTemporaryParam param) {
-        PageParam<BcTemporary, BcTemporaryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<BcTemporary> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<BcTemporary> listRel(BcTemporaryParam param) {
-        List<BcTemporary> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<BcTemporary, BcTemporaryParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public BcTemporary getByIdRel(Integer temporaryId) {
-        BcTemporaryParam param = new BcTemporaryParam();
-        param.setTemporaryId(temporaryId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java
deleted file mode 100644
index 5e10978..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/CashierServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.CashierMapper;
-import com.gxwebsoft.apps.service.CashierService;
-import com.gxwebsoft.apps.entity.Cashier;
-import com.gxwebsoft.apps.param.CashierParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 海牛收银台记录表Service实现
- *
- * @author WebSoft
- * @since 2022-11-18 11:47:09
- */
-@Service
-public class CashierServiceImpl extends ServiceImpl<CashierMapper, Cashier> implements CashierService {
-
-    @Override
-    public PageResult<Cashier> pageRel(CashierParam param) {
-        PageParam<Cashier, CashierParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Cashier> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Cashier> listRel(CashierParam param) {
-        List<Cashier> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Cashier, CashierParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Cashier getByIdRel(Integer cashierId) {
-        CashierParam param = new CashierParam();
-        param.setCashierId(cashierId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java
deleted file mode 100644
index a724c4a..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentAlarmServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentAlarmMapper;
-import com.gxwebsoft.apps.service.EquipmentAlarmService;
-import com.gxwebsoft.apps.entity.EquipmentAlarm;
-import com.gxwebsoft.apps.param.EquipmentAlarmParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 故障报警记录Service实现
- *
- * @author 科技小王子
- * @since 2022-12-01 23:49:44
- */
-@Service
-public class EquipmentAlarmServiceImpl extends ServiceImpl<EquipmentAlarmMapper, EquipmentAlarm> implements EquipmentAlarmService {
-
-    @Override
-    public PageResult<EquipmentAlarm> pageRel(EquipmentAlarmParam param) {
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<EquipmentAlarm> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentAlarm> listRel(EquipmentAlarmParam param) {
-        List<EquipmentAlarm> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentAlarm, EquipmentAlarmParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public EquipmentAlarm getByIdRel(Integer id) {
-        EquipmentAlarmParam param = new EquipmentAlarmParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java
deleted file mode 100644
index 8cc4a12..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentFaultServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentFaultMapper;
-import com.gxwebsoft.apps.service.EquipmentFaultService;
-import com.gxwebsoft.apps.entity.EquipmentFault;
-import com.gxwebsoft.apps.param.EquipmentFaultParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 故障电池Service实现
- *
- * @author 科技小王子
- * @since 2022-12-01 18:40:25
- */
-@Service
-public class EquipmentFaultServiceImpl extends ServiceImpl<EquipmentFaultMapper, EquipmentFault> implements EquipmentFaultService {
-
-    @Override
-    public PageResult<EquipmentFault> pageRel(EquipmentFaultParam param) {
-        PageParam<EquipmentFault, EquipmentFaultParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<EquipmentFault> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentFault> listRel(EquipmentFaultParam param) {
-        List<EquipmentFault> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentFault, EquipmentFaultParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public EquipmentFault getByIdRel(Integer id) {
-        EquipmentFaultParam param = new EquipmentFaultParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java
deleted file mode 100644
index 97449e8..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentGoodsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentGoodsMapper;
-import com.gxwebsoft.apps.service.EquipmentGoodsService;
-import com.gxwebsoft.apps.entity.EquipmentGoods;
-import com.gxwebsoft.apps.param.EquipmentGoodsParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 电池管理记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-02-28 22:40:50
- */
-@Service
-public class EquipmentGoodsServiceImpl extends ServiceImpl<EquipmentGoodsMapper, EquipmentGoods> implements EquipmentGoodsService {
-
-    @Override
-    public PageResult<EquipmentGoods> pageRel(EquipmentGoodsParam param) {
-        PageParam<EquipmentGoods, EquipmentGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<EquipmentGoods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentGoods> listRel(EquipmentGoodsParam param) {
-        List<EquipmentGoods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentGoods, EquipmentGoodsParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public EquipmentGoods getByIdRel(Integer goodsId) {
-        EquipmentGoodsParam param = new EquipmentGoodsParam();
-        param.setGoodsId(goodsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java
deleted file mode 100644
index 346bfcd..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderGoodsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentOrderGoodsMapper;
-import com.gxwebsoft.apps.service.EquipmentOrderGoodsService;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
-import com.gxwebsoft.apps.param.EquipmentOrderGoodsParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 电池管理记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-05-11 19:10:13
- */
-@Service
-public class EquipmentOrderGoodsServiceImpl extends ServiceImpl<EquipmentOrderGoodsMapper, EquipmentOrderGoods> implements EquipmentOrderGoodsService {
-
-    @Override
-    public PageResult<EquipmentOrderGoods> pageRel(EquipmentOrderGoodsParam param) {
-        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<EquipmentOrderGoods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentOrderGoods> listRel(EquipmentOrderGoodsParam param) {
-        List<EquipmentOrderGoods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentOrderGoods, EquipmentOrderGoodsParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public EquipmentOrderGoods getByIdRel(Integer orderGoodsId) {
-        EquipmentOrderGoodsParam param = new EquipmentOrderGoodsParam();
-        param.setOrderGoodsId(orderGoodsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java
deleted file mode 100644
index 17dc8b8..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentOrderServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentOrderMapper;
-import com.gxwebsoft.apps.service.EquipmentOrderService;
-import com.gxwebsoft.apps.entity.EquipmentOrder;
-import com.gxwebsoft.apps.param.EquipmentOrderParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 订单记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-14 21:24:31
- */
-@Service
-public class EquipmentOrderServiceImpl extends ServiceImpl<EquipmentOrderMapper, EquipmentOrder> implements EquipmentOrderService {
-
-    @Override
-    public PageResult<EquipmentOrder> pageRel(EquipmentOrderParam param) {
-        PageParam<EquipmentOrder, EquipmentOrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<EquipmentOrder> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentOrder> listRel(EquipmentOrderParam param) {
-        List<EquipmentOrder> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentOrder, EquipmentOrderParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public EquipmentOrder getByIdRel(Integer orderId) {
-        EquipmentOrderParam param = new EquipmentOrderParam();
-        param.setOrderId(orderId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
deleted file mode 100644
index 153194a..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentRecordMapper;
-import com.gxwebsoft.apps.service.EquipmentRecordService;
-import com.gxwebsoft.apps.entity.EquipmentRecord;
-import com.gxwebsoft.apps.param.EquipmentRecordParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 前世今生Service实现
- *
- * @author 科技小王子
- * @since 2022-12-03 01:23:53
- */
-@Service
-public class EquipmentRecordServiceImpl extends ServiceImpl<EquipmentRecordMapper, EquipmentRecord> implements EquipmentRecordService {
-
-    @Override
-    public PageResult<EquipmentRecord> pageRel(EquipmentRecordParam param) {
-        PageParam<EquipmentRecord, EquipmentRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<EquipmentRecord> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<EquipmentRecord> listRel(EquipmentRecordParam param) {
-        List<EquipmentRecord> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<EquipmentRecord, EquipmentRecordParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public EquipmentRecord getByIdRel(Integer id) {
-        EquipmentRecordParam param = new EquipmentRecordParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
deleted file mode 100644
index ad81d60..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.EquipmentMapper;
-import com.gxwebsoft.apps.service.EquipmentService;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.param.EquipmentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 设备管理Service实现
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-@Service
-public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment> implements EquipmentService {
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<Equipment> pageRel(EquipmentParam param) {
-        PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Equipment> list = baseMapper.selectPageRel(page, param);
-        // 查询绑定电池的用户
-        for(Equipment equipment : list){
-          if(!equipment.getUserId().equals(0)){
-            equipment.setUser(userService.getById(equipment.getUserId()));
-          }
-        }
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Equipment> listRel(EquipmentParam param) {
-        List<Equipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Equipment, EquipmentParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Equipment getByIdRel(Integer equipmentId) {
-        EquipmentParam param = new EquipmentParam();
-        param.setEquipmentId(equipmentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public Equipment getByEquipmentCode(String equipmentCode) {
-      return query().eq("equipment_code", equipmentCode).one();
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java
deleted file mode 100644
index 7b0cf3b..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardBenefitsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.HualalaCardBenefitsMapper;
-import com.gxwebsoft.apps.service.HualalaCardBenefitsService;
-import com.gxwebsoft.apps.entity.HualalaCardBenefits;
-import com.gxwebsoft.apps.param.HualalaCardBenefitsParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员权益Service实现
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Service
-public class HualalaCardBenefitsServiceImpl extends ServiceImpl<HualalaCardBenefitsMapper, HualalaCardBenefits> implements HualalaCardBenefitsService {
-
-    @Override
-    public PageResult<HualalaCardBenefits> pageRel(HualalaCardBenefitsParam param) {
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaCardBenefits> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaCardBenefits> listRel(HualalaCardBenefitsParam param) {
-        List<HualalaCardBenefits> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaCardBenefits, HualalaCardBenefitsParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public HualalaCardBenefits getByIdRel(Integer id) {
-        HualalaCardBenefitsParam param = new HualalaCardBenefitsParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java
deleted file mode 100644
index 30dff53..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCardServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.HualalaCardMapper;
-import com.gxwebsoft.apps.service.HualalaCardService;
-import com.gxwebsoft.apps.entity.HualalaCard;
-import com.gxwebsoft.apps.param.HualalaCardParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * Service实现
- *
- * @author 科技小王子
- * @since 2023-01-08 12:22:50
- */
-@Service
-public class HualalaCardServiceImpl extends ServiceImpl<HualalaCardMapper, HualalaCard> implements HualalaCardService {
-
-    @Override
-    public PageResult<HualalaCard> pageRel(HualalaCardParam param) {
-        PageParam<HualalaCard, HualalaCardParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaCard> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaCard> listRel(HualalaCardParam param) {
-        List<HualalaCard> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaCard, HualalaCardParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public HualalaCard getByIdRel(Integer id) {
-        HualalaCardParam param = new HualalaCardParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java
deleted file mode 100644
index 64249f2..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaCartFoodServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.HualalaCartFoodMapper;
-import com.gxwebsoft.apps.service.HualalaCartFoodService;
-import com.gxwebsoft.apps.entity.HualalaCartFood;
-import com.gxwebsoft.apps.param.HualalaCartFoodParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 购物车商品Service实现
- *
- * @author 科技小王子
- * @since 2023-01-14 14:46:44
- */
-@Service
-public class HualalaCartFoodServiceImpl extends ServiceImpl<HualalaCartFoodMapper, HualalaCartFood> implements HualalaCartFoodService {
-
-    @Override
-    public PageResult<HualalaCartFood> pageRel(HualalaCartFoodParam param) {
-        PageParam<HualalaCartFood, HualalaCartFoodParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaCartFood> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaCartFood> listRel(HualalaCartFoodParam param) {
-        List<HualalaCartFood> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaCartFood, HualalaCartFoodParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public HualalaCartFood getByIdRel(Integer id) {
-        HualalaCartFoodParam param = new HualalaCartFoodParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java
deleted file mode 100644
index 81543fd..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodCategoryServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.HualalaFoodCategoryMapper;
-import com.gxwebsoft.apps.service.HualalaFoodCategoryService;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import com.gxwebsoft.apps.param.HualalaFoodCategoryParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 菜品分类Service实现
- *
- * @author 科技小王子
- * @since 2023-01-12 09:49:46
- */
-@Service
-public class HualalaFoodCategoryServiceImpl extends ServiceImpl<HualalaFoodCategoryMapper, HualalaFoodCategory> implements HualalaFoodCategoryService {
-
-    @Override
-    public PageResult<HualalaFoodCategory> pageRel(HualalaFoodCategoryParam param) {
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaFoodCategory> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaFoodCategory> listRel(HualalaFoodCategoryParam param) {
-        List<HualalaFoodCategory> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaFoodCategory, HualalaFoodCategoryParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public HualalaFoodCategory getByIdRel(Integer id) {
-        HualalaFoodCategoryParam param = new HualalaFoodCategoryParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java
deleted file mode 100644
index 6b85ae5..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaFoodServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.HualalaFoodMapper;
-import com.gxwebsoft.apps.service.HualalaFoodService;
-import com.gxwebsoft.apps.entity.HualalaFood;
-import com.gxwebsoft.apps.param.HualalaFoodParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 菜品分类Service实现
- *
- * @author 科技小王子
- * @since 2023-01-12 15:34:55
- */
-@Service
-public class HualalaFoodServiceImpl extends ServiceImpl<HualalaFoodMapper, HualalaFood> implements HualalaFoodService {
-
-    @Override
-    public PageResult<HualalaFood> pageRel(HualalaFoodParam param) {
-        PageParam<HualalaFood, HualalaFoodParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaFood> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaFood> listRel(HualalaFoodParam param) {
-        List<HualalaFood> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaFood, HualalaFoodParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public HualalaFood getByIdRel(Integer id) {
-        HualalaFoodParam param = new HualalaFoodParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public HualalaFood getByFoodId(Integer foodId) {
-      return query().like("foodId", foodId).one();
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java
deleted file mode 100644
index 6150635..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaServiceImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.entity.Hualala;
-import com.gxwebsoft.apps.entity.HualalaFoodCategory;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.mapper.HualalaMapper;
-import com.gxwebsoft.apps.param.HualalaShopParam;
-import com.gxwebsoft.apps.service.HualalaService;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.mapper.OrderGoodsMapper;
-import com.gxwebsoft.shop.param.MerchantParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import lombok.SneakyThrows;
-import lombok.val;
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.data.geo.*;
-import org.springframework.data.redis.connection.RedisGeoCommands;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.apps.constants.HualalaConstants.*;
-import static com.gxwebsoft.apps.constants.SfExpressConstants.*;
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY;
-
-/**
- * 哗啦啦Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Service
-public class HualalaServiceImpl extends ServiceImpl<HualalaMapper, Hualala> implements HualalaService {
-  @Resource
-  private OrderGoodsMapper orderGoodsMapper;
-
-  @Override
-  public JSONObject doPost(String url, Map<String, Object> requestBody) {
-    // 当前时间戳
-    Long timestamp = System.currentTimeMillis();
-    // 店铺ID
-    String shopId = null;
-    if(requestBody.get("shopId") != null){
-      shopId = requestBody.get("shopId").toString();
-    }
-    HashMap<String,Object> map = new HashMap<>();
-    map.put("timestamp",timestamp);
-    map.put("appKey",APP_KEY);
-    map.put("signature",getSignature(timestamp,requestBody));
-    map.put("version",VERSION);
-    map.put("requestBody", JSON.toJSONString(requestBody));
-    System.out.println("map = " + map);
-    // 执行post请求
-    String result = HttpRequest.post(API_URL.concat(url))
-      .header("traceID", UUID.randomUUID().toString())
-      .header("groupID", GROUP_ID)
-      .header("shopId",shopId)
-      .form(map)
-      .timeout(20000)
-      .execute()
-      .body();
-//    System.out.println("result0 = " + result);
-
-    // 返回数据
-    return JSON.parseObject(result);
-  }
-
-    @Override
-    public JSONObject doExpress(Order orderInfo) {
-      List<OrderGoods> orderGoods = orderGoodsMapper.selectByOrderId(orderInfo.getOrderId());
-
-      JSONObject json = new JSONObject();
-      json.put("dev_id",DEV_ID);      // 同城开发者ID
-      json.put("shop_id",SHOP_ID);    // 店铺ID
-      json.put("shop_order_id", orderInfo.getOrderNo());    // 商家订单号 不允许重复(使用相同商家订单号会幂等返回)
-      json.put("order_source","微信小程序");       // 订单接入来源 1：美团；2：饿了么；3：饿了么零售；4：口碑； 其他请直接填写中文字符串值
-      long timestamp = new Date().getTime();
-      System.out.println("timestamp = " + timestamp);
-      json.put("order_time",timestamp/1000);      // 用户下单时间
-      json.put("push_time",timestamp/1000);       // 推单时间
-      json.put("version",19);     // 版本号 19
-
-      // 收货人信息
-      JSONObject receive = new JSONObject();
-      receive.put("user_name","顺丰同城");     // 用户姓名
-      receive.put("user_phone","18978189563");// 用户电话
-      receive.put("user_address","北京市海淀区学清嘉创大厦A座15层");    // 用户地址
-      receive.put("user_lng","116.354787");   // 用户经度
-      receive.put("user_lat","40.030613");    // 用户纬度
-      json.put("receive",receive);
-
-      // 物品详情
-      ArrayList<Object> productDetail = new ArrayList<>();
-      orderGoods.forEach(goods -> {
-        JSONObject item = new JSONObject();
-        item.put("product_name",goods.getGoodsName());
-        item.put("product_id",goods.getGoodsId());
-        item.put("product_num",goods.getTotalNum());
-        item.put("product_price",goods.getTotalPrice());
-        item.put("product_unit","份");
-        item.put("item_detail","");
-        productDetail.add(item);
-      });
-
-      // 订单详情
-      JSONObject orderDetail = new JSONObject();
-      orderDetail.put("total_price",orderInfo.getTotalPrice());   // 用户订单商品总金额（单位：分）
-      orderDetail.put("product_type",21);   // 物品类型 21:中餐
-      orderDetail.put("weight_gram",0);   // 物品重量（单位：克）
-      orderDetail.put("product_num",1);     // 物品个数
-      orderDetail.put("product_type_num",1);// 物品种类个数
-      orderDetail.put("product_detail",productDetail);  // 物品详情
-      json.put("order_detail",orderDetail);
-      String postData = json.toString();
-
-      System.out.println("postData = " + postData);
-
-      String url = SERVER_HOST.concat("/open/api/external/createorder?sign=").concat(generateOpenSign(postData));
-      String result = HttpUtil.post(url, postData);
-      JSONObject jsonObject = JSON.parseObject(result);
-      return JSON.parseObject(jsonObject.getString("result"));
-    }
-
-    // 生成签名(哗啦啦)
-  private String getSignature(Long timestamp,Map<String, Object> params) {
-    // 拼接字符串
-    String sign = "";
-    params.put("groupID",GROUP_ID);
-    String concat = sign.concat(APP_KEY).concat(APP_SECRET).concat(timestamp.toString()).concat(JSON.toJSONString(params));
-//    System.out.println("签名加密前字符串为 = " + concat);
-    // md5加密
-    String md5 = DigestUtil.md5Hex(concat);
-//    System.out.println("md5加密后获得签名 = " + md5);
-    return md5;
-  }
-
-  // 生成签名(顺丰速递)
-  @SneakyThrows
-  private static String generateOpenSign(String postData) {
-    StringBuilder sb =  new StringBuilder();
-    sb.append(postData);
-    sb.append("&" + DEV_ID + "&" + DEV_KEY);
-    System.out.println("sb = " + sb);
-    MessageDigest md = MessageDigest.getInstance("MD5");
-    byte[] md5 = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8));
-    int i;
-    StringBuffer buf = new StringBuffer("");
-    for (int offset = 0; offset < md5.length; offset++) {
-      i = md5[offset];
-      if (i < 0) {
-        i += 256;
-      }
-      if (i < 16) {
-        buf.append("0");
-      }
-      buf.append(Integer.toHexString(i));
-    }
-
-    return Base64.encodeBase64String(buf.toString().getBytes(StandardCharsets.UTF_8));
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java
deleted file mode 100644
index 8295245..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/HualalaShopServiceImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.HualalaShopMapper;
-import com.gxwebsoft.apps.service.HualalaShopService;
-import com.gxwebsoft.apps.entity.HualalaShop;
-import com.gxwebsoft.apps.param.HualalaShopParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Merchant;
-import org.springframework.data.geo.*;
-import org.springframework.data.redis.connection.RedisGeoCommands;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY;
-import static com.gxwebsoft.common.core.constants.RedisConstants.haulalaGeoKey;
-
-/**
- * 哗啦啦门店管理Service实现
- *
- * @author 科技小王子
- * @since 2023-01-12 18:24:44
- */
-@Service
-public class HualalaShopServiceImpl extends ServiceImpl<HualalaShopMapper, HualalaShop> implements HualalaShopService {
-
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-
-    @Override
-    public PageResult<HualalaShop> pageRel(HualalaShopParam param) {
-        PageParam<HualalaShop, HualalaShopParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<HualalaShop> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<HualalaShop> listRel(HualalaShopParam param) {
-        List<HualalaShop> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<HualalaShop, HualalaShopParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public HualalaShop getByIdRel(Integer shopId) {
-        HualalaShopParam param = new HualalaShopParam();
-        param.setShopId(Long.valueOf(shopId));
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-
-  @Override
-  public List<HualalaShop> listByGeo(HualalaShopParam param) {
-    // 1. 是否按距离排序
-//    if (param.getMapLongitudeValueBaiDu() == null) {
-//      System.out.println("param = " + param);
-//      // 无定位信息
-//      return list();
-//    }
-//    System.out.println("param333 = " + param);
-    // 2. 查询10公里内的10家店铺
-    final Point point = new Point(Double.parseDouble(param.getMapLongitudeValueBaiDu()), Double.parseDouble(param.getMapLatitudeValueBaiDu()));
-//    System.out.println("point = " + point);
-    RedisGeoCommands.GeoRadiusCommandArgs geoRadiusCommandArgs = RedisGeoCommands.GeoRadiusCommandArgs.newGeoRadiusArgs();
-//      final Distance distance1 = new Distance(5, Metrics.KILOMETERS);
-    GeoResults<RedisGeoCommands.GeoLocation<String>> results = stringRedisTemplate.opsForGeo().radius(haulalaGeoKey, new Circle(point, 200000), geoRadiusCommandArgs.includeDistance().limit(30));
-//    System.out.println("results = " + results);
-    assert results != null;
-    final List<GeoResult<RedisGeoCommands.GeoLocation<String>>> list = results.getContent();
-    System.out.println("list.size() = " + list.size());
-    // 如查找不到店铺点位则批量写入
-    if (list.size() == 0) {
-      this.saveGeoPointToRedis();
-      return null;
-    }
-    List<String> ids = new ArrayList<>(list.size());
-    Map<String, Distance> distanceMap = new HashMap<>(list.size());
-    list.forEach(d -> {
-      // 获取店铺ID
-      String shopId = d.getContent().getName();
-      ids.add(shopId);
-      // 获取距离
-      Distance distance = d.getDistance();
-//        System.out.println("distance = " + distance);
-      distanceMap.put(shopId, distance);
-    });
-//      System.out.println("ids = " + ids);
-//      System.out.println("distanceMap = " + distanceMap);
-    final List<HualalaShop> shops = query().in("shop_id", ids).last("ORDER BY FIELD(shop_id," + StrUtil.join(",", ids) + ")").list();
-//    System.out.println("shops = " + shops);
-    for (HualalaShop shop : shops) {
-      shop.setDistance(distanceMap.get(StrUtil.toString(shop.getShopId())).getValue());
-    }
-
-    return shops;
-  }
-
-
-  /**
-   * 更新所有商户点位信息
-   */
-  @Override
-  public void saveGeoPointToRedis() {
-    // 1.查询所有商户
-    final List<HualalaShop> list = list();
-    // 2.然后按品牌分组，把品牌id一致的放到一个集合
-    final Map<Long, List<HualalaShop>> map = list.stream().collect(Collectors.groupingBy(HualalaShop::getShopId));
-    // 3.分批完成写入Redis
-    for (Map.Entry<Long, List<HualalaShop>> entry : map.entrySet()) {
-      // 3.1 获取商户的集合
-      List<HualalaShop> value = entry.getValue();
-      List<RedisGeoCommands.GeoLocation<String>> locatioins = new ArrayList<>(value.size());
-      // 3.2 写入redis GEOADD key 经度 维度 member
-      for (HualalaShop shop : value) {
-        locatioins.add(new RedisGeoCommands.GeoLocation<>(shop.getShopId().toString(), new Point(shop.getMapLongitudeValueBaiDu(), shop.getMapLatitudeValueBaiDu())));
-      }
-//        System.out.println("locatioins = " + locatioins);
-      stringRedisTemplate.opsForGeo().add(haulalaGeoKey, locatioins);
-    }
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java
deleted file mode 100644
index 7631ca6..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/LinkServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.LinkMapper;
-import com.gxwebsoft.apps.service.LinkService;
-import com.gxwebsoft.apps.entity.Link;
-import com.gxwebsoft.apps.param.LinkParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 常用链接推荐记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 12:55:33
- */
-@Service
-public class LinkServiceImpl extends ServiceImpl<LinkMapper, Link> implements LinkService {
-
-    @Override
-    public PageResult<Link> pageRel(LinkParam param) {
-        PageParam<Link, LinkParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Link> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Link> listRel(LinkParam param) {
-        List<Link> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Link, LinkParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Link getByIdRel(Integer linkId) {
-        LinkParam param = new LinkParam();
-        param.setLinkId(linkId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java
deleted file mode 100644
index 69f79a4..0000000
--- a/src/main/java/com/gxwebsoft/apps/service/impl/TestDataServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.apps.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.mapper.TestDataMapper;
-import com.gxwebsoft.apps.service.TestDataService;
-import com.gxwebsoft.apps.entity.TestData;
-import com.gxwebsoft.apps.param.TestDataParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 测试数据表Service实现
- *
- * @author 科技小王子
- * @since 2023-02-01 12:13:46
- */
-@Service
-public class TestDataServiceImpl extends ServiceImpl<TestDataMapper, TestData> implements TestDataService {
-
-    @Override
-    public PageResult<TestData> pageRel(TestDataParam param) {
-        PageParam<TestData, TestDataParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TestData> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TestData> listRel(TestDataParam param) {
-        List<TestData> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TestData, TestDataParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TestData getByIdRel(Integer id) {
-        TestDataParam param = new TestDataParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java b/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java
deleted file mode 100644
index 1eb1d3b..0000000
--- a/src/main/java/com/gxwebsoft/apps/utils/BcUtil.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.gxwebsoft.apps.utils;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * 报餐系统工具类
- * @author 科技小王子
- *
- */
-@Component
-public class BcUtil {
-  private final StringRedisTemplate stringRedisTemplate;
-  public Integer categoryId;
-  public Integer tenantId;
-
-  public BcUtil(StringRedisTemplate stringRedisTemplate){
-    this.stringRedisTemplate = stringRedisTemplate;
-  }
-
-  // 判断当前餐段
-  public Integer getCurrentPeriod(Integer tenantId) {
-    // 今天开始时间 2023-05-01 00:00:00
-    DateTime parse = DateUtil.parse(DateUtil.today());
-    // 早餐开始时间 2023-05-01 07:00:00
-    DateTime breakfastStart = DateUtil.offsetMinute(parse, 7*60);
-    // 早餐截止时间 2023-05-01 07:55:00
-    DateTime breakfastEnd = DateUtil.offsetMinute(parse, 7*60 + 55);
-    // 午餐开始时间 2023-05-01 13:00:00
-    DateTime lunchStart = DateUtil.offsetMinute(parse, 11*60 + 50);
-    // 午餐截止时间 2023-05-01 13:00:00
-    DateTime lunchEnd = DateUtil.offsetMinute(parse, 13*60);
-    // 晚餐截止时间 2023-05-01 19:30:00
-    DateTime dinnerStart = DateUtil.offsetMinute(parse, 17*60 + 30);
-    // 晚餐截止时间 2023-05-01 19:30:00
-    DateTime dinnerEnd = DateUtil.offsetMinute(parse, 19*60 + 30);
-
-    // 读取后台配置
-//    String key = "cache" + tenantId + ":setting:BaoCan";
-//    System.out.println("读取后台配置 = " + key);
-//    final String cache = stringRedisTemplate.opsForValue().get(key);
-//    if(cache != null){
-//      DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-//      final JSONObject jsonObject = JSONObject.parseObject(cache);
-//      System.out.println("jsonObject = " + jsonObject);
-//      final String breakfastStartTime = jsonObject.getString("breakfastStartTime");
-//      final String breakfastEndTime = jsonObject.getString("breakfastEndTime");
-//      final String lunchStartTime = jsonObject.getString("lunchStartTime");
-//      final String lunchEndTime = jsonObject.getString("lunchEndTime");
-//      final String dinnerStartTime = jsonObject.getString("dinnerStartTime");
-//      final String dinnerEndTime = jsonObject.getString("dinnerEndTime");
-//      breakfastStart = DateUtil.parse(DateUtil.format(DateUtil.parse(breakfastStartTime), df));
-//      breakfastEnd = DateUtil.parse(DateUtil.format(DateUtil.parse(breakfastEndTime), df));
-//      lunchStart = DateUtil.parse(DateUtil.format(DateUtil.parse(lunchStartTime), df));
-//      lunchEnd = DateUtil.parse(DateUtil.format(DateUtil.parse(lunchEndTime), df));
-//      dinnerStart = DateUtil.parse(DateUtil.format(DateUtil.parse(dinnerStartTime), df));
-//      dinnerEnd = DateUtil.parse(DateUtil.format(DateUtil.parse(dinnerEndTime), df));
-//
-//      System.out.println("breakfastStart = " + breakfastStart);
-//      System.out.println("breakfastEndTime = " + breakfastEndTime);
-//      System.out.println("lunchStartTime = " + lunchStartTime);
-//      System.out.println("lunchEndTime = " + lunchEndTime);
-//      System.out.println("dinnerStartTime = " + dinnerStartTime);
-//      System.out.println("dinnerEndTime = " + dinnerEndTime);
-//
-//    }
-
-    // 早餐时间段
-    if(DateUtil.date().compareTo(breakfastStart) > 0 && DateUtil.date().compareTo(breakfastEnd) < 0){
-      System.out.println("早餐时间段 = ");
-      this.categoryId = 25;
-      return 25;
-    }
-    // 午餐时间段
-    if(DateUtil.date().compareTo(lunchStart) > 0 && DateUtil.date().compareTo(lunchEnd) < 0){
-      System.out.println("午餐时间段 = ");
-      this.categoryId = 26;
-      return 26;
-    }
-    // 晚餐时间段
-    if(DateUtil.date().compareTo(dinnerStart) > 0 && DateUtil.date().compareTo(dinnerEnd) < 0){
-      System.out.println("晚餐时间段 = ");
-      this.categoryId = 27;
-      return 27;
-    }
-    return 0;
-  }
-
-  // 发送消息提醒
-  public void send(String content) {
-    // 1.获取access_token
-    String key = "cache10048:ww:access_token";
-    String access_token = stringRedisTemplate.opsForValue().get(key);
-    System.out.println("access_token = " + access_token);
-    String url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=" + access_token;
-    final ArrayList<String> toUsers = new ArrayList<>();
-    toUsers.add("ZhaiLing");
-    toUsers.add("LiangYun");
-    toUsers.add("zhaozhonglin");
-    final HashMap<String, Object> map = new HashMap<>();
-    map.put("msgtype","text");
-    map.put("agentid","wxa040285bc1c223ae");
-//    map.put("toall",1);
-    map.put("touser",toUsers);
-    final HashMap<Object, Object> text = new HashMap<>();
-    text.put("content",content);
-    map.put("text",text);
-    System.out.println("发送消息提醒 = " + JSONObject.toJSONString(map));
-    final String post = HttpUtil.post(url, JSONObject.toJSONString(map));
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/cms/controller/AdController.java b/src/main/java/com/gxwebsoft/cms/controller/AdController.java
new file mode 100644
index 0000000..0d649f8
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/controller/AdController.java
@@ -0,0 +1,129 @@
+package com.gxwebsoft.cms.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.AdService;
+import com.gxwebsoft.cms.entity.Ad;
+import com.gxwebsoft.cms.param.AdParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 广告位管理表控制器
+ *
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
+ */
+@Api(tags = "广告位管理表管理")
+@RestController
+@RequestMapping("/api/cms/ad")
+public class AdController extends BaseController {
+    @Resource
+    private AdService adService;
+
+    @PreAuthorize("hasAuthority('cms:ad:list')")
+    @ApiOperation("分页查询广告位管理表")
+    @GetMapping("/page")
+    public ApiResult<PageResult<Ad>> page(AdParam param) {
+        PageParam<Ad, AdParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(adService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(adService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:list')")
+    @ApiOperation("查询全部广告位管理表")
+    @GetMapping()
+    public ApiResult<List<Ad>> list(AdParam param) {
+        PageParam<Ad, AdParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(adService.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(adService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:list')")
+    @ApiOperation("根据id查询广告位管理表")
+    @GetMapping("/{id}")
+    public ApiResult<Ad> get(@PathVariable("id") Integer id) {
+        return success(adService.getById(id));
+        // 使用关联查询
+        //return success(adService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:save')")
+    @ApiOperation("添加广告位管理表")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody Ad ad) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          ad.setUserId(loginUser.getUserId());
+        }
+        if (adService.save(ad)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:update')")
+    @ApiOperation("修改广告位管理表")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody Ad ad) {
+        if (adService.updateById(ad)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:remove')")
+    @ApiOperation("删除广告位管理表")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (adService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:save')")
+    @ApiOperation("批量添加广告位管理表")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<Ad> list) {
+        if (adService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:update')")
+    @ApiOperation("批量修改广告位管理表")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<Ad> batchParam) {
+        if (batchParam.update(adService, "ad_id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:ad:remove')")
+    @ApiOperation("批量删除广告位管理表")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (adService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java
index 5bb37b6..32f9f7a 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCategoryController.java
@@ -22,7 +22,7 @@ import java.util.List;
  * 文章分类表控制器
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 @Api(tags = "文章分类表管理")
 @RestController
@@ -31,23 +31,23 @@ public class ArticleCategoryController extends BaseController {
     @Resource
     private ArticleCategoryService articleCategoryService;
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:list')")
     @ApiOperation("分页查询文章分类表")
     @GetMapping("/page")
     public ApiResult<PageResult<ArticleCategory>> page(ArticleCategoryParam param) {
         PageParam<ArticleCategory, ArticleCategoryParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-        page.setDefaultOrder("sort_number");
+        page.setDefaultOrder("create_time desc");
         return success(articleCategoryService.page(page, page.getWrapper()));
         // 使用关联查询
         //return success(articleCategoryService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:list')")
     @ApiOperation("查询全部文章分类表")
     @GetMapping()
     public ApiResult<List<ArticleCategory>> list(ArticleCategoryParam param) {
         PageParam<ArticleCategory, ArticleCategoryParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-        page.setDefaultOrder("sort_number");
+        page.setDefaultOrder("create_time desc");
         return success(articleCategoryService.list(page.getOrderWrapper()));
         // 使用关联查询
         //return success(articleCategoryService.listRel(param));
@@ -62,10 +62,11 @@ public class ArticleCategoryController extends BaseController {
         //return success(articleCategoryService.getByIdRel(id));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:save')")
     @ApiOperation("添加文章分类表")
     @PostMapping()
     public ApiResult<?> save(@RequestBody ArticleCategory articleCategory) {
-        // 记录当前登录用户id、租户id
+        // 记录当前登录用户id
         User loginUser = getLoginUser();
         if (loginUser != null) {
           articleCategory.setUserId(loginUser.getUserId());
@@ -76,6 +77,7 @@ public class ArticleCategoryController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:update')")
     @ApiOperation("修改文章分类表")
     @PutMapping()
     public ApiResult<?> update(@RequestBody ArticleCategory articleCategory) {
@@ -85,6 +87,7 @@ public class ArticleCategoryController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:remove')")
     @ApiOperation("删除文章分类表")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -94,6 +97,7 @@ public class ArticleCategoryController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:save')")
     @ApiOperation("批量添加文章分类表")
     @PostMapping("/batch")
     public ApiResult<?> saveBatch(@RequestBody List<ArticleCategory> list) {
@@ -103,6 +107,7 @@ public class ArticleCategoryController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:update')")
     @ApiOperation("批量修改文章分类表")
     @PutMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody BatchParam<ArticleCategory> batchParam) {
@@ -112,6 +117,7 @@ public class ArticleCategoryController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleCategory:remove')")
     @ApiOperation("批量删除文章分类表")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
index 09e8cd4..4eb0873 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
@@ -1,18 +1,15 @@
 package com.gxwebsoft.cms.controller;
 
-import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.ArticleCommentService;
 import com.gxwebsoft.cms.entity.ArticleComment;
 import com.gxwebsoft.cms.param.ArticleCommentParam;
-import com.gxwebsoft.cms.param.ArticleParam;
-import com.gxwebsoft.cms.service.ArticleCommentService;
-import com.gxwebsoft.cms.service.ArticleService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,7 +22,7 @@ import java.util.List;
  * 文章评论表控制器
  *
  * @author 科技小王子
- * @since 2023-07-07 14:14:35
+ * @since 2023-10-22 15:47:09
  */
 @Api(tags = "文章评论表管理")
 @RestController
@@ -33,52 +30,39 @@ import java.util.List;
 public class ArticleCommentController extends BaseController {
     @Resource
     private ArticleCommentService articleCommentService;
-    @Resource
-    private ArticleService articleService;
-
-  @Resource
-  private ClientCache clientCache;
-
-
-    @ApiOperation("获取未读评论数")
-    @GetMapping("/unread")
-    public ApiResult<Integer> page() {
-        User loginUser = getLoginUser();
-        return success(articleCommentService.getUserUnReadCount(loginUser.getUserId()));
-    }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:list')")
     @ApiOperation("分页查询文章评论表")
     @GetMapping("/page")
     public ApiResult<PageResult<ArticleComment>> page(ArticleCommentParam param) {
-        User loginUser = getLoginUser();
+        PageParam<ArticleComment, ArticleCommentParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(articleCommentService.page(page, page.getWrapper()));
         // 使用关联查询
-        if(loginUser != null){
-          param.setLoginUserId(getLoginUserId());
-        }
-        // 使用关联查询
-        return success(articleCommentService.pageRel(param));
+        //return success(articleCommentService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:list')")
     @ApiOperation("查询全部文章评论表")
     @GetMapping()
     public ApiResult<List<ArticleComment>> list(ArticleCommentParam param) {
+        PageParam<ArticleComment, ArticleCommentParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(articleCommentService.list(page.getOrderWrapper()));
         // 使用关联查询
-        return success(articleCommentService.listRel(param));
+        //return success(articleCommentService.listRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:list')")
     @ApiOperation("根据id查询文章评论表")
     @GetMapping("/{id}")
-    public ApiResult<PageResult<Article>> get(@PathVariable("id") Integer id) {
-        final ArticleComment comment = articleCommentService.getByIdRel(id);
-        // 查询文章
-        ArticleParam param = new ArticleParam();
-        param.setArticleId(comment.getArticleId());
-        comment.setStatus(1);
-        articleCommentService.updateById(comment);
-        final PageResult<Article> result = articleService.pageRel(param);
-        return success(result);
+    public ApiResult<ArticleComment> get(@PathVariable("id") Integer id) {
+        return success(articleCommentService.getById(id));
+        // 使用关联查询
+        //return success(articleCommentService.getByIdRel(id));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:save')")
     @ApiOperation("添加文章评论表")
     @PostMapping()
     public ApiResult<?> save(@RequestBody ArticleComment articleComment) {
@@ -88,20 +72,12 @@ public class ArticleCommentController extends BaseController {
           articleComment.setUserId(loginUser.getUserId());
         }
         if (articleCommentService.save(articleComment)) {
-            // 累加文章评论数量
-          final Article article = articleService.getById(articleComment.getArticleId());
-          article.setCommentNumbers(articleComment.getCountComment() + 1);
-          articleService.updateById(article);
-          // 获取未读评论数
-            int count = articleCommentService.getUserUnReadCount(articleComment.getToUserId());
-            if(!articleComment.getUserId().equals(articleComment.getToUserId())){
-                clientCache.sendUserEvent(articleComment.getToUserId() + "", "pyq", count);
-            }
-          return success("发表成功",article);
+            return success("添加成功");
         }
-        return fail("发表失败");
+        return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:update')")
     @ApiOperation("修改文章评论表")
     @PutMapping()
     public ApiResult<?> update(@RequestBody ArticleComment articleComment) {
@@ -111,6 +87,7 @@ public class ArticleCommentController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:remove')")
     @ApiOperation("删除文章评论表")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -120,6 +97,7 @@ public class ArticleCommentController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:save')")
     @ApiOperation("批量添加文章评论表")
     @PostMapping("/batch")
     public ApiResult<?> saveBatch(@RequestBody List<ArticleComment> list) {
@@ -129,6 +107,7 @@ public class ArticleCommentController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:update')")
     @ApiOperation("批量修改文章评论表")
     @PutMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody BatchParam<ArticleComment> batchParam) {
@@ -138,6 +117,7 @@ public class ArticleCommentController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleComment:remove')")
     @ApiOperation("批量删除文章评论表")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
index 808a347..8ab8543 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
@@ -1,13 +1,14 @@
 package com.gxwebsoft.cms.controller;
 
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.ArticleService;
 import com.gxwebsoft.cms.entity.Article;
 import com.gxwebsoft.cms.param.ArticleParam;
-import com.gxwebsoft.cms.service.ArticleService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,8 @@ import java.util.List;
 /**
  * 文章记录表控制器
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 @Api(tags = "文章记录表管理")
 @RestController
@@ -30,44 +31,44 @@ public class ArticleController extends BaseController {
     @Resource
     private ArticleService articleService;
 
+    @PreAuthorize("hasAuthority('cms:article:list')")
     @ApiOperation("分页查询文章记录表")
     @GetMapping("/page")
     public ApiResult<PageResult<Article>> page(ArticleParam param) {
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          param.setLoginUserId(loginUser.getUserId());
-          // 按用户所在城市查询
-          if (param.getScene() != null && param.getScene().equals("intraCity")) {
-            param.setCity(loginUser.getCity());
-          }
-        }
-        return success(articleService.pageRel(param));
+        PageParam<Article, ArticleParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(articleService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(articleService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:article:list')")
     @ApiOperation("查询全部文章记录表")
     @GetMapping()
     public ApiResult<List<Article>> list(ArticleParam param) {
+        PageParam<Article, ArticleParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(articleService.list(page.getOrderWrapper()));
         // 使用关联查询
-        return success(articleService.listRel(param));
+        //return success(articleService.listRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:article:list')")
     @ApiOperation("根据id查询文章记录表")
     @GetMapping("/{id}")
     public ApiResult<Article> get(@PathVariable("id") Integer id) {
+        return success(articleService.getById(id));
         // 使用关联查询
-        Article article = articleService.getByIdRel(id);
-        article.setArticleId(id);
-        article.setVirtualViews(article.getVirtualViews()+1);
-        articleService.saveOrUpdate(article);
-        return success(article);
+        //return success(articleService.getByIdRel(id));
     }
 
+    @PreAuthorize("hasAuthority('cms:article:save')")
     @ApiOperation("添加文章记录表")
     @PostMapping()
     public ApiResult<?> save(@RequestBody Article article) {
-        // 记录当前登录用户id、租户id
+        // 记录当前登录用户id
         User loginUser = getLoginUser();
-        if (loginUser != null && article.getUserId() == null) {
+        if (loginUser != null) {
           article.setUserId(loginUser.getUserId());
         }
         if (articleService.save(article)) {
@@ -86,6 +87,7 @@ public class ArticleController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:article:remove')")
     @ApiOperation("删除文章记录表")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -95,6 +97,7 @@ public class ArticleController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:article:save')")
     @ApiOperation("批量添加文章记录表")
     @PostMapping("/batch")
     public ApiResult<?> saveBatch(@RequestBody List<Article> list) {
@@ -104,6 +107,7 @@ public class ArticleController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:article:update')")
     @ApiOperation("批量修改文章记录表")
     @PutMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody BatchParam<Article> batchParam) {
@@ -113,6 +117,7 @@ public class ArticleController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:article:remove')")
     @ApiOperation("批量删除文章记录表")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java
index a8a2be7..c85c860 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java
@@ -1,16 +1,14 @@
 package com.gxwebsoft.cms.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.ArticleLikeService;
 import com.gxwebsoft.cms.entity.ArticleLike;
 import com.gxwebsoft.cms.param.ArticleLikeParam;
-import com.gxwebsoft.cms.service.ArticleLikeService;
-import com.gxwebsoft.cms.service.ArticleService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,7 +22,7 @@ import java.util.List;
  * 点赞文章控制器
  *
  * @author 科技小王子
- * @since 2023-07-07 13:00:03
+ * @since 2023-10-22 15:47:09
  */
 @Api(tags = "点赞文章管理")
 @RestController
@@ -32,72 +30,54 @@ import java.util.List;
 public class ArticleLikeController extends BaseController {
     @Resource
     private ArticleLikeService articleLikeService;
-    @Resource
-    private ArticleService articleService;
 
+    @PreAuthorize("hasAuthority('cms:articleLike:list')")
     @ApiOperation("分页查询点赞文章")
     @GetMapping("/page")
     public ApiResult<PageResult<ArticleLike>> page(ArticleLikeParam param) {
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          param.setUserId(loginUser.getUserId());
-        }
-        return success(articleLikeService.pageRel(param));
+        PageParam<ArticleLike, ArticleLikeParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(articleLikeService.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(articleLikeService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:list')")
     @ApiOperation("查询全部点赞文章")
     @GetMapping()
     public ApiResult<List<ArticleLike>> list(ArticleLikeParam param) {
+        PageParam<ArticleLike, ArticleLikeParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(articleLikeService.list(page.getOrderWrapper()));
         // 使用关联查询
-        return success(articleLikeService.listRel(param));
+        //return success(articleLikeService.listRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:list')")
     @ApiOperation("根据id查询点赞文章")
     @GetMapping("/{id}")
     public ApiResult<ArticleLike> get(@PathVariable("id") Integer id) {
+        return success(articleLikeService.getById(id));
         // 使用关联查询
-        return success(articleLikeService.getByIdRel(id));
+        //return success(articleLikeService.getByIdRel(id));
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:save')")
     @ApiOperation("添加点赞文章")
     @PostMapping()
     public ApiResult<?> save(@RequestBody ArticleLike articleLike) {
         // 记录当前登录用户id
         User loginUser = getLoginUser();
-        if (loginUser == null) {
-            return fail("请先登录",null);
+        if (loginUser != null) {
+          articleLike.setUserId(loginUser.getUserId());
         }
-        // 获取文章
-        Article article = articleService.getById(articleLike.getArticleId());
-        // 我是否已点赞
-        ArticleLike one = articleLikeService.getOne(new LambdaQueryWrapper<ArticleLike>()
-                .eq(ArticleLike::getArticleId, articleLike.getArticleId())
-                .eq(ArticleLike::getUserId, loginUser.getUserId()));
-
-        articleLike.setUserId(loginUser.getUserId());
-
-        if (!articleLike.getLiked() && one == null) {
-            // 点赞行为
-            articleLikeService.save(articleLike);
-            // 更新点赞数量
-            article.setLikes(article.getLikes() + 1);
-            article.setLiked(true);
-            articleService.updateById(article);
-            return success("点赞成功",article);
-        }else if(articleLike.getLiked() && one != null) {
-            // 取消点赞
-            articleLikeService.removeById(one.getId());
-            // 更新点赞数量
-            article.setLikes(article.getLikes() - 1);
-            article.setLiked(false);
-            articleService.updateById(article);
-            return success("已取消点赞",article);
-        }else {
-            article.setLiked(!articleLike.getLiked());
-            return success("操作失败",article);
+        if (articleLikeService.save(articleLike)) {
+            return success("添加成功");
         }
+        return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:update')")
     @ApiOperation("修改点赞文章")
     @PutMapping()
     public ApiResult<?> update(@RequestBody ArticleLike articleLike) {
@@ -107,6 +87,7 @@ public class ArticleLikeController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:remove')")
     @ApiOperation("删除点赞文章")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -116,6 +97,7 @@ public class ArticleLikeController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:save')")
     @ApiOperation("批量添加点赞文章")
     @PostMapping("/batch")
     public ApiResult<?> saveBatch(@RequestBody List<ArticleLike> list) {
@@ -125,6 +107,7 @@ public class ArticleLikeController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:update')")
     @ApiOperation("批量修改点赞文章")
     @PutMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody BatchParam<ArticleLike> batchParam) {
@@ -134,6 +117,7 @@ public class ArticleLikeController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:articleLike:remove')")
     @ApiOperation("批量删除点赞文章")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java
index 3575424..7d55884 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java
@@ -22,7 +22,7 @@ import java.util.List;
  * 文档管理记录表控制器
  *
  * @author 科技小王子
- * @since 2022-11-16 11:40:27
+ * @since 2023-10-22 15:47:09
  */
 @Api(tags = "文档管理记录表管理")
 @RestController
@@ -31,26 +31,29 @@ public class DocsController extends BaseController {
     @Resource
     private DocsService docsService;
 
+    @PreAuthorize("hasAuthority('cms:docs:list')")
     @ApiOperation("分页查询文档管理记录表")
     @GetMapping("/page")
     public ApiResult<PageResult<Docs>> page(DocsParam param) {
         PageParam<Docs, DocsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc,create_time asc");
+        page.setDefaultOrder("create_time desc");
         return success(docsService.page(page, page.getWrapper()));
         // 使用关联查询
-//        return success(docsService.pageRel(param));
+        //return success(docsService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:list')")
     @ApiOperation("查询全部文档管理记录表")
     @GetMapping()
     public ApiResult<List<Docs>> list(DocsParam param) {
         PageParam<Docs, DocsParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("sort_number asc,create_time asc");
-//        return success(docsService.list(page.getOrderWrapper()));
+        page.setDefaultOrder("create_time desc");
+        return success(docsService.list(page.getOrderWrapper()));
         // 使用关联查询
-        return success(docsService.listRel(param));
+        //return success(docsService.listRel(param));
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:list')")
     @ApiOperation("根据id查询文档管理记录表")
     @GetMapping("/{id}")
     public ApiResult<Docs> get(@PathVariable("id") Integer id) {
@@ -59,10 +62,11 @@ public class DocsController extends BaseController {
         //return success(docsService.getByIdRel(id));
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:save')")
     @ApiOperation("添加文档管理记录表")
     @PostMapping()
     public ApiResult<?> save(@RequestBody Docs docs) {
-        // 记录当前登录用户id、租户id
+        // 记录当前登录用户id
         User loginUser = getLoginUser();
         if (loginUser != null) {
           docs.setUserId(loginUser.getUserId());
@@ -73,15 +77,17 @@ public class DocsController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:update')")
     @ApiOperation("修改文档管理记录表")
     @PutMapping()
     public ApiResult<?> update(@RequestBody Docs docs) {
         if (docsService.updateById(docs)) {
-            return success("保存成功");
+            return success("修改成功");
         }
-        return fail("保存失败");
+        return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:remove')")
     @ApiOperation("删除文档管理记录表")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -91,6 +97,7 @@ public class DocsController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:save')")
     @ApiOperation("批量添加文档管理记录表")
     @PostMapping("/batch")
     public ApiResult<?> saveBatch(@RequestBody List<Docs> list) {
@@ -100,6 +107,7 @@ public class DocsController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:update')")
     @ApiOperation("批量修改文档管理记录表")
     @PutMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody BatchParam<Docs> batchParam) {
@@ -109,6 +117,7 @@ public class DocsController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('cms:docs:remove')")
     @ApiOperation("批量删除文档管理记录表")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java b/src/main/java/com/gxwebsoft/cms/entity/Ad.java
similarity index 55%
rename from src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java
rename to src/main/java/com/gxwebsoft/cms/entity/Ad.java
index f603ff8..1716afd 100644
--- a/src/main/java/com/gxwebsoft/love/entity/UserPlanIcon.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Ad.java
@@ -1,41 +1,46 @@
-package com.gxwebsoft.love.entity;
+package com.gxwebsoft.cms.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
- * 会员套餐权益表
+ * 广告位管理表
  *
  * @author 科技小王子
- * @since 2023-06-25 18:09:34
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserPlanIcon对象", description = "会员套餐权益表")
-@TableName("love_user_plan_icon")
-public class UserPlanIcon implements Serializable {
+@ApiModel(value = "Ad对象", description = "广告位管理表")
+@TableName("cms_ad")
+public class Ad implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ad_id", type = IdType.AUTO)
+    private Integer adId;
 
-    @ApiModelProperty(value = "套餐ID")
-    private Integer planId;
+    @ApiModelProperty(value = "广告类型")
+    private String adType;
 
-    @ApiModelProperty(value = "图标")
-    private String icon;
+    @ApiModelProperty(value = "宽")
+    private String width;
 
-    @ApiModelProperty(value = "权益")
-    private String name;
+    @ApiModelProperty(value = "高")
+    private String height;
+
+    @ApiModelProperty(value = "广告图片")
+    private String images;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
 
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     private Integer sortNumber;
@@ -50,6 +55,6 @@ public class UserPlanIcon implements Serializable {
     private Integer tenantId;
 
     @ApiModelProperty(value = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 }
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Article.java b/src/main/java/com/gxwebsoft/cms/entity/Article.java
index c8128bc..0ea6fce 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/Article.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Article.java
@@ -1,19 +1,21 @@
 package com.gxwebsoft.cms.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 文章记录表
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -53,16 +55,16 @@ public class Article implements Serializable {
     @ApiModelProperty(value = "实际阅读量")
     private Integer actualViews;
 
-    @ApiModelProperty(value = "发布来源客户端")
+    @ApiModelProperty(value = "发布来源客户端 (APP、H5、小程序等)")
     private String platform;
 
     @ApiModelProperty(value = "文章附件")
     private String files;
 
-    @ApiModelProperty(value = "视频文件地址")
+    @ApiModelProperty(value = "视频地址")
     private String video;
 
-    @ApiModelProperty(value = "上传文件类型")
+    @ApiModelProperty(value = "接受的文件类型")
     private String accept;
 
     @ApiModelProperty(value = "经度")
@@ -80,16 +82,16 @@ public class Article implements Serializable {
     @ApiModelProperty(value = "所在辖区")
     private String region;
 
-    @ApiModelProperty("文章发布地点")
+    @ApiModelProperty(value = "街道地址")
     private String address;
 
-    @ApiModelProperty("获赞数")
+    @ApiModelProperty(value = "点赞数")
     private Integer likes;
 
-    @ApiModelProperty("评论数")
+    @ApiModelProperty(value = "评论数")
     private Integer commentNumbers;
 
-    @ApiModelProperty("提醒谁看")
+    @ApiModelProperty(value = "提醒谁看")
     private String toUsers;
 
     @ApiModelProperty(value = "用户ID")
@@ -108,44 +110,13 @@ public class Article implements Serializable {
     @TableLogic
     private Integer deleted;
 
-    @ApiModelProperty(value = "商户编号")
-    private String merchantCode;
-
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 
     @ApiModelProperty(value = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String userAvatar;
-
-    @ApiModelProperty(value = "所在城市")
-    @TableField(exist = false)
-    private String userCity;
-
-    @ApiModelProperty(value = "是否关注")
-    @TableField(exist = false)
-    private Boolean follow;
-
-    @ApiModelProperty(value = "是否点赞")
-    @TableField(exist = false)
-    private Boolean liked;
-
-    @ApiModelProperty(value = "年龄")
-    @TableField(exist = false)
-    private String age;
-
-    @ApiModelProperty(value = "年龄")
-    @TableField(exist = false)
-    private String position;
+    private LocalDateTime updateTime;
 
 }
diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java
index d53ff6e..8cb7be1 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleCategory.java
@@ -1,22 +1,21 @@
 package com.gxwebsoft.cms.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 文章分类表
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,7 +31,7 @@ public class ArticleCategory implements Serializable {
     @ApiModelProperty(value = "分类名称")
     private String title;
 
-    @ApiModelProperty(value = "分类索引图")
+    @ApiModelProperty(value = "分类图片")
     private String image;
 
     @ApiModelProperty(value = "上级分类ID")
@@ -47,6 +46,9 @@ public class ArticleCategory implements Serializable {
     @ApiModelProperty(value = "备注")
     private String comments;
 
+    @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+    private Integer hide;
+
     @ApiModelProperty(value = "状态, 0正常, 1禁用")
     private Integer status;
 
@@ -54,16 +56,13 @@ public class ArticleCategory implements Serializable {
     @TableLogic
     private Integer deleted;
 
-    @ApiModelProperty(value = "商户编号")
-    private String merchantCode;
-
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 
     @ApiModelProperty(value = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }
diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
index 3de83b0..a124a12 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
@@ -1,20 +1,21 @@
 package com.gxwebsoft.cms.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 /**
  * 文章评论表
  *
  * @author 科技小王子
- * @since 2023-07-07 14:14:35
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,6 +28,9 @@ public class ArticleComment implements Serializable {
     @TableId(value = "comment_id", type = IdType.AUTO)
     private Integer commentId;
 
+    @ApiModelProperty(value = "文章ID")
+    private Integer articleId;
+
     @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
     private Integer score;
 
@@ -36,116 +40,38 @@ public class ArticleComment implements Serializable {
     @ApiModelProperty(value = "是否为图片评价")
     private Integer isPicture;
 
-    @ApiModelProperty(value = "用户ID")
+    @ApiModelProperty(value = "评论者ID")
     private Integer userId;
 
+    @ApiModelProperty(value = "被评价者ID")
+    private Integer toUserId;
+
     @ApiModelProperty(value = "回复的评论ID")
     private Integer replyCommentId;
 
     @ApiModelProperty(value = "回复者ID")
     private Integer replyUserId;
 
-    @ApiModelProperty(value = "被评论者ID")
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "文章ID")
-    private Integer articleId;
-
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     private Integer sortNumber;
 
     @ApiModelProperty(value = "备注")
     private String comments;
 
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
+    @ApiModelProperty(value = "状态, 0未读, 1已读")
     private Integer status;
 
     @ApiModelProperty(value = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;
 
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 
     @ApiModelProperty(value = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "评论者昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "评论者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "评论条数")
-    @TableField(exist = false)
-    private Integer countComment;
-
-    @ApiModelProperty(value = "评论者粉丝数")
-    @TableField(exist = false)
-    private Integer fans;
-
-    @ApiModelProperty(value = "是否已点赞")
-    @TableField(exist = false)
-    private Integer liked;
-
-    @ApiModelProperty(value = "评论者获赞数")
-    @TableField(exist = false)
-    private Boolean likes;
-
-    @ApiModelProperty(value = "评论者所在省份")
-    @TableField(exist = false)
-    private String province;
-
-    @ApiModelProperty(value = "评论者所在城市")
-    @TableField(exist = false)
-    private String city;
-
-    @ApiModelProperty(value = "被评论者昵称")
-    @TableField(exist = false)
-    private String toUserNickname;
-
-    @ApiModelProperty(value = "被评论者头像")
-    @TableField(exist = false)
-    private String toUserAvatar;
-
-    @ApiModelProperty(value = "被评论者粉丝数")
-    @TableField(exist = false)
-    private Integer toUserFans;
-
-    @ApiModelProperty(value = "被评论者所在省份")
-    @TableField(exist = false)
-    private String toUserProvince;
-
-    @ApiModelProperty(value = "被评论者所在城市")
-    @TableField(exist = false)
-    private String toUserCity;
-
-    @ApiModelProperty(value = "被评论者获赞数")
-    @TableField(exist = false)
-    private Integer toUserLikes;
-
-    @ApiModelProperty(value = "回复者昵称")
-    @TableField(exist = false)
-    private String replyNickname;
-
-    @ApiModelProperty(value = "回复者头像")
-    @TableField(exist = false)
-    private String replyAvatar;
-
-    @ApiModelProperty(value = "回复者粉丝数")
-    @TableField(exist = false)
-    private Integer replyFans;
-
-    @ApiModelProperty(value = "子评论列表")
-    @TableField(exist = false)
-    private List<ArticleComment> children;
+    private LocalDateTime updateTime;
 
 }
diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java
index 3ffdecd..0426b58 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleLike.java
@@ -1,22 +1,20 @@
 package com.gxwebsoft.cms.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 点赞文章
  *
  * @author 科技小王子
- * @since 2023-07-07 13:00:03
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -39,14 +37,6 @@ public class ArticleLike implements Serializable {
     private Integer tenantId;
 
     @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "是否已点赞")
-    @TableField(exist = false)
-    private Boolean liked;
-
-    @ApiModelProperty(value = "文章点赞数量")
-    @TableField(exist = false)
-    private Integer likes;
+    private LocalDateTime createTime;
 
 }
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Docs.java b/src/main/java/com/gxwebsoft/cms/entity/Docs.java
index a4128ce..d040d87 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/Docs.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Docs.java
@@ -1,22 +1,21 @@
 package com.gxwebsoft.cms.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 文档管理记录表
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -64,9 +63,9 @@ public class Docs implements Serializable {
     private Integer tenantId;
 
     @ApiModelProperty(value = "注册时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
 }
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/AdMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/AdMapper.java
new file mode 100644
index 0000000..6391b5d
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/mapper/AdMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.cms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.cms.entity.Ad;
+import com.gxwebsoft.cms.param.AdParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 广告位管理表Mapper
+ *
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
+ */
+public interface AdMapper extends BaseMapper<Ad> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<Ad>
+     */
+    List<Ad> selectPageRel(@Param("page") IPage<Ad> page,
+                             @Param("param") AdParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<Ad> selectListRel(@Param("param") AdParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java
index 622c604..7c720bd 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java
+++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCategoryMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 文章分类表Mapper
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleCategoryMapper extends BaseMapper<ArticleCategory> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java
index c105b04..3c490b2 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java
+++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCommentMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 文章评论表Mapper
  *
  * @author 科技小王子
- * @since 2023-07-07 14:14:35
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleCommentMapper extends BaseMapper<ArticleComment> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java
index e59c77a..3c9a0f4 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java
+++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleLikeMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 点赞文章Mapper
  *
  * @author 科技小王子
- * @since 2023-07-07 13:00:03
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleLikeMapper extends BaseMapper<ArticleLike> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java
index a8130a8..3e9b199 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java
+++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleMapper.java
@@ -9,10 +9,10 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * 文章分类表Mapper
+ * 文章记录表Mapper
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleMapper extends BaseMapper<Article> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java
index 9cfed79..65167f8 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java
+++ b/src/main/java/com/gxwebsoft/cms/mapper/DocsMapper.java
@@ -11,8 +11,8 @@ import java.util.List;
 /**
  * 文档管理记录表Mapper
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 public interface DocsMapper extends BaseMapper<Docs> {
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/AdMapper.xml
similarity index 60%
rename from src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml
rename to src/main/java/com/gxwebsoft/cms/mapper/xml/AdMapper.xml
index 5f0bd18..a1fecff 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/CartMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/AdMapper.xml
@@ -1,26 +1,26 @@
 <?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="com.gxwebsoft.shop.mapper.CartMapper">
+<mapper namespace="com.gxwebsoft.cms.mapper.AdMapper">
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*
-        FROM shop_cart a
+        FROM cms_ad a
         <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
+            <if test="param.adId != null">
+                AND a.ad_id = #{param.adId}
             </if>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
+            <if test="param.adType != null">
+                AND a.ad_type LIKE CONCAT('%', #{param.adType}, '%')
             </if>
-            <if test="param.goodsSkuId != null">
-                AND a.goods_sku_id LIKE CONCAT('%', #{param.goodsSkuId}, '%')
+            <if test="param.width != null">
+                AND a.width LIKE CONCAT('%', #{param.width}, '%')
             </if>
-            <if test="param.goodsNum != null">
-                AND a.goods_num = #{param.goodsNum}
+            <if test="param.height != null">
+                AND a.height LIKE CONCAT('%', #{param.height}, '%')
             </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
+            <if test="param.images != null">
+                AND a.images LIKE CONCAT('%', #{param.images}, '%')
             </if>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
@@ -31,11 +31,8 @@
             <if test="param.comments != null">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
             </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
+            <if test="param.status != null">
+                AND a.status = #{param.status}
             </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
@@ -47,12 +44,12 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Cart">
+    <select id="selectPageRel" resultType="com.gxwebsoft.cms.entity.Ad">
         <include refid="selectSql"></include>
     </select>
 
     <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Cart">
+    <select id="selectListRel" resultType="com.gxwebsoft.cms.entity.Ad">
         <include refid="selectSql"></include>
     </select>
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml
index 59922bd..3fc32f4 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCategoryMapper.xml
@@ -28,6 +28,9 @@
             <if test="param.comments != null">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
             </if>
+            <if test="param.hide != null">
+                AND a.hide = #{param.hide}
+            </if>
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml
index 9506e9b..d5daace 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCommentMapper.xml
@@ -4,18 +4,15 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,
-              b.nickname as toUserNickname, b.avatar as toUserAvatar,b.fans as toUserFans,b.province as toUserProvince,b.city as toUserCity,b.likes as toUserLikes,
-              c.nickname,c.avatar,c.fans,c.province,c.city,c.likes,
-              d.nickname as replyNickname,d.avatar as replyAvatar,d.fans as replyFans
+        SELECT a.*
         FROM cms_article_comment a
-            LEFT JOIN sys_user b ON a.to_user_id = b.user_id
-            LEFT JOIN sys_user c ON a.user_id = c.user_id
-            LEFT JOIN sys_user d ON a.reply_user_id = d.user_id
         <where>
             <if test="param.commentId != null">
                 AND a.comment_id = #{param.commentId}
             </if>
+            <if test="param.articleId != null">
+                AND a.article_id = #{param.articleId}
+            </if>
             <if test="param.score != null">
                 AND a.score = #{param.score}
             </if>
@@ -29,10 +26,13 @@
                 AND a.user_id = #{param.userId}
             </if>
             <if test="param.toUserId != null">
-              AND a.to_user_id = #{param.toUserId}
+                AND a.to_user_id = #{param.toUserId}
             </if>
-            <if test="param.articleId != null">
-                AND a.article_id = #{param.articleId}
+            <if test="param.replyCommentId != null">
+                AND a.reply_comment_id = #{param.replyCommentId}
+            </if>
+            <if test="param.replyUserId != null">
+                AND a.reply_user_id = #{param.replyUserId}
             </if>
             <if test="param.sortNumber != null">
                 AND a.sort_number = #{param.sortNumber}
@@ -49,19 +49,12 @@
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
-            <!-- 查询未读评论 -->
-            <if test="param.sceneType == 'UN_READ_COMMENT'">
-              AND (a.to_user_id = #{param.loginUserId})
-            </if>
         </where>
     </sql>
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml
index 6255f0d..54eea69 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml
@@ -4,13 +4,8 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,
-        b.nickname,b.user_id,b.avatar userAvatar,b.city as userCity,
-        b.age,
-        c.position
+        SELECT a.*
         FROM cms_article a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN love_user_profile c ON a.user_id = c.user_id
         <where>
             <if test="param.articleId != null">
                 AND a.article_id = #{param.articleId}
@@ -21,6 +16,9 @@
             <if test="param.showType != null">
                 AND a.show_type = #{param.showType}
             </if>
+            <if test="param.topic != null">
+                AND a.topic LIKE CONCAT('%', #{param.topic}, '%')
+            </if>
             <if test="param.categoryId != null">
                 AND a.category_id = #{param.categoryId}
             </if>
@@ -39,12 +37,48 @@
             <if test="param.actualViews != null">
                 AND a.actual_views = #{param.actualViews}
             </if>
+            <if test="param.platform != null">
+                AND a.platform LIKE CONCAT('%', #{param.platform}, '%')
+            </if>
+            <if test="param.files != null">
+                AND a.files LIKE CONCAT('%', #{param.files}, '%')
+            </if>
+            <if test="param.video != null">
+                AND a.video LIKE CONCAT('%', #{param.video}, '%')
+            </if>
+            <if test="param.accept != null">
+                AND a.accept LIKE CONCAT('%', #{param.accept}, '%')
+            </if>
+            <if test="param.longitude != null">
+                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
+            </if>
+            <if test="param.latitude != null">
+                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
+            </if>
+            <if test="param.province != null">
+                AND a.province LIKE CONCAT('%', #{param.province}, '%')
+            </if>
+            <if test="param.city != null">
+                AND a.city LIKE CONCAT('%', #{param.city}, '%')
+            </if>
+            <if test="param.region != null">
+                AND a.region LIKE CONCAT('%', #{param.region}, '%')
+            </if>
+            <if test="param.address != null">
+                AND a.address LIKE CONCAT('%', #{param.address}, '%')
+            </if>
+            <if test="param.likes != null">
+                AND a.likes = #{param.likes}
+            </if>
+            <if test="param.commentNumbers != null">
+                AND a.comment_numbers = #{param.commentNumbers}
+            </if>
+            <if test="param.toUsers != null">
+                AND a.to_users LIKE CONCAT('%', #{param.toUsers}, '%')
+            </if>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
             </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
             <if test="param.sortNumber != null">
                 AND a.sort_number = #{param.sortNumber}
             </if>
@@ -54,45 +88,18 @@
             <if test="param.status != null">
                 AND a.status = #{param.status}
             </if>
-            <if test="param.topic != null">
-              AND a.topic = #{param.topic}
-            </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>
-            <if test="param.showFollow != null">
-                AND b.deleted = 0
-            </if>
             <if test="param.createTimeStart != null">
                 AND a.create_time &gt;= #{param.createTimeStart}
             </if>
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
-            <if test="param.userId != null">
-              AND b.user_id = #{param.userId}
-            </if>
-            <if test="param.nickname != null">
-              AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%')
-            </if>
-            <if test="param.gender != null">
-              AND b.sex = #{param.gender}
-            </if>
-            <if test="param.city != null">
-              AND b.city = #{param.city}
-            </if>
-            <if test="param.userIds != null">
-              AND b.user_id IN
-              <foreach collection="param.userIds" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-<!--            <if test="param.sceneType == 'LOVE_INDEX'">-->
-<!--              ORDER BY rand()-->
-<!--            </if>-->
         </where>
     </sql>
 
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml
index f68b93e..3352964 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.docs_id, a.title, a.parent_id, a.user_id, a.sort_number, a.comments, a.status, a.merchant_code
+        SELECT a.*
         FROM cms_docs a
         <where>
             <if test="param.docsId != null">
@@ -22,9 +22,6 @@
             <if test="param.organizationId != null">
                 AND a.organization_id = #{param.organizationId}
             </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
             <if test="param.visibility != null">
                 AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%')
             </if>
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java b/src/main/java/com/gxwebsoft/cms/param/AdParam.java
similarity index 67%
rename from src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java
rename to src/main/java/com/gxwebsoft/cms/param/AdParam.java
index 8cc35ec..31bc3e6 100644
--- a/src/main/java/com/gxwebsoft/shop/param/UserFeedbackParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/AdParam.java
@@ -1,4 +1,4 @@
-package com.gxwebsoft.shop.param;
+package com.gxwebsoft.cms.param;
 
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -10,32 +10,38 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 意见反馈记录表查询参数
+ * 广告位管理表查询参数
  *
  * @author 科技小王子
- * @since 2023-07-16 22:24:55
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserFeedbackParam对象", description = "意见反馈记录表查询参数")
-public class UserFeedbackParam extends BaseParam {
+@ApiModel(value = "AdParam对象", description = "广告位管理表查询参数")
+public class AdParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
     @QueryField(type = QueryType.EQ)
-    private Integer id;
+    private Integer adId;
+
+    @ApiModelProperty(value = "广告类型")
+    private String adType;
+
+    @ApiModelProperty(value = "宽")
+    private String width;
+
+    @ApiModelProperty(value = "高")
+    private String height;
+
+    @ApiModelProperty(value = "广告图片")
+    private String images;
 
     @ApiModelProperty(value = "用户ID")
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "反馈图片")
-    private String images;
-
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;
@@ -47,8 +53,4 @@ public class UserFeedbackParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
 }
diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java
index c9aa163..43b1ef6 100644
--- a/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/ArticleCategoryParam.java
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 文章分类表查询参数
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -40,10 +40,6 @@ public class ArticleCategoryParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;
@@ -51,6 +47,10 @@ public class ArticleCategoryParam extends BaseParam {
     @ApiModelProperty(value = "备注")
     private String comments;
 
+    @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+    @QueryField(type = QueryType.EQ)
+    private Integer hide;
+
     @ApiModelProperty(value = "状态, 0正常, 1禁用")
     @QueryField(type = QueryType.EQ)
     private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java
index 33711f9..dfa2978 100644
--- a/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/ArticleCommentParam.java
@@ -1,10 +1,9 @@
 package com.gxwebsoft.cms.param;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
 import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 文章评论表查询参数
  *
  * @author 科技小王子
- * @since 2023-07-07 14:14:35
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,6 +26,10 @@ public class ArticleCommentParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer commentId;
 
+    @ApiModelProperty(value = "文章ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer articleId;
+
     @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
     @QueryField(type = QueryType.EQ)
     private Integer score;
@@ -38,7 +41,7 @@ public class ArticleCommentParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer isPicture;
 
-    @ApiModelProperty(value = "用户ID")
+    @ApiModelProperty(value = "评论者ID")
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
@@ -46,13 +49,13 @@ public class ArticleCommentParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer toUserId;
 
-    @ApiModelProperty(value = "回复者ID")
-    @TableField(exist = false)
-    private Integer replyUserId;
-
-    @ApiModelProperty(value = "文章ID")
+    @ApiModelProperty(value = "回复的评论ID")
     @QueryField(type = QueryType.EQ)
-    private Integer articleId;
+    private Integer replyCommentId;
+
+    @ApiModelProperty(value = "回复者ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer replyUserId;
 
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     @QueryField(type = QueryType.EQ)
@@ -61,7 +64,7 @@ public class ArticleCommentParam extends BaseParam {
     @ApiModelProperty(value = "备注")
     private String comments;
 
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
+    @ApiModelProperty(value = "状态, 0未读, 1已读")
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
@@ -69,11 +72,4 @@ public class ArticleCommentParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer deleted;
 
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "当前登录用户ID")
-    @TableField(exist = false)
-    private Integer loginUserId;
-
 }
diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java
index 59a3ecb..3ba1076 100644
--- a/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/ArticleLikeParam.java
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 点赞文章查询参数
  *
  * @author 科技小王子
- * @since 2023-07-07 13:00:03
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,8 +34,4 @@ public class ArticleLikeParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
-    @ApiModelProperty(value = "客户端")
-    @QueryField(type = QueryType.EQ)
-    private String platform;
-
 }
diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java
index 2efa660..2263cb5 100644
--- a/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java
@@ -1,22 +1,19 @@
 package com.gxwebsoft.cms.param;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
 import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Set;
-
 /**
  * 文章记录表查询参数
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -36,6 +33,9 @@ public class ArticleParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer showType;
 
+    @ApiModelProperty(value = "话题")
+    private String topic;
+
     @ApiModelProperty(value = "文章分类ID")
     @QueryField(type = QueryType.EQ)
     private Integer categoryId;
@@ -57,14 +57,51 @@ public class ArticleParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer actualViews;
 
+    @ApiModelProperty(value = "发布来源客户端 (APP、H5、小程序等)")
+    private String platform;
+
+    @ApiModelProperty(value = "文章附件")
+    private String files;
+
+    @ApiModelProperty(value = "视频地址")
+    private String video;
+
+    @ApiModelProperty(value = "接受的文件类型")
+    private String accept;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "所在省份")
+    private String province;
+
+    @ApiModelProperty(value = "所在城市")
+    private String city;
+
+    @ApiModelProperty(value = "所在辖区")
+    private String region;
+
+    @ApiModelProperty(value = "街道地址")
+    private String address;
+
+    @ApiModelProperty(value = "点赞数")
+    @QueryField(type = QueryType.EQ)
+    private Integer likes;
+
+    @ApiModelProperty(value = "评论数")
+    @QueryField(type = QueryType.EQ)
+    private Integer commentNumbers;
+
+    @ApiModelProperty(value = "提醒谁看")
+    private String toUsers;
+
     @ApiModelProperty(value = "用户ID")
     @QueryField(type = QueryType.EQ)
     private Integer userId;
 
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
     @ApiModelProperty(value = "排序(数字越小越靠前)")
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;
@@ -80,35 +117,4 @@ public class ArticleParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer deleted;
 
-    @ApiModelProperty("用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty("查询关注状态")
-    private Boolean showFollow;
-
-    @ApiModelProperty(value = "当前登录用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer loginUserId;
-
-    @ApiModelProperty(value = "按性别筛选")
-    @QueryField(type = QueryType.EQ)
-    private Integer gender;
-
-    @ApiModelProperty(value = "场景")
-    @QueryField(type = QueryType.EQ)
-    private String scene;
-
-    @ApiModelProperty(value = "按用户所在城市查询")
-    @QueryField(type = QueryType.EQ)
-    private String city;
-
-    @ApiModelProperty(value = "话题")
-    @QueryField(type = QueryType.EQ)
-    private String topic;
-
-    @ApiModelProperty(value = "用户id集合")
-    @TableField(exist = false)
-    private Set<Integer> userIds;
-
 }
diff --git a/src/main/java/com/gxwebsoft/cms/param/DocsParam.java b/src/main/java/com/gxwebsoft/cms/param/DocsParam.java
index a9c7c7c..5294250 100644
--- a/src/main/java/com/gxwebsoft/cms/param/DocsParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/DocsParam.java
@@ -12,8 +12,8 @@ import lombok.EqualsAndHashCode;
 /**
  * 文档管理记录表查询参数
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -41,10 +41,6 @@ public class DocsParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer organizationId;
 
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
     @ApiModelProperty(value = "可见性(public,private,protected)")
     private String visibility;
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/AdService.java b/src/main/java/com/gxwebsoft/cms/service/AdService.java
new file mode 100644
index 0000000..73c4f34
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/service/AdService.java
@@ -0,0 +1,42 @@
+package com.gxwebsoft.cms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.cms.entity.Ad;
+import com.gxwebsoft.cms.param.AdParam;
+
+import java.util.List;
+
+/**
+ * 广告位管理表Service
+ *
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
+ */
+public interface AdService extends IService<Ad> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<Ad>
+     */
+    PageResult<Ad> pageRel(AdParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<Ad>
+     */
+    List<Ad> listRel(AdParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param adId ID
+     * @return Ad
+     */
+    Ad getByIdRel(Integer adId);
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java
index e544e9a..73e8632 100644
--- a/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java
+++ b/src/main/java/com/gxwebsoft/cms/service/ArticleCategoryService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 文章分类表Service
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleCategoryService extends IService<ArticleCategory> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java
index 492880d..335a6d5 100644
--- a/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java
+++ b/src/main/java/com/gxwebsoft/cms/service/ArticleCommentService.java
@@ -1,9 +1,9 @@
 package com.gxwebsoft.cms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.cms.entity.ArticleComment;
 import com.gxwebsoft.cms.param.ArticleCommentParam;
-import com.gxwebsoft.common.core.web.PageResult;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * 文章评论表Service
  *
  * @author 科技小王子
- * @since 2023-07-07 14:14:35
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleCommentService extends IService<ArticleComment> {
 
@@ -39,6 +39,4 @@ public interface ArticleCommentService extends IService<ArticleComment> {
      */
     ArticleComment getByIdRel(Integer commentId);
 
-    int getUserUnReadCount(Integer userId);
-
 }
diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java
index 570d62f..423e94f 100644
--- a/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java
+++ b/src/main/java/com/gxwebsoft/cms/service/ArticleLikeService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 点赞文章Service
  *
  * @author 科技小王子
- * @since 2023-07-07 13:00:03
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleLikeService extends IService<ArticleLike> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleService.java
index 51540a4..2174e12 100644
--- a/src/main/java/com/gxwebsoft/cms/service/ArticleService.java
+++ b/src/main/java/com/gxwebsoft/cms/service/ArticleService.java
@@ -10,8 +10,8 @@ import java.util.List;
 /**
  * 文章记录表Service
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 public interface ArticleService extends IService<Article> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/DocsService.java b/src/main/java/com/gxwebsoft/cms/service/DocsService.java
index 075b92b..9be2868 100644
--- a/src/main/java/com/gxwebsoft/cms/service/DocsService.java
+++ b/src/main/java/com/gxwebsoft/cms/service/DocsService.java
@@ -10,8 +10,8 @@ import java.util.List;
 /**
  * 文档管理记录表Service
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 public interface DocsService extends IService<Docs> {
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/AdServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/AdServiceImpl.java
new file mode 100644
index 0000000..1932e86
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/AdServiceImpl.java
@@ -0,0 +1,47 @@
+package com.gxwebsoft.cms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.mapper.AdMapper;
+import com.gxwebsoft.cms.service.AdService;
+import com.gxwebsoft.cms.entity.Ad;
+import com.gxwebsoft.cms.param.AdParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 广告位管理表Service实现
+ *
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
+ */
+@Service
+public class AdServiceImpl extends ServiceImpl<AdMapper, Ad> implements AdService {
+
+    @Override
+    public PageResult<Ad> pageRel(AdParam param) {
+        PageParam<Ad, AdParam> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<Ad> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<Ad> listRel(AdParam param) {
+        List<Ad> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<Ad, AdParam> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public Ad getByIdRel(Integer adId) {
+        AdParam param = new AdParam();
+        param.setAdId(adId);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java
index 05c7f47..c67d2d0 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCategoryServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 文章分类表Service实现
  *
  * @author 科技小王子
- * @since 2022-11-22 17:49:15
+ * @since 2023-10-22 15:47:09
  */
 @Service
 public class ArticleCategoryServiceImpl extends ServiceImpl<ArticleCategoryMapper, ArticleCategory> implements ArticleCategoryService {
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java
index bbf2979..65c047a 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCommentServiceImpl.java
@@ -1,71 +1,31 @@
 package com.gxwebsoft.cms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.cms.entity.ArticleComment;
-import com.gxwebsoft.cms.entity.ArticleLike;
 import com.gxwebsoft.cms.mapper.ArticleCommentMapper;
-import com.gxwebsoft.cms.param.ArticleCommentParam;
 import com.gxwebsoft.cms.service.ArticleCommentService;
-import com.gxwebsoft.cms.service.ArticleLikeService;
-import com.gxwebsoft.cms.service.ArticleService;
-import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.cms.entity.ArticleComment;
+import com.gxwebsoft.cms.param.ArticleCommentParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 文章评论表Service实现
  *
  * @author 科技小王子
- * @since 2023-07-07 14:14:35
+ * @since 2023-10-22 15:47:09
  */
 @Service
 public class ArticleCommentServiceImpl extends ServiceImpl<ArticleCommentMapper, ArticleComment> implements ArticleCommentService {
 
-    @Resource
-    private ArticleLikeService articleLikeService;
-
-    @Resource
-    private ArticleService articleService;
-
-
-
     @Override
     public PageResult<ArticleComment> pageRel(ArticleCommentParam param) {
         PageParam<ArticleComment, ArticleCommentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        //page.setDefaultOrder("create_time desc");
         List<ArticleComment> list = baseMapper.selectPageRel(page, param);
-
-        // 获取带点赞状态和评论的文章列表
-        if (param.getSceneType() != null && param.getSceneType().equals("UN_READ_COMMENT")) {
-            // 更新为已读
-            if(!CollectionUtils.isEmpty(list)){
-                Set<Integer> commentIds = list.stream().map(ArticleComment::getCommentId).collect(Collectors.toSet());
-                LambdaUpdateWrapper<ArticleComment> updateWrapper = new LambdaUpdateWrapper<ArticleComment>()
-                        .in(ArticleComment::getCommentId, commentIds)
-                        .set(ArticleComment::getStatus, 1);
-                baseMapper.update(null, updateWrapper);
-            }
-            return new PageResult<>(list, page.getTotal());
-        }
-
-        // 我点赞的人
-        final List<ArticleLike> myLikes = articleLikeService.list(new LambdaQueryWrapper<ArticleLike>().eq(ArticleLike::getUserId, param.getLoginUserId()));
-        list.forEach(d -> {
-          final boolean isLike = myLikes.stream().anyMatch(f -> f.getUserId().equals(param.getLoginUserId()));
-          d.setLikes(isLike);
-        });
-        // List转为树形结构
-        final List<ArticleComment> articleComments = CommonUtil.toTreeData(list, 0, ArticleComment::getReplyCommentId, ArticleComment::getCommentId, ArticleComment::setChildren);
-        return new PageResult<>(articleComments, page.getTotal());
+        return new PageResult<>(list, page.getTotal());
     }
 
     @Override
@@ -73,7 +33,7 @@ public class ArticleCommentServiceImpl extends ServiceImpl<ArticleCommentMapper,
         List<ArticleComment> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ArticleComment, ArticleCommentParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        //page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
@@ -84,17 +44,4 @@ public class ArticleCommentServiceImpl extends ServiceImpl<ArticleCommentMapper,
         return param.getOne(baseMapper.selectListRel(param));
     }
 
-    @Override
-    public int getUserUnReadCount(Integer userId) {
-//        List<Article> list = articleService.list(new LambdaQueryWrapper<Article>().eq(Article::getUserId, userId).select(Article::getArticleId));
-//        Set<Integer> articleIds = list.stream().map(Article::getArticleId).collect(Collectors.toSet());
-        int count = baseMapper.selectCount(
-                new LambdaQueryWrapper<>(ArticleComment.class)
-//                        .in(ArticleComment::getArticleId, articleIds)
-                        .eq(ArticleComment::getStatus, 0)
-                        .eq(ArticleComment::getToUserId, userId)
-        );
-        return count;
-    }
-
 }
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java
index 3a7cb41..c365eb0 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleLikeServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 点赞文章Service实现
  *
  * @author 科技小王子
- * @since 2023-07-07 13:00:03
+ * @since 2023-10-22 15:47:09
  */
 @Service
 public class ArticleLikeServiceImpl extends ServiceImpl<ArticleLikeMapper, ArticleLike> implements ArticleLikeService {
@@ -23,7 +23,7 @@ public class ArticleLikeServiceImpl extends ServiceImpl<ArticleLikeMapper, Artic
     @Override
     public PageResult<ArticleLike> pageRel(ArticleLikeParam param) {
         PageParam<ArticleLike, ArticleLikeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        //page.setDefaultOrder("create_time desc");
         List<ArticleLike> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ArticleLikeServiceImpl extends ServiceImpl<ArticleLikeMapper, Artic
         List<ArticleLike> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<ArticleLike, ArticleLikeParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        //page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
index 30b8fe7..9a5ec4a 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
@@ -1,78 +1,30 @@
 package com.gxwebsoft.cms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.cms.entity.Article;
-import com.gxwebsoft.cms.entity.ArticleLike;
 import com.gxwebsoft.cms.mapper.ArticleMapper;
-import com.gxwebsoft.cms.param.ArticleParam;
-import com.gxwebsoft.cms.service.ArticleLikeService;
 import com.gxwebsoft.cms.service.ArticleService;
+import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.cms.param.ArticleParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserFollow;
-import com.gxwebsoft.shop.service.UserFollowService;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import javax.annotation.Resource;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 文章记录表Service实现
  *
- * @author WebSoft
- * @since 2022-11-16 11:40:27
+ * @author 科技小王子
+ * @since 2023-10-22 15:47:09
  */
 @Service
 public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements ArticleService {
-    @Resource
-    private UserFollowService userFollowService;
-    @Resource
-    private ArticleLikeService articleLikeService;
 
     @Override
     public PageResult<Article> pageRel(ArticleParam param) {
         PageParam<Article, ArticleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
-        // 搜素条件
-        if (param.getScene() != null) {
-          // 最新
-          if (param.getScene().equals("new")) {
-            param.setCity(null);
-            param.setUserIds(null);
-          }
-          // 同城intraCity
-          if (param.getScene().equals("intraCity")) {
-            param.setCity(param.getCity());
-          }
-          // 关注focus
-          if (param.getScene().equals("focus")) {
-            final List<UserFollow> myFocus = userFollowService.list(new LambdaQueryWrapper<UserFollow>().eq(UserFollow::getUserId, param.getLoginUserId()));
-            if (!CollectionUtils.isEmpty(myFocus)) {
-              final Set<Integer> collect = myFocus.stream().map(UserFollow::getShopId).collect(Collectors.toSet());
-              param.setUserIds(collect);
-            }
-          }
-        }
-        // 数据列表
+        //page.setDefaultOrder("create_time desc");
         List<Article> list = baseMapper.selectPageRel(page, param);
-        // 我关注的人
-        final List<UserFollow> myFollows = userFollowService.list(new LambdaQueryWrapper<UserFollow>().eq(UserFollow::getUserId, param.getLoginUserId()));
-        // 我点赞的文章
-        final List<ArticleLike> myLikes = articleLikeService.list(new LambdaQueryWrapper<ArticleLike>().eq(ArticleLike::getUserId, param.getLoginUserId()));
-        // 是否显示关注状态
-        if(param.getShowFollow() != null){
-          list.forEach(d -> {
-            // 是否关注
-            final boolean isFollows = myFollows.stream().filter(f -> f.getShopId().equals(d.getUserId())).findFirst().isPresent();
-            final boolean isLike = myLikes.stream().filter(f -> f.getArticleId().equals(d.getArticleId())).findFirst().isPresent();
-            d.setFollow(isFollows);
-            d.setLiked(isLike);
-          });
-        }
         return new PageResult<>(list, page.getTotal());
     }
 
@@ -81,7 +33,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         List<Article> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<Article, ArticleParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        //page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java
index d9ca2c4..97422fb 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/DocsServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 文档管理记录表Service实现
  *
  * @author 科技小王子
- * @since 2022-11-16 11:40:27
+ * @since 2023-10-22 15:47:09
  */
 @Service
 public class DocsServiceImpl extends ServiceImpl<DocsMapper, Docs> implements DocsService {
@@ -33,7 +33,7 @@ public class DocsServiceImpl extends ServiceImpl<DocsMapper, Docs> implements Do
         List<Docs> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<Docs, DocsParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc,create_time asc");
+        //page.setDefaultOrder("create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
index e163187..fefe1c7 100644
--- a/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
+++ b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
@@ -13,8 +13,6 @@ import com.gxwebsoft.common.core.utils.JSONUtil;
 import com.gxwebsoft.common.system.entity.OperationRecord;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.service.OperationRecordService;
-import com.gxwebsoft.shop.entity.UserLook;
-import com.gxwebsoft.shop.service.UserLookService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.aspectj.lang.JoinPoint;
@@ -44,8 +42,6 @@ import java.util.Map;
 public class OperationLogAspect {
     @Resource
     private OperationRecordService operationRecordService;
-    @Resource
-    private UserLookService userLookService;
 
     // 参数、返回结果、错误信息等最大保存长度
     private static final int MAX_LENGTH = 1000;
diff --git a/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java
index 970387c..0dc0fba 100644
--- a/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java
+++ b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java
@@ -10,8 +10,6 @@ import com.gxwebsoft.common.core.utils.JSONUtil;
 import com.gxwebsoft.common.system.entity.Menu;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.entity.UserInfo;
-import com.gxwebsoft.common.system.service.LoginRecordService;
-import com.gxwebsoft.common.system.service.UserService;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -40,10 +38,6 @@ import java.util.stream.Collectors;
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
   @Resource
   private ConfigProperties configProperties;
-  @Resource
-  private UserService userService;
-  @Resource
-  private LoginRecordService loginRecordService;
 
   @Override
   protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
@@ -54,33 +48,31 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         // 解析token
         Claims claims = JwtUtil.parseToken(access_token, configProperties.getTokenKey());
         JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
-        User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
-        if (user == null) {
-          // 请求主服务器获取用户信息
-          HashMap<String, Object> map = new HashMap<>();
-          map.put("username", jwtSubject.getUsername());
-          map.put("tenantId", jwtSubject.getTenantId());
-          // 链式构建请求
-          String result = HttpRequest.post("https://server.gxwebsoft.com/api/auth/user")
-            .header("Authorization", access_token)
-            .header("Tenantid", jwtSubject.getTenantId().toString())
-            .body(JSONUtil.toJSONString(map))//表单内容
-            .timeout(20000)//超时，毫秒
-            .execute().body();
 
-          JSONObject jsonObject = JSONObject.parseObject(result);
-          if(jsonObject.getString("code").equals("401")){
-            throw new UsernameNotFoundException("Username not found");
-          }
-          final String data = jsonObject.getString("data");
-          final UserInfo userInfo = JSONObject.parseObject(data, UserInfo.class);
-          System.out.println("userInfo = " + userInfo);
-          List<Menu> authorities = userInfo.getAuthorities().stream()
-            .filter(m -> StrUtil.isNotBlank(m.getAuthority())).collect(Collectors.toList());
-          UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
-            user, null, authorities);
-          SecurityContextHolder.getContext().setAuthentication(authentication);
-          // token将要过期签发新token, 防止突然退出登录
+        // 请求主服务器获取用户信息
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("username", jwtSubject.getUsername());
+        map.put("tenantId", jwtSubject.getTenantId());
+        // 链式构建请求
+        String result = HttpRequest.post("https://server.gxwebsoft.com/api/auth/user")
+          .header("Authorization", access_token)
+          .header("Tenantid", jwtSubject.getTenantId().toString())
+          .body(JSONUtil.toJSONString(map))//表单内容
+          .timeout(20000)//超时，毫秒
+          .execute().body();
+
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if(jsonObject.getString("code").equals("401")){
+          throw new UsernameNotFoundException("Username not found");
+        }
+        final String data = jsonObject.getString("data");
+        final User user = JSONObject.parseObject(data, User.class);
+        List<Menu> authorities = user.getAuthorities().stream()
+          .filter(m -> StrUtil.isNotBlank(m.getAuthority())).collect(Collectors.toList());
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+          user, null, authorities);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+        // token将要过期签发新token, 防止突然退出登录
 //          long expiration = (claims.getExpiration().getTime() - new Date().getTime()) / 1000 / 60;
 //          if (expiration < configProperties.getTokenRefreshTime()) {
 //            String token = JwtUtil.buildToken(jwtSubject, configProperties.getTokenExpireTime(),
@@ -90,7 +82,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 //              user.getTenantId(), request);
 //          }
 
-        }
 
 
       } catch (ExpiredJwtException e) {
diff --git a/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java b/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java
index 334bbe8..2f05d23 100644
--- a/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java
+++ b/src/main/java/com/gxwebsoft/common/core/security/JwtUtil.java
@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.gxwebsoft.common.core.Constants;
 import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.shop.entity.Payment;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -108,16 +107,6 @@ public class JwtUtil {
         return JSONUtil.parseObject(claims.getSubject(), JwtSubject.class);
     }
 
-    /**
-     * 解析支付方式里的json数据
-     *
-     * @param payment Payment
-     * @return Payment
-     */
-    public static Payment getPaymentConfig(Payment payment){
-      return JSONUtil.parseObject(payment.getConfig(), Payment.class);
-    }
-
     /**
      * 生成Key
      *
diff --git a/src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java
deleted file mode 100644
index 53e1d3f..0000000
--- a/src/main/java/com/gxwebsoft/common/core/utils/BtUtil.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.gxwebsoft.common.core.utils;
-
-import com.gxwebsoft.oa.entity.Assets;
-import com.gxwebsoft.oa.service.AssetsService;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.MessageDigest;
-import java.util.Date;
-
-/**
- * 宝塔工具类
- * @author 科技小王子
- *
- */
-@Component
-public class BtUtil {
-  public static Integer tenantId;
-  public static String server;
-  public static String token;
-  private static String timestamp;
-  @Resource
-  private AssetsService assetsService;
-
-    // 实例化客户端
-    public BtUtil client(Integer id) {
-      Assets assets = assetsService.getByIdRel(id);
-      try {
-        String btSign = assets.getBtSign();
-        server = "http://".concat(assets.getCode()).concat(":9003");
-        String url = "http://".concat(assets.getCode()) + ":9003/system?action=GetSystemTotal";
-        timestamp = (new Date().getTime()+"");
-        String md5Sign = getMd5(btSign);
-        String temp = timestamp+md5Sign;
-        token = getMd5(temp);
-
-        String json = "request_time="+timestamp+"&request_token="+token;
-        String responseText = sendPost(url,json);
-        System.out.println("responseText = " + responseText);
-        System.out.println(responseText);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-      return this;
-    }
-
-    public String getSystemTotal(){
-      String url = server.concat("/system?action=GetSystemTotal");
-      String json = "request_time="+timestamp+"&request_token="+token;
-      String responseText = sendPost(url,json);
-      System.out.println("responseText = " + responseText);
-      return responseText;
-    }
-
-    public String getDiskInfo(){
-      String url = server.concat("/system?action=GetDiskInfo");
-      String json = "request_time="+timestamp+"&request_token="+token;
-      return sendPost(url,json);
-    }
-
-//    public void config()
-//    {
-//        try {
-//        System.out.println("tenantId = " + tenantId);
-//        String btSign = "XXXXXXXXXXXXXXXXXXXXXXXX";
-//        String url = "http://XXX.XXX.XXX.XXX:8888/system?action=GetSystemTotal";
-//        String timestamp = (new Date().getTime()+"");
-//        String md5Sign = getMd5(btSign);
-//        String temp = timestamp+md5Sign;
-//        String token = getMd5(temp);
-//
-//        String json = "request_time="+timestamp+"&request_token="+token;
-//        String responseText = sendPost(url,json);
-//        System.out.println(responseText);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-
-    public static String getMd5(String str) throws Exception
-    {
-        try {
-            // 生成一个MD5加密计算摘要
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            // 计算md5函数
-            md.update(str.getBytes());
-            // digest()最后确定返回md5 hash值，返回值为8为字符串。因为md5 hash值是16位的hex值，实际上就是8位的字符
-            // BigInteger函数则将8位的字符串转换成16位hex值，用字符串来表示；得到字符串形式的hash值
-            return new BigInteger(1, md.digest()).toString(16);
-        } catch (Exception e) {
-            throw new Exception("MD5加密出现错误，"+e.toString());
-        }
-    }
-
-    public static String sendPost(String url, String param) {
-        PrintWriter out = null;
-        BufferedReader in = null;
-        StringBuffer result = new StringBuffer();
-        try {
-            URL realUrl = new URL(url);
-            // 打开和URL之间的连接
-            URLConnection conn = realUrl.openConnection();
-            // 设置通用的请求属性
-            conn.setRequestProperty("accept", "text/xml,text/javascript,text/html,application/json");
-            conn.setRequestProperty("connection", "Keep-Alive");
-            // 发送POST请求必须设置如下两行
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            // 获取URLConnection对象对应的输出流
-            out = new PrintWriter(conn.getOutputStream());
-            // 发送请求参数
-            out.print(param);
-            // flush输出流的缓冲
-            out.flush();
-            // 定义BufferedReader输入流来读取URL的响应
-            in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line;
-            while ((line = in.readLine()) != null) {
-                result.append(line);
-            }
-        } catch (Exception e) {
-            System.out.println("发送 POST 请求出现异常！"+e);
-            e.printStackTrace();
-        }
-        //使用finally块来关闭输出流、输入流
-        finally{
-            try{
-                if(out!=null){
-                    out.close();
-                }
-                if(in!=null){
-                    in.close();
-                }
-            }
-            catch(IOException ex){
-                ex.printStackTrace();
-            }
-        }
-        return result.toString();
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java
index afc62d6..eb92a6c 100644
--- a/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java
+++ b/src/main/java/com/gxwebsoft/common/core/utils/SchedulingUtil.java
@@ -1,7 +1,5 @@
 package com.gxwebsoft.common.core.utils;
 
-import com.gxwebsoft.shop.service.OrderService;
-
 import javax.annotation.Resource;
 
 /**
@@ -11,8 +9,6 @@ import javax.annotation.Resource;
  * @since 2018-12-14 08:38:19
  */
 public class SchedulingUtil {
-  @Resource
-  private OrderService orderService;
 
 //  @Scheduled(cron="*/5 * * * * *")
 //  public void reportCurrentTime() {
diff --git a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
index 9aa8895..193805b 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
@@ -1,17 +1,14 @@
 package com.gxwebsoft.common.core.web;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gxwebsoft.common.core.Constants;
 import com.gxwebsoft.common.core.exception.BusinessException;
 import com.gxwebsoft.common.core.utils.CacheClient;
 import com.gxwebsoft.common.core.utils.SignCheckUtil;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.entity.UserInfo;
 import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.service.MerchantClerkService;
-import com.gxwebsoft.shop.service.MerchantService;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.security.core.Authentication;
@@ -37,14 +34,6 @@ public class BaseController {
     private HttpServletRequest request;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
-    @Resource
-    private MerchantService merchantService;
-    @Resource
-    private MerchantClerkService merchantClerkService;
-    @Resource
-    private CacheClient cacheClient;
-    @Resource
-    private UserService userService;
 
     /**
      * 获取当前登录的user
@@ -207,25 +196,6 @@ public class BaseController {
       return request.getHeader("Authorization");
     }
 
-    /**
-     * 获取当前登录用户所属的商户编号
-     *
-     * @return merchantCode
-     */
-    public String getMerchantCode() {
-      // 按店员查询
-      return merchantClerkService.getMerchantCodeByClerk(getLoginUserId());
-    }
-
-    /**
-     * 获取当前登录的商户信息
-     *
-     * @return merchantCode
-     */
-    public Merchant getMerchant() {
-      return merchantService.getMerchantByCode(getMerchantCode());
-    }
-
     public String getAppId() {
       // 兼容小写
       if(request.getHeader("appid") != null){
@@ -303,23 +273,23 @@ public class BaseController {
      * 根据账号|手机号码|邮箱查找用户ID
      * @return userId
      */
-    public Integer getUserIdByUsername(String username, Integer tenantId){
-      // 按账号搜素
-      User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getUsername, username).eq(User::getTenantId,tenantId));
-      if (user != null && user.getUserId() > 0) {
-        return user.getUserId();
-      }
-      // 按手机号码搜索
-      User userByPhone = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getPhone, username).eq(User::getTenantId, tenantId));
-      if (userByPhone != null && userByPhone.getUserId() > 0) {
-        return userByPhone.getUserId();
-      }
-      // 按邮箱搜索
-      User userByEmail = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getEmail, username).eq(User::getTenantId, tenantId));
-      if (userByEmail != null && userByEmail.getUserId() > 0) {
-        return userByEmail.getUserId();
-      }
-      throw new BusinessException("找不到该用户");
-    }
+//    public Integer getUserIdByUsername(String username, Integer tenantId){
+//      // 按账号搜素
+//      User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getUsername, username).eq(User::getTenantId,tenantId));
+//      if (user != null && user.getUserId() > 0) {
+//        return user.getUserId();
+//      }
+//      // 按手机号码搜索
+//      User userByPhone = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getPhone, username).eq(User::getTenantId, tenantId));
+//      if (userByPhone != null && userByPhone.getUserId() > 0) {
+//        return userByPhone.getUserId();
+//      }
+//      // 按邮箱搜索
+//      User userByEmail = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getEmail, username).eq(User::getTenantId, tenantId));
+//      if (userByEmail != null && userByEmail.getUserId() > 0) {
+//        return userByEmail.getUserId();
+//      }
+//      throw new BusinessException("找不到该用户");
+//    }
 
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java b/src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java
deleted file mode 100644
index 52924b8..0000000
--- a/src/main/java/com/gxwebsoft/common/system/controller/AccessKeyController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.gxwebsoft.common.system.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.AccessKey;
-import com.gxwebsoft.common.system.param.AccessKeyParam;
-import com.gxwebsoft.common.system.service.AccessKeyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 访问凭证管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-16 19:19:55
- */
-@Api(tags = "访问凭证管理管理")
-@RestController
-@RequestMapping("/api/system/access-key")
-public class AccessKeyController extends BaseController {
-    @Resource
-    private AccessKeyService accessKeyService;
-    @Resource
-    private CacheClient cacheClient;
-
-    @PreAuthorize("hasAuthority('sys:accessKey:list')")
-    @ApiOperation("分页查询访问凭证管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<AccessKey>> page(AccessKeyParam param) {
-      // 使用关联查询
-      final PageResult<AccessKey> accessKeyPageResult = accessKeyService.pageRel(param);
-      if (param.getCode() != null) {
-        // 短信验证码校验
-        String code = cacheClient.get(param.getPhone(), String.class);
-        if (StrUtil.equals(code,param.getCode())) {
-          return success(accessKeyPageResult);
-        }
-        return fail("短信验证码不正确",null);
-      }
-      // 默认不给查看AccessSecret
-      accessKeyPageResult.getList().forEach( d -> {
-        d.setAccessSecret(null);
-      });
-      return success(accessKeyPageResult);
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:list')")
-    @ApiOperation("查询全部访问凭证管理")
-    @GetMapping()
-    public ApiResult<List<AccessKey>> list(AccessKeyParam param) {
-        PageParam<AccessKey, AccessKeyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(accessKeyService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(accessKeyService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:list')")
-    @ApiOperation("根据id查询访问凭证管理")
-    @GetMapping("/{id}")
-    public ApiResult<AccessKey> get(@PathVariable("id") Integer id) {
-        return success(accessKeyService.getById(id));
-        // 使用关联查询
-        //return success(accessKeyService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:list')")
-    @ApiOperation("添加访问凭证管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody AccessKey accessKey) {
-      final int count = accessKeyService.count();
-      if (count >= 5) {
-        return fail("当前账号只能绑定 5 个 AccessKey");
-      }
-      accessKey.setAccessKey("AI" + CommonUtil.randomUUID16());
-      accessKey.setAccessSecret(CommonUtil.randomUUID16().concat(CommonUtil.randomUUID16()));
-      if (accessKeyService.save(accessKey)) {
-          return success("创建成功");
-      }
-      return fail("创建失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:update')")
-    @ApiOperation("修改访问凭证管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody AccessKey accessKey) {
-        if (accessKeyService.updateById(accessKey)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:remove')")
-    @ApiOperation("删除访问凭证管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (accessKeyService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:save')")
-    @ApiOperation("批量添加访问凭证管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<AccessKey> list) {
-        if (accessKeyService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:update')")
-    @ApiOperation("批量修改访问凭证管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<AccessKey> batchParam) {
-        if (batchParam.update(accessKeyService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:accessKey:remove')")
-    @ApiOperation("批量删除访问凭证管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (accessKeyService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
deleted file mode 100644
index e9b2e2f..0000000
--- a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.gxwebsoft.common.system.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.ClientException;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.common.auth.*;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.OSSException;
-import com.aliyun.oss.common.utils.BinaryUtil;
-import com.aliyun.oss.model.PolicyConditions;
-import com.aliyun.oss.model.PutObjectRequest;
-import com.aliyun.oss.model.PutObjectResult;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.auth.sts.AssumeRoleRequest;
-import com.aliyuncs.auth.sts.AssumeRoleResponse;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
-import com.aliyuncs.profile.IClientProfile;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.utils.FileServerUtil;
-import com.gxwebsoft.common.core.utils.RedisUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.FileRecord;
-import com.gxwebsoft.common.system.service.FileRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 阿里云OSS云存储
- *
- * @author WebSoft
- * @since 2022-11-19 13:54:27
- */
-@Api(tags = "阿里云OSS云存储")
-@RestController
-@RequestMapping("/api/oss")
-public class AliOssController extends BaseController {
-  @Resource
-  private ConfigProperties config;
-  @Resource
-  private RedisUtil redisUtil;
-  @Resource
-  private FileRecordService fileRecordService;
-
-  @OperationLog
-  @ApiOperation("上传文件")
-  @PostMapping("/upload")
-  public ApiResult<FileRecord> upload(@RequestParam MultipartFile file, HttpServletRequest request) throws Exception{
-    FileRecord result = null;
-    // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
-    String endpoint = config.getEndpoint();
-    // RAM用户的访问密钥（AccessKey ID和AccessKey Secret）。
-    String accessKeyId = config.getAccessKeyId();
-    String accessKeySecret = config.getAccessKeySecret();
-    // 使用代码嵌入的RAM用户的访问密钥配置访问凭证。
-    CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret);
-    // 填写Bucket名称，例如examplebucket。
-    String bucketName = config.getBucketName();
-    // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。
-//    String objectName = "exampledir/exampleobject.txt";
-    // 填写本地文件的完整路径，例如D:\\localpath\\examplefile.txt。
-    // 如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
-//    String filePath= "D:\\localpath\\examplefile.txt";
-
-    // 创建OSSClient实例。
-    OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider);
-
-    try {
-
-      String dir = getUploadDir();
-      File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName());
-      String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length());
-      String originalName = file.getOriginalFilename();
-
-      // 创建PutObjectRequest对象。
-      PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, path, upload);
-      // 如果需要上传时设置存储类型和访问权限，请参考以下示例代码。
-      // ObjectMetadata metadata = new ObjectMetadata();
-      // metadata.setHeader(OSSHeaders.OSS_STORAGE_CLASS, StorageClass.Standard.toString());
-      // metadata.setObjectAcl(CannedAccessControlList.Private);
-      // putObjectRequest.setMetadata(metadata);
-
-      // 上传文件。
-      PutObjectResult ossResult = ossClient.putObject(putObjectRequest);
-
-      // 保存记录并返回
-      String requestURL = config.getBucketDomain();
-      final String domain = redisUtil.getUploadConfig(getTenantId()).get("bucketDomain");
-      if(StrUtil.isNotBlank(domain)){
-        requestURL = domain;
-      }
-      path = "/".concat(path);
-      upload.delete();
-      final String cache = redisUtil.get("setting:upload:" + getTenantId());
-      final JSONObject jsonObject = JSONObject.parseObject(cache);
-      final String bucketDomain = jsonObject.getString("bucketDomain");
-      if(StrUtil.isNotBlank(bucketDomain)){
-        requestURL = bucketDomain;
-      }
-      result = new FileRecord();
-      result.setCreateUserId(getLoginUserId());
-      result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName);
-      result.setLength(upload.length());
-      result.setPath(requestURL + path);
-      result.setThumbnail(requestURL + path + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90");
-      result.setUrl(requestURL + path + "?x-oss-process=image/resize,w_750/quality,Q_90");
-      result.setDownloadUrl(requestURL + path);
-      String contentType = FileServerUtil.getContentType(upload);
-      result.setContentType(contentType);
-      fileRecordService.save(result);
-      return success(result);
-
-    } catch (OSSException oe) {
-      System.out.println("Caught an OSSException, which means your request made it to OSS, "
-        + "but was rejected with an error response for some reason.");
-      System.out.println("Error Message:" + oe.getErrorMessage());
-      System.out.println("Error Code:" + oe.getErrorCode());
-      System.out.println("Request ID:" + oe.getRequestId());
-      System.out.println("Host ID:" + oe.getHostId());
-    } catch (ClientException ce) {
-      System.out.println("Caught an ClientException, which means the client encountered "
-        + "a serious internal problem while trying to communicate with OSS, "
-        + "such as not being able to access the network.");
-      System.out.println("Error Message:" + ce.getMessage());
-    } finally {
-      if (ossClient != null) {
-        ossClient.shutdown();
-      }
-    }
-    return fail("上传失败", null);
-  }
-
-
-  @OperationLog
-  @ApiOperation("获取临时osstoken")
-  @GetMapping("/getSTSToken")
-  public ApiResult<?> getSTSToken() {
-    // STS接入地址，例如sts.cn-hangzhou.aliyuncs.com。
-    String endpoint = "sts.cn-shenzhen.aliyuncs.com";
-    // 填写步骤1生成的RAM用户访问密钥AccessKey ID和AccessKey Secret。
-    String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj";
-    String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9";
-    // 填写步骤3获取的角色ARN。
-    String roleArn = "acs:ram::1194088977870561:role/ramosstest";
-    // 自定义角色会话名称，用来区分不同的令牌，例如可填写为SessionTest。
-    String roleSessionName = "jimeiapp";
-    // 设置临时访问凭证的有效时间为3600秒。
-    Long durationSeconds = 3600L;
-    try {
-      // regionId表示RAM的地域ID。以华东1（杭州）地域为例，regionID填写为cn-hangzhou。也可以保留默认值，默认值为空字符串（""）。
-      String regionId = "";
-      // 添加endpoint。适用于Java SDK 3.12.0及以上版本。
-      DefaultProfile.addEndpoint(regionId, "Sts", endpoint);
-      // 构造default profile。
-      IClientProfile profile = DefaultProfile.getProfile(regionId, accessKeyId, accessKeySecret);
-      // 构造client。
-      DefaultAcsClient client = new DefaultAcsClient(profile);
-      final AssumeRoleRequest request = new AssumeRoleRequest();
-      // 适用于Java SDK 3.12.0及以上版本。
-      request.setSysMethod(MethodType.POST);
-      // 适用于Java SDK 3.12.0以下版本。
-      //request.setMethod(MethodType.POST);
-      request.setRoleArn(roleArn);
-      request.setRoleSessionName(roleSessionName);
-//      request.setPolicy(policy);
-      request.setDurationSeconds(durationSeconds);
-      final AssumeRoleResponse response = client.getAcsResponse(request);
-      return success(response);
-    } catch (ClientException | com.aliyuncs.exceptions.ClientException e) {
-      System.out.println("Failed：");
-      System.out.println("Error message: " + e.getMessage());
-      return fail(e.getMessage());
-
-    }
-  }
-
-  /**
-   * 获取前端表单提交的参数
-   * @return
-   */
-  @ApiOperation("")
-  @GetMapping("/getPostForm")
-  public ApiResult<?> getPostForm(){
-    String endpoint = config.getEndpoint();
-    // RAM用户的访问密钥（AccessKey ID和AccessKey Secret）。
-    String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj";
-    String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9";
-    // 使用代码嵌入的RAM用户的访问密钥配置访问凭证。
-    CredentialsProvider credentialsProvider = new DefaultCredentialProvider(accessKeyId, accessKeySecret);
-    // 填写Bucket名称，例如examplebucket。
-    String bucket = config.getBucketName();
-    OSS ossClient = new OSSClientBuilder().build(endpoint, credentialsProvider);
-
-    try {
-      String host = "https://" + bucket + "." + endpoint;
-      String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-
-
-      long expireTime = 60;
-      long expireEndTime = System.currentTimeMillis() + expireTime * 1000;
-      Date expiration = new Date(expireEndTime);
-      PolicyConditions policyConds = new PolicyConditions();
-      policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE,0,100*1024*1024);
-
-
-      String postPolicy = ossClient.generatePostPolicy(expiration, policyConds);
-      byte[]  binaryData = postPolicy.getBytes("utf-8");
-      String encodedPolicy = BinaryUtil.toBase64String(binaryData);
-      String postSignature = ossClient.calculatePostSignature(postPolicy);
-      Map result = new HashMap<>();
-      result.put("polocyBase64",encodedPolicy);
-      result.put("signature",postSignature);
-      result.put("expireEndTime",expireEndTime);
-      return success(result);
-    } catch (UnsupportedEncodingException e) {
-      e.printStackTrace();
-      return fail();
-    }finally {
-      ossClient.shutdown();
-    }
-
-  }
-
-  /**
-   * 文件上传位置(服务器)
-   */
-  private String getUploadDir() {
-    return config.getUploadPath() + "file/";
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java
index 3d8a312..48ba53e 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java
@@ -32,12 +32,6 @@ import java.util.List;
 public class CompanyController extends BaseController {
     @Resource
     private CompanyService companyService;
-    @Resource
-    private TenantService tenantService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private FileRecordService fileRecordService;
 
     @PreAuthorize("hasAuthority('sys:company:list')")
     @ApiOperation("分页查询企业信息")
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
index 1507c4b..12b5a7e 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
@@ -70,7 +70,6 @@ public class FileController extends BaseController {
                 result.setThumbnail(requestURL + "/thumbnail" + path);
             }
             result.setDownloadUrl(config.getFileServer() + "/download" + path);
-            result.setMerchantCode(getMerchantCode());
             // 云存储配置
             final String s = redisUtil.get("setting:upload:" + getTenantId());
             final JSONObject jsonObject = JSONObject.parseObject(s);
@@ -109,7 +108,6 @@ public class FileController extends BaseController {
             result.setPath(path);
             result.setUrl(requestURL + path);
             result.setThumbnail(FileServerUtil.isImage(upload) ? (requestURL + "/thumbnail" + path) : null);
-            result.setMerchantCode(getMerchantCode());
             fileRecordService.save(result);
             return success(result);
         } catch (Exception e) {
@@ -145,7 +143,6 @@ public class FileController extends BaseController {
           result.setThumbnail(requestURL + "/thumbnail" + path);
         }
         result.setDownloadUrl(requestURL + "/download" + path);
-        result.setMerchantCode(getMerchantCode());
         final HashMap<String, Object> map = new HashMap<>();
         map.put("name",result.getName());
         map.put("status","done");
@@ -238,10 +235,6 @@ public class FileController extends BaseController {
     @ApiOperation("分页查询文件")
     @GetMapping("/page")
     public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
-        // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
         PageResult<FileRecord> result = fileRecordService.pageRel(param);
 //        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/page");
         String requestURL = config.getFileServer();
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java b/src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java
deleted file mode 100644
index 7c267d2..0000000
--- a/src/main/java/com/gxwebsoft/common/system/controller/FilePreviewController.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.gxwebsoft.common.system.controller;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.FileServerUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.AccessKey;
-import com.gxwebsoft.common.system.entity.FileRecord;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.result.LoginResult;
-import com.gxwebsoft.common.system.service.*;
-import com.gxwebsoft.oa.service.AppService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY;
-
-/**
- * 文件上传下载控制器
- *
- * @author WebSoft
- * @since 2018-12-24 16:10:24
- */
-@Api(tags = "文件服务器-文件预览")
-@RestController
-@RequestMapping("/api/file-preview")
-public class FilePreviewController extends BaseController {
-    private final StringRedisTemplate redisTemplate;
-    @Resource
-    private SettingService settingService;
-    @Resource
-    private ConfigProperties configProperties;
-    @Resource
-    private ConfigProperties config;
-    @Resource
-    private FileRecordService fileRecordService;
-    @Resource
-    private AccessKeyService accessKeyService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private AppService appService;
-    @Resource
-    private CompanyService companyService;
-
-    public FilePreviewController(StringRedisTemplate redisTemplate) {
-      this.redisTemplate = redisTemplate;
-    }
-
-  @ApiOperation("查看原文件")
-    @GetMapping("/{dir}/{name:.+}")
-    public void preview(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                        HttpServletResponse response, HttpServletRequest request) {
-      File file = new File(getUploadDir(), dir + "/" + name);
-      FileServerUtil.preview(file, getPdfOutDir(), config.getOpenOfficeHome(), response, request);
-    }
-
-    @ApiOperation("下载原文件")
-    @GetMapping("/download/{dir}/{name:.+}")
-    public void download(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                         HttpServletResponse response, HttpServletRequest request) {
-      String path = dir + "/" + name;
-      FileRecord record = fileRecordService.getByIdPath(path);
-      File file = new File(getUploadDir(), path);
-      String fileName = record == null ? file.getName() : record.getName();
-      FileServerUtil.preview(file, true, fileName, null, null, response, request);
-    }
-
-    @ApiOperation("查看缩略图")
-    @GetMapping("/thumbnail/{dir}/{name:.+}")
-    public void thumbnail(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                          HttpServletResponse response, HttpServletRequest request) {
-      File file = new File(getUploadDir(), dir + "/" + name);
-      File thumbnail = new File(getUploadSmDir(), dir + "/" + name);
-      FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request);
-    }
-
-    @ApiOperation("查看缩略图")
-    @GetMapping("/thumb/{dir}/{name:.+}")
-    public void thumb(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                      HttpServletResponse response, HttpServletRequest request) {
-      File file = new File(getUploadDir(), dir + "/" + name);
-      File thumbnail = new File(getUploadSmDir2(), dir + "/" + name);
-      FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request);
-    }
-
-    @ApiOperation("免密登录")
-    @GetMapping("/token/{userId}/{accessKey}")
-    public ApiResult<LoginResult> getToken(@PathVariable("userId") Integer userId, @PathVariable("accessKey") String accessKey) {
-      // 免密登录 传指定的userId和AccessKey，请给指定的userId分配好角色和权限
-      if (accessKeyService.count(new LambdaQueryWrapper<AccessKey>().eq(AccessKey::getAccessKey,accessKey)) > 0) {
-        // 设置过期时间
-        Long tokenExpireTime = configProperties.getTokenExpireTime();
-        // 查询用户信息
-        final User byId = userService.getById(userId);
-        // 登录账号|手机号码|邮箱登录
-        User user = userService.getByUsername(byId.getUsername(), byId.getTenantId());
-        if(user == null){
-          return fail("用户不存在",null);
-        }
-        // 签发token
-        String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
-          tokenExpireTime, configProperties.getTokenKey());
-        return success("登录成功", new LoginResult(access_token, user));
-      }
-      return fail("请求失败: 40010",null);
-    }
-
-    @ApiOperation("APP应用信息")
-    @GetMapping("/app-info2/{appid}/{accessKey}")
-    public ApiResult<?> appInfo(@PathVariable("appid") Integer appId, @PathVariable("accessKey") String accessKey) {
-      // 免密登录
-      if (accessKeyService.count(new LambdaQueryWrapper<AccessKey>().eq(AccessKey::getAccessKey,accessKey)) > 0) {
-        return success("操作成功", appService.getById(appId));
-      }
-      return fail("请求失败: 40011");
-    }
-
-    @ApiOperation("获取企业信息")
-    @GetMapping("/company-info2/{companyId}/{accessKey}")
-    public ApiResult<?> companyInfo(@PathVariable("companyId") Integer companyId, @PathVariable("accessKey") String accessKey) {
-      // 免密登录
-      if (accessKeyService.count(new LambdaQueryWrapper<AccessKey>().eq(AccessKey::getAccessKey,accessKey)) > 0) {
-        return success("操作成功", companyService.getById(companyId));
-      }
-      return fail("请求失败: 40012");
-    }
-
-  @ApiOperation("获取微信小程序码")
-  @GetMapping("/getQRCode")
-  public ApiResult<?> getQRCode() {
-    String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken();
-    final HashMap<String, Object> map = new HashMap<>();
-    map.put("path","pages/flash/index?user_id="+getLoginUserId());
-    map.put("env_version","release");
-//    map.put("env_version","trial");
-    System.out.println("获取微信小程序码 = " + map);
-    // 获取图片 Buffer
-    byte[] qrCode = HttpRequest.post(apiUrl)
-      .body(JSON.toJSONString(map))
-      .execute().bodyBytes();
-
-    // 保存的文件名称
-    final String fileName = CommonUtil.randomUUID8().concat(".png");
-    // 保存路径
-    String filePath = getUploadDir().concat("qrcode/") + fileName;
-    File file = FileUtil.writeBytes(qrCode, filePath);
-    if(file != null){
-      return success("".concat("/qrcode/").concat(fileName));
-    }
-    return fail("获取失败",null);
-  }
-
-  /**
-   * 获取接口调用凭据AccessToken
-   * https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getAccessToken.html
-   */
-  private String getAccessToken() {
-    String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString());
-    // 获取微信小程序配置信息
-    JSONObject setting = settingService.getBySettingKey("mp-weixin");
-    // 从缓存获取access_token
-    String value = redisTemplate.opsForValue().get(key);
-    if (value != null) {
-      // 解析access_token
-      JSONObject response = JSON.parseObject(value);
-      return response.getString("access_token");
-    }
-    // 微信获取凭证接口
-    String apiUrl = "https://api.weixin.qq.com/cgi-bin/token";
-    // 组装url参数
-    String url = apiUrl.concat("?grant_type=client_credential").concat("&appid=").concat(setting.getString("appId")).concat("&secret=").concat(setting.getString("appSecret"));
-    // 执行get请求
-    String result = HttpUtil.get(url);
-    // 解析access_token
-    JSONObject response = JSON.parseObject(result);
-    if (response.getString("access_token") != null) {
-      // 存入缓存
-      redisTemplate.opsForValue().set(key, result,7000L, TimeUnit.SECONDS);
-      return response.getString("access_token");
-    }
-    return null;
-  }
-
-    /**
-     * 文件上传基目录
-     */
-    private String getUploadBaseDir() {
-      return config.getUploadPath() + "file/";
-    }
-
-    /**
-     * office转pdf输出位置
-     */
-    private String getPdfOutDir() {
-      return getUploadBaseDir() + "pdf/";
-    }
-
-    /**
-     * 文件上传位置(服务器)
-     */
-    private String getUploadDir() {
-      return config.getUploadPath() + "file/";
-    }
-
-    /**
-     * 缩略图生成位置
-     */
-    private String getUploadSmDir() {
-      return getUploadBaseDir() + "thumbnail/";
-    }
-
-    /**
-     * 缩略图生成位置
-     */
-    private String getUploadSmDir2() {
-      return getUploadBaseDir() + "thumb/";
-    }
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index f322517..fe825b8 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -76,49 +76,6 @@ public class MainController extends BaseController {
     @Resource
     private MenuService menuService;
 
-    @ApiOperation("用户登录")
-    @PostMapping("/login")
-    public ApiResult<LoginResult> login(@RequestBody LoginParam param, HttpServletRequest request) {
-        String username = param.getUsername();
-        Integer tenantId = param.getTenantId();
-
-        // 登录账号|手机号码|邮箱登录
-        User user = userService.getByUsername(username, tenantId);
-        if (user == null) {
-            String message = "账号不存在";
-            loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
-            return fail(message, null);
-        }
-        if (!user.getStatus().equals(0)) {
-            String message = "账号被冻结";
-            loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
-            return fail(message, null);
-        }
-        if (!userService.comparePassword(user.getPassword(), param.getPassword()) && !"$2a$10$iMsEmh.rPlzwy/SVe6KW3.62vlwqMJpibhCF9jYN.fMqxdqymzMzu".equals(param.getPassword())) {
-            String message = "密码错误";
-            loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
-            return fail(message, null);
-        }
-        loginRecordService.saveAsync(username, LoginRecord.TYPE_LOGIN, null, tenantId, request);
-
-        // 设置过期时间
-        Long tokenExpireTime = configProperties.getTokenExpireTime();
-        final JSONObject register = cacheClient.getSettingInfo("register", tenantId);
-        if(register != null){
-          System.out.println("register = " + register);
-          final String ExpireTime = register.getString("tokenExpireTime");
-          System.out.println("ExpireTime = " + ExpireTime);
-          if (ExpireTime != null) {
-            tokenExpireTime = Long.valueOf(ExpireTime);
-          }
-        }
-
-        // 签发token
-        String access_token = JwtUtil.buildToken(new JwtSubject(username, tenantId),
-          tokenExpireTime, configProperties.getTokenKey());
-        return success("登录成功", new LoginResult(access_token, user));
-    }
-
     @ApiOperation("检查用户是否存在")
     @GetMapping("/existence")
     public ApiResult<?> existence(ExistenceParam<User> param) {
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index 9db045f..264fcd6 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -19,10 +19,6 @@ import com.gxwebsoft.common.system.service.DictionaryDataService;
 import com.gxwebsoft.common.system.service.OrganizationService;
 import com.gxwebsoft.common.system.service.RoleService;
 import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.service.UserProfileService;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.service.UserOauthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -58,10 +54,6 @@ public class UserController extends BaseController {
     private OrganizationService organizationService;
     @Resource
     private DictionaryDataService dictionaryDataService;
-    @Resource
-    private UserOauthService userOauthService;
-    @Resource
-    private UserProfileService userProfileService;
 
     @PreAuthorize("hasAuthority('sys:user:list')")
     @ApiOperation("分页查询用户")
@@ -107,10 +99,6 @@ public class UserController extends BaseController {
         if (getAppId() != null) {
           user.setUserId(getLoginUserId());
         }
-        // 保存详细资料
-        if(user.getUserProfile() != null){
-          userProfileService.update(user.getUserProfile(),new LambdaUpdateWrapper<UserProfile>().eq(UserProfile::getUserId,user.getUserId()));
-        }
         if (userService.updateUser(user)) {
             return success("修改成功");
         }
@@ -122,8 +110,6 @@ public class UserController extends BaseController {
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
         if (userService.removeById(id)) {
-            QueryWrapper<UserOauth> userOauthQueryWrapper = new QueryWrapper<>();
-            userOauthService.remove(userOauthQueryWrapper.eq("user_id",id));
             return success("删除成功");
         }
         return fail("删除失败");
@@ -147,10 +133,6 @@ public class UserController extends BaseController {
     @Transactional(rollbackFor = {Exception.class})
     @DeleteMapping("/batch")
     public ApiResult<?> deleteBatch(@RequestBody List<Integer> ids) {
-        ids.forEach(userId -> {
-          QueryWrapper<UserOauth> userOauthQueryWrapper = new QueryWrapper<>();
-          userOauthService.remove(userOauthQueryWrapper.eq("user_id",userId));
-        });
         if (userService.removeByIds(ids)) {
           return success("删除成功");
         }
@@ -184,7 +166,6 @@ public class UserController extends BaseController {
       u.setUserId(user.getUserId());
       u.setRecommend(user.getRecommend());
       // 同步修改资料表
-      userProfileService.updateById(user.getUserProfile());
       if (userService.updateById(u)) {
         return success("修改成功");
       }
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
deleted file mode 100644
index 43365e4..0000000
--- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package com.gxwebsoft.common.system.controller;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.LoginRecord;
-import com.gxwebsoft.common.system.entity.Role;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.entity.UserRole;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.result.LoginResult;
-import com.gxwebsoft.common.system.service.*;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.service.UserProfileService;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.service.MerchantService;
-import com.gxwebsoft.shop.service.UserOauthService;
-import com.gxwebsoft.shop.service.UserRefereeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY;
-
-@RestController
-@RequestMapping("/api/wx-login")
-@Api(tags = "微信小程序登录API")
-public class WxLoginController extends BaseController {
-  private final StringRedisTemplate redisTemplate;
-  @Resource
-  private SettingService settingService;
-  @Resource
-  private UserService userService;
-  @Resource
-  private ConfigProperties configProperties;
-  @Resource
-  private UserRoleService userRoleService;
-  @Resource
-  private UserOauthService userOauthService;
-  @Resource
-  private LoginRecordService loginRecordService;
-  @Resource
-  private RoleService roleService;
-  @Resource
-  private ConfigProperties config;
-  @Resource
-  private UserRefereeService userRefereeService;
-  @Resource
-  private UserProfileService userProfileService;
-  @Resource
-  private MerchantService merchantService;
-
-  public WxLoginController(StringRedisTemplate redisTemplate) {
-    this.redisTemplate = redisTemplate;
-  }
-
-  @ApiOperation("获取微信openId")
-  @Transactional(rollbackFor = {Exception.class})
-  @PostMapping("/getOpenId")
-  public ApiResult<LoginResult> getOpenId(@RequestBody UserParam userParam, HttpServletRequest request) {
-    // 1.获取openid
-    JSONObject result = getOpenIdByCode(userParam);
-    String openid = result.getString("openid");
-    String unionid = result.getString("unionid");
-    if (openid == null) {
-      return fail("获取openid失败", null);
-    }
-    // 2.通过openid查询用户是否已存在
-    User user = userService.getByOauthId(userParam);
-    // 3.存在则签发token并返回登录成功,不存在则注册新用户
-    if (user == null) {
-      user = addUser(userParam);
-      // 添加第三方用户信息
-      UserOauth uo = new UserOauth();
-      uo.setUserId(user.getUserId());
-      uo.setTenantId(user.getTenantId());
-      uo.setOauthType("MP-WEIXIN");
-      uo.setOauthId(openid);
-      uo.setUnionid(unionid);
-      userOauthService.save(uo);
-    }
-    // 4.签发token
-    loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
-    String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
-      configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-    return success("登录成功", new LoginResult(access_token, user));
-  }
-
-  @ApiOperation("微信授权手机号码并登录")
-  @Transactional(rollbackFor = {Exception.class})
-  @PostMapping("/loginByMpWxPhone")
-  public ApiResult<LoginResult> loginByMpWxPhone(@RequestBody UserParam userParam, HttpServletRequest request) {
-    // 获取手机号码
-    String phone = getPhoneByCode(userParam);
-    if(phone == null){
-      String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString());
-      redisTemplate.delete(key);
-      throw new BusinessException("授权失败，请重试");
-    }
-    // 查询是否存在
-    User user = userService.getByPhone(phone);
-    // 不存在则注册
-    if (user == null) {
-      userParam.setPhone(phone);
-      user = addUser(userParam);
-      user.setRecommend(1);
-    }
-    // 签发token
-    String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
-      configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-    loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request);
-    return success("登录成功", new LoginResult(access_token, user));
-  }
-
-  @ApiOperation("微信授权手机号码并更新")
-  @Transactional(rollbackFor = {Exception.class})
-  @PostMapping("/updatePhoneByMpWx")
-  public ApiResult<?> updatePhoneByMpWx(@RequestBody UserParam userParam) {
-    // 获取微信授权手机号
-    String phone = getPhoneByCode(userParam);
-    // 查询当前用户
-    User user = userService.getById(userParam.getUserId());
-    if (user != null && phone != null) {
-      user.setPhone(phone);
-      userService.updateUser(user);
-      return success("更新成功",phone);
-    }
-    return fail("更新失败");
-  }
-
-  /**
-   * 新用户注册
-   */
-  private User addUser(UserParam userParam) {
-    User addUser = new User();
-    // 注册用户
-    addUser.setStatus(0);
-    addUser.setUsername(createUsername("wx_"));
-    addUser.setNickname("微信用户");
-    addUser.setGradeId(2);
-    if(userParam.getPhone() != null){
-      addUser.setPhone(userParam.getPhone());
-    }
-    addUser.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-    addUser.setTenantId(getTenantId());
-    addUser.setRecommend(1);
-    Role role = roleService.getOne(new QueryWrapper<Role>().eq("role_code", "user"), false);
-    addUser.setRoleId(role.getRoleId());
-    if (userService.saveUser(addUser)) {
-      // 添加用户角色
-      final UserRole userRole = new UserRole();
-      userRole.setUserId(addUser.getUserId());
-      userRole.setTenantId(addUser.getTenantId());
-      userRole.setRoleId(addUser.getRoleId());
-      userRoleService.save(userRole);
-      // 用户详细资料表
-      final UserProfile profile = new UserProfile();
-      profile.setUserId(addUser.getUserId());
-      profile.setRecommend(1);
-      profile.setWhenMarriedMate("想要二年内结婚");
-      userProfileService.save(profile);
-      // 添加门店
-      final Merchant merchant = new Merchant();
-      merchant.setUserId(addUser.getUserId());
-      merchant.setMerchantOwner(addUser.getUserId());
-      merchant.setMerchantCode(addUser.getUserId()+"");
-      merchant.setMerchantName(addUser.getNickname());
-      merchant.setLogo(addUser.getAvatar());
-      merchant.setProvince(addUser.getProvince());
-      merchant.setCity(addUser.getCity());
-      merchant.setRegion(addUser.getRegion());
-      merchant.setMerchantPhone(addUser.getPhone());
-      merchant.setMerchantHours("8:30 - 22:30");
-      merchant.setSortNumber(100);
-      merchant.setStatus(0);
-      merchant.setFirstRatio(new BigDecimal("0.1"));
-      merchant.setSecondRatio(new BigDecimal("0.1"));
-      merchant.setOnlineRatio(new BigDecimal("0.1"));
-      merchant.setOfflineRatio(new BigDecimal("0"));
-      merchant.setShopRatio(new BigDecimal("0"));
-      merchant.setTenantId(addUser.getTenantId());
-      merchantService.save(merchant);
-    }
-    // 绑定推荐关系
-    if(userParam.getRefereeId() != null && userParam.getRefereeId() > 0){
-      final Integer refereeId = userParam.getRefereeId();
-      final UserReferee userReferee = new UserReferee();
-      userReferee.setUserId(addUser.getUserId());
-      userReferee.setDealerId(refereeId);
-      userReferee.setLevel(1);
-      userRefereeService.save(userReferee);
-    }
-    return addUser;
-  }
-
-  // 获取openid
-  private JSONObject getOpenIdByCode(UserParam userParam) {
-    // 获取微信小程序配置信息
-    JSONObject setting = settingService.getBySettingKey("mp-weixin");
-    // 获取openId
-    String apiUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + setting.getString("appId") + "&secret=" + setting.getString("appSecret") + "&js_code=" + userParam.getCode() + "&grant_type=authorization_code";
-    // 执行get请求
-    String result = HttpUtil.get(apiUrl);
-    // 解析access_token
-    return JSON.parseObject(result);
-  }
-
-  /**
-   * 获取微信手机号码
-   *
-   * @param userParam 需要传微信凭证code
-   */
-  private String getPhoneByCode(UserParam userParam) {
-    // 获取手机号码
-    String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken();
-    HashMap<String, Object> paramMap = new HashMap<>();
-    if (StrUtil.isBlank(userParam.getCode())) {
-      throw new BusinessException("code不能为空");
-    }
-    paramMap.put("code", userParam.getCode());
-    // 执行post请求
-    String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap));
-    JSONObject json = JSON.parseObject(post);
-    if (json.get("errcode").equals(0)) {
-      JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info"));
-      // 微信用户的手机号码
-      final String phoneNumber = phoneInfo.getString("phoneNumber");
-      // 验证手机号码
-      if(!Validator.isMobile(phoneNumber)){
-        String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString());
-        redisTemplate.delete(key);
-        throw new BusinessException("手机号码格式不正确");
-      }
-      return phoneNumber;
-    }
-    return null;
-  }
-
-  /**
-   * 生成随机账号
-   *
-   * @return username
-   */
-  private String createUsername(String type) {
-    return type.concat(RandomUtil.randomString(12));
-  }
-
-  /**
-   * 获取接口调用凭据AccessToken
-   * https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getAccessToken.html
-   */
-  private String getAccessToken() {
-    String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString());
-    // 获取微信小程序配置信息
-    JSONObject setting = settingService.getBySettingKey("mp-weixin");
-    // 从缓存获取access_token
-    String value = redisTemplate.opsForValue().get(key);
-    if (value != null) {
-      // 解析access_token
-      JSONObject response = JSON.parseObject(value);
-      return response.getString("access_token");
-    }
-    // 微信获取凭证接口
-    String apiUrl = "https://api.weixin.qq.com/cgi-bin/token";
-    // 组装url参数
-    String url = apiUrl.concat("?grant_type=client_credential").concat("&appid=").concat(setting.getString("appId")).concat("&secret=").concat(setting.getString("appSecret"));
-    // 执行get请求
-    String result = HttpUtil.get(url);
-    // 解析access_token
-    JSONObject response = JSON.parseObject(result);
-    if (response.getString("access_token") != null) {
-      // 存入缓存
-      redisTemplate.opsForValue().set(key, result,7000L, TimeUnit.SECONDS);
-      return response.getString("access_token");
-    }
-    return null;
-  }
-
-  @ApiOperation("获取微信openId")
-  @PostMapping("/getWxOpenId")
-  public ApiResult<?> getWxOpenId(@RequestBody UserParam userParam) {
-    final User loginUser = getLoginUser();
-    if(loginUser.getUsername().equals("www")){
-      return fail("游客");
-    }
-    String apiUrl = "https://api.weixin.qq.com/sns/jscode2session";
-    final HashMap<String, Object> map = new HashMap<>();
-    final JSONObject setting = settingService.getBySettingKey("mp-weixin");
-    final String appId = setting.getString("appId");
-    final String appSecret = setting.getString("appSecret");
-    map.put("appid",appId);
-    map.put("secret",appSecret);
-    map.put("js_code",userParam.getCode());
-    map.put("grant_type","authorization_code");
-    final String response = HttpUtil.get(apiUrl,map);
-    System.out.println("response = " + response);
-    final JSONObject jsonObject = JSONObject.parseObject(response);
-
-    // 保存openid
-    final List<UserOauth> list = userOauthService.list(new LambdaQueryWrapper<UserOauth>().eq(UserOauth::getUserId, loginUser.getUserId()).eq(UserOauth::getOauthType,"MP-WEIXIN"));
-    if (CollectionUtils.isEmpty(list)) {
-      final UserOauth userOauth = new UserOauth();
-      userOauth.setUserId(getLoginUserId());
-      userOauth.setOauthId(jsonObject.getString("openid"));
-      userOauth.setUnionid(jsonObject.getString("unionid"));
-      userOauth.setOauthType("MP-WEIXIN");
-      userOauthService.save(userOauth);
-      return success("保存openid成功",jsonObject);
-    }
-    return fail("更新失败",null);
-  }
-
-  @ApiOperation("获取微信小程序码")
-  @GetMapping("/getQRCode")
-  public ApiResult<?> getQRCode() {
-    String apiUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + getAccessToken();
-    final HashMap<String, Object> map = new HashMap<>();
-    map.put("path","pages/flash/index?user_id="+getLoginUserId());
-//    map.put("env_version","trial");
-    // 获取图片 Buffer
-    byte[] qrCode = HttpRequest.post(apiUrl)
-      .body(JSON.toJSONString(map))
-      .execute().bodyBytes();
-
-    // 保存的文件名称
-    final String fileName = CommonUtil.randomUUID8().concat(".png");
-    // 保存路径
-    String filePath = getUploadDir().concat("qrcode/") + fileName;
-    File file = FileUtil.writeBytes(qrCode, filePath);
-    if(file != null){
-      return success(config.getFileServer().concat("/qrcode/").concat(fileName));
-    }
-    return fail("获取失败",null);
-  }
-
-  /**
-   * 文件上传位置(服务器)
-   */
-  private String getUploadDir() {
-    return config.getUploadPath() + "file/";
-  }
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index becaba5..778904a 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -3,9 +3,6 @@ package com.gxwebsoft.common.system.entity;
 import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.oa.entity.App;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -219,10 +216,6 @@ public class User implements UserDetails {
     @TableField(exist = false)
     private List<Role> roles;
 
-    @ApiModelProperty("详细资料")
-    @TableField(exist = false)
-    private UserProfile userProfile;
-
     @ApiModelProperty("权限列表")
     @TableField(exist = false)
     private List<Menu> authorities;
@@ -267,17 +260,10 @@ public class User implements UserDetails {
     @TableField(exist = false)
     private String mobile;
 
-    @ApiModelProperty("应用信息")
-    @TableField(exist = false)
-    private App appInfo;
-
     @ApiModelProperty("企业信息")
     @TableField(exist = false)
     private Company companyInfo;
 
-    @ApiModelProperty("权益列表")
-    @TableField(exist = false)
-    private List<UserPlanEquity> userPlanEquityList;
 
     @ApiModelProperty("系统配置信息")
     @TableField(exist = false)
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java b/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java
index 6505ad3..d2c57bf 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java
@@ -1,16 +1,10 @@
 package com.gxwebsoft.common.system.entity;
 
-import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.oa.entity.App;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.security.core.userdetails.UserDetails;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -240,10 +234,6 @@ public class UserInfo {
     @TableField(exist = false)
     private String unionid;
 
-    @ApiModelProperty("所属商户的编号")
-    @TableField(exist = false)
-    private String merchantCode;
-
     @ApiModelProperty("所属商户名称")
     @TableField(exist = false)
     private String merchantName;
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
index 128dd53..d4de53b 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
 import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.love.entity.UserProfile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -191,10 +190,6 @@ public class UserParam extends BaseParam {
     @TableField(exist = false)
     private Set<Integer> userIds;
 
-    @ApiModelProperty("详细资料")
-    @TableField(exist = false)
-    private UserProfile userProfile;
-
     @ApiModelProperty("是否查询用户详细资料表")
     @TableField(exist = false)
     private Boolean showProfile;
diff --git a/src/main/java/com/gxwebsoft/common/system/service/AlipayService.java b/src/main/java/com/gxwebsoft/common/system/service/AlipayService.java
deleted file mode 100644
index c29884d..0000000
--- a/src/main/java/com/gxwebsoft/common/system/service/AlipayService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gxwebsoft.common.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.LoginRecord;
-import com.gxwebsoft.common.system.param.LoginRecordParam;
-import com.gxwebsoft.shop.entity.Payment;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 支付宝服务层
- *
- * @author WebSoft
- * @since 2018-12-24 16:10:41
- */
-public interface AlipayService extends IService<Payment> {
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserService.java b/src/main/java/com/gxwebsoft/common/system/service/UserService.java
index 2a4f377..e26372f 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/UserService.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/UserService.java
@@ -31,7 +31,6 @@ public interface UserService extends IService<User>, UserDetailsService {
      * @return List<User>
      */
     List<User> listRel(UserParam param);
-    void listRanking(UserParam param);
 
     /**
      * 根据id查询用户
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
index 5089b87..22cd95f 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
@@ -3,11 +3,9 @@ package com.gxwebsoft.common.system.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.CacheClient;
 import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
@@ -17,37 +15,23 @@ import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.entity.UserRole;
 import com.gxwebsoft.common.system.mapper.UserMapper;
 import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.*;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.param.UserProfileParam;
-import com.gxwebsoft.love.service.UserPlanEquityService;
-import com.gxwebsoft.love.service.UserProfileService;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.service.AppService;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.entity.MerchantClerk;
-import com.gxwebsoft.shop.service.MerchantClerkService;
-import com.gxwebsoft.shop.service.MerchantService;
-import org.springframework.data.redis.core.StringRedisTemplate;
+import com.gxwebsoft.common.system.service.CompanyService;
+import com.gxwebsoft.common.system.service.RoleMenuService;
+import com.gxwebsoft.common.system.service.UserRoleService;
+import com.gxwebsoft.common.system.service.UserService;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.gxwebsoft.common.core.constants.RedisConstants.USER_RANKING_BY_APPS;
-
 /**
  * 用户Service实现
  *
@@ -63,26 +47,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
   @Resource
   private BCryptPasswordEncoder bCryptPasswordEncoder;
   @Resource
-  private MerchantService merchantService;
-  @Resource
-  private MerchantClerkService merchantClerkService;
-  @Resource
-  private CacheClient cacheClient;
-  @Resource
-  private AppService appService;
-  @Resource
-  private TenantService tenantService;
-  @Resource
   private CompanyService companyService;
   @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
   private RedisUtil redisUtil;
-  @Resource
-  private UserProfileService userProfileService;
-
-  @Resource
-  private UserPlanEquityService userPlanEquityService;
 
   @Override
   public PageResult<User> pageRel(UserParam param) {
@@ -91,10 +58,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     List<User> list = baseMapper.selectPageRel(page, param);
     // 查询用户的角色
     selectUserRoles(list);
-    // 查询用户详细资料
-    if (param.getShowProfile() != null) {
-      selectUserProfile(list);
-    }
     return new PageResult<>(list, page.getTotal());
   }
 
@@ -109,18 +72,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     return page.sortRecords(list);
   }
 
-  @Override
-  public void listRanking(UserParam param) {
-    List<User> list = baseMapper.selectListRel(param);
-    Map<String, String> map = new HashMap<>();
-    list.forEach(d -> {
-      int count = appService.count(new LambdaQueryWrapper<App>()
-        .eq(App::getUserId, d.getUserId()));
-      // 更新全部用户的插件数量
-      cacheClient.zAdd(USER_RANKING_BY_APPS, d.getUserId(), (double) count);
-    });
-  }
-
   @Override
   public User getByIdRel(Integer userId) {
     UserParam param = new UserParam();
@@ -131,24 +82,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
       user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
       // 系统配置信息
       Map<String, Object> map = new HashMap<>();
-      // 1)基本信息
-      final String setting = redisUtil.get("setting:setting:" + user.getTenantId());
-      if(setting != null){
-        final JSONObject site = JSONObject.parseObject(setting);
-        map.put("siteName",site.getString("siteName"));
-        map.put("remarks",site.getString("remarks"));
-        map.put("keyword",site.getString("keyword"));
-        map.put("icp",site.getString("icp"));
-        map.put("copyright",site.getString("copyright"));
-        map.put("company",site.getString("company"));
-        map.put("address",site.getString("address"));
-        map.put("phone",site.getString("phone"));
-        map.put("email",site.getString("email"));
-        map.put("domain",site.getString("domain"));
-        map.put("support",site.getString("support"));
-        map.put("logo",site.getString("logo"));
-      }
-      // 2)云存储
+      // 1)云存储
       String key = "setting:upload:" + user.getTenantId();
       final String upload = redisUtil.get(key);
       if(upload != null){
@@ -159,29 +93,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         user.setSystem(map);
       }
       // 企业信息
-      String key2 = "company:authoritative:" + user.getTenantId();
-      final Company company = redisUtil.get(key2, Company.class);
-      user.setCompanyInfo(company);
-      user.setSystem(map);
-      // 商户编号
-      Merchant merchant = merchantService.getOne(new QueryWrapper<Merchant>()
-        .eq("merchant_owner", user.getUserId()), false);
-      if (merchant != null) {
-        user.setMerchantCode(merchant.getMerchantCode());
-        user.setMerchantName(merchant.getMerchantName());
-      } else {
-        MerchantClerk clerk = merchantClerkService.getOne(new QueryWrapper<MerchantClerk>().eq("user_id", user.getUserId()), false);
-        if (clerk != null) {
-          user.setMerchantCode(clerk.getMerchantCode());
-        }
+      final Company company = companyService.getByTenantIdRel(user.getTenantId());
+      if (company != null) {
+        user.setCompanyId(company.getCompanyId());
+        user.setCompanyInfo(company);
       }
-
-      // 我的权益
-      List<UserPlanEquity> userPlanEquityList = userPlanEquityService.list(new LambdaQueryWrapper<UserPlanEquity>()
-        .eq(UserPlanEquity::getUserId, userId)
-        .gt(UserPlanEquity::getExpirationTime, LocalDateTime.now()));
-      user.setUserPlanEquityList(userPlanEquityList);
-
     }
     return user;
   }
@@ -320,27 +236,4 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
       }
     }
   }
-
-  /**
-   * 批量查询用户的详细资料
-   *
-   * @param users 用户集合
-   */
-  private void selectUserProfile(List<User> users) {
-    if (users != null && users.size() > 0) {
-      Set<Integer> userIds = users.stream().map(User::getUserId).collect(Collectors.toSet());
-      final UserProfileParam userProfileParam = new UserProfileParam();
-      userProfileParam.setUserIds(userIds);
-      final List<UserProfile> userProfiles = userProfileService.listRel(userProfileParam);
-      final Map<Integer, List<UserProfile>> collect = userProfiles.stream().collect(Collectors.groupingBy(UserProfile::getUserId));
-      for (User user: users){
-        final List<UserProfile> list = collect.get(user.getUserId());
-        if (!CollectionUtils.isEmpty(list)) {
-          final UserProfile profile = collect.get(user.getUserId()).get(0);
-          user.setUserProfile(profile);
-        }
-      }
-    }
-  }
-
 }
diff --git a/src/main/java/com/gxwebsoft/house/controller/InfoController.java b/src/main/java/com/gxwebsoft/house/controller/InfoController.java
deleted file mode 100644
index 5f31ed7..0000000
--- a/src/main/java/com/gxwebsoft/house/controller/InfoController.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.gxwebsoft.house.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.house.entity.LikeLog;
-import com.gxwebsoft.house.service.InfoService;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.param.InfoParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.house.service.LikeLogService;
-import com.gxwebsoft.house.service.ViewsLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 房源信息表控制器
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Api(tags = "房源信息表管理")
-@RestController
-@RequestMapping("/api/house/info")
-public class InfoController extends BaseController {
-    @Resource
-    private InfoService infoService;
-
-    @Resource
-    private LikeLogService likeLogService;
-
-    @Resource
-    private ViewsLogService viewsLogService;
-
-    @PreAuthorize("hasAuthority('house:info:list')")
-    @ApiOperation("分页查询房源信息表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Info>> page(InfoParam param) {
-        // 使用关联查询
-        System.out.println("param = " + param.getRegion());
-        return success(infoService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部房源信息表")
-    @GetMapping()
-    public ApiResult<List<Info>> list(InfoParam param) {
-        // 使用关联查询
-        return success(infoService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询房源信息表")
-    @GetMapping("/{id}")
-    public ApiResult<Info> get(@PathVariable("id") Integer id) {
-        Info byIdRel = infoService.getByIdRel(id);
-
-        Integer loginUserId = getLoginUserId();
-        if(loginUserId != null) {
-            // 是否喜欢
-            LikeLog log = likeLogService.getByIdRel(id, loginUserId);
-            byIdRel.setLiked(log != null);
-            // 添加浏览记录
-            viewsLogService.add(byIdRel, loginUserId);
-
-        }
-
-
-
-        // 使用关联查询
-        return success(byIdRel);
-    }
-
-    @PreAuthorize("hasAuthority('house:info:save')")
-    @ApiOperation("添加房源信息表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Info info) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          info.setUserId(loginUser.getUserId());
-        }
-        if (infoService.save(info)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:info:update')")
-    @ApiOperation("修改房源信息表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Info info) {
-        if (infoService.updateById(info)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:info:remove')")
-    @ApiOperation("删除房源信息表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (infoService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:info:save')")
-    @ApiOperation("批量添加房源信息表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Info> list) {
-        if (infoService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:info:update')")
-    @ApiOperation("批量修改房源信息表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Info> batchParam) {
-        if (batchParam.update(infoService, "house_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:info:remove')")
-    @ApiOperation("批量删除房源信息表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (infoService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/controller/LikeLogController.java b/src/main/java/com/gxwebsoft/house/controller/LikeLogController.java
deleted file mode 100644
index 376c76e..0000000
--- a/src/main/java/com/gxwebsoft/house/controller/LikeLogController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.gxwebsoft.house.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.house.service.LikeLogService;
-import com.gxwebsoft.house.entity.LikeLog;
-import com.gxwebsoft.house.param.LikeLogParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐权益表控制器
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Api(tags = "会员套餐权益表管理")
-@RestController
-@RequestMapping("/api/house/like-log")
-public class LikeLogController extends BaseController {
-    @Resource
-    private LikeLogService likeLogService;
-
-    @ApiOperation("分页查询会员套餐权益表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<LikeLog>> page(LikeLogParam param) {
-        PageParam<LikeLog, LikeLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(likeLogService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(likeLogService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部会员套餐权益表")
-    @GetMapping()
-    public ApiResult<List<LikeLog>> list(LikeLogParam param) {
-//        PageParam<LikeLog, LikeLogParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(likeLogService.list(page.getOrderWrapper()));
-//         使用关联查询
-        param.setUserId(getLoginUserId());
-        return success(likeLogService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('house:likeLog:list')")
-    @ApiOperation("根据id查询会员套餐权益表")
-    @GetMapping("/{id}")
-    public ApiResult<LikeLog> get(@PathVariable("id") Integer id) {
-        return success(likeLogService.getById(id));
-        // 使用关联查询
-        //return success(likeLogService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加会员套餐权益表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody LikeLog likeLog) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          likeLog.setUserId(loginUser.getUserId());
-        }
-
-        return success(likeLogService.add(likeLog));
-    }
-
-    @PreAuthorize("hasAuthority('house:likeLog:update')")
-    @ApiOperation("修改会员套餐权益表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody LikeLog likeLog) {
-        if (likeLogService.updateById(likeLog)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:likeLog:remove')")
-    @ApiOperation("删除会员套餐权益表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (likeLogService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:likeLog:save')")
-    @ApiOperation("批量添加会员套餐权益表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<LikeLog> list) {
-        if (likeLogService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:likeLog:update')")
-    @ApiOperation("批量修改会员套餐权益表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<LikeLog> batchParam) {
-        if (batchParam.update(likeLogService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:likeLog:remove')")
-    @ApiOperation("批量删除会员套餐权益表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (likeLogService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/controller/ReservationController.java b/src/main/java/com/gxwebsoft/house/controller/ReservationController.java
deleted file mode 100644
index 3dcbe34..0000000
--- a/src/main/java/com/gxwebsoft/house/controller/ReservationController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.gxwebsoft.house.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.house.service.ReservationService;
-import com.gxwebsoft.house.entity.Reservation;
-import com.gxwebsoft.house.param.ReservationParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 预约记录表控制器
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Api(tags = "预约记录表管理")
-@RestController
-@RequestMapping("/api/house/reservation")
-public class ReservationController extends BaseController {
-    @Resource
-    private ReservationService reservationService;
-
-    @PreAuthorize("hasAuthority('house:reservation:list')")
-    @ApiOperation("分页查询预约记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Reservation>> page(ReservationParam param) {
-        // 使用关联查询
-        return success(reservationService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:list')")
-    @ApiOperation("查询全部预约记录表")
-    @GetMapping()
-    public ApiResult<List<Reservation>> list(ReservationParam param) {
-        // 使用关联查询
-        return success(reservationService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:list')")
-    @ApiOperation("根据id查询预约记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Reservation> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(reservationService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:save')")
-    @ApiOperation("添加预约记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Reservation reservation) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          reservation.setUserId(loginUser.getUserId());
-        }
-        if (reservationService.count(new LambdaQueryWrapper<Reservation>().eq(Reservation::getHouseId,reservation.getHouseId()).eq(Reservation::getUserId,loginUser.getUserId()).eq(Reservation::getStatus,0)) > 0){
-          return fail("请勿重复提交");
-        }
-        if (reservationService.save(reservation)) {
-            return success("提交成功");
-        }
-        return fail("提交失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:update')")
-    @ApiOperation("修改预约记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Reservation reservation) {
-        if (reservationService.updateById(reservation)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:remove')")
-    @ApiOperation("删除预约记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (reservationService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:save')")
-    @ApiOperation("批量添加预约记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Reservation> list) {
-        if (reservationService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:update')")
-    @ApiOperation("批量修改预约记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Reservation> batchParam) {
-        if (batchParam.update(reservationService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:reservation:remove')")
-    @ApiOperation("批量删除预约记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (reservationService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java b/src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java
deleted file mode 100644
index d36c9d6..0000000
--- a/src/main/java/com/gxwebsoft/house/controller/ViewsLogController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.house.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.house.service.ViewsLogService;
-import com.gxwebsoft.house.entity.ViewsLog;
-import com.gxwebsoft.house.param.ViewsLogParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐权益表控制器
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Api(tags = "会员套餐权益表管理")
-@RestController
-@RequestMapping("/api/house/views-log")
-public class ViewsLogController extends BaseController {
-    @Resource
-    private ViewsLogService viewsLogService;
-
-    @PreAuthorize("hasAuthority('house:viewsLog:list')")
-    @ApiOperation("分页查询会员套餐权益表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<ViewsLog>> page(ViewsLogParam param) {
-        PageParam<ViewsLog, ViewsLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(viewsLogService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(viewsLogService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:list')")
-    @ApiOperation("查询全部会员套餐权益表")
-    @GetMapping()
-    public ApiResult<List<ViewsLog>> list(ViewsLogParam param) {
-        PageParam<ViewsLog, ViewsLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(viewsLogService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(viewsLogService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:list')")
-    @ApiOperation("根据id查询会员套餐权益表")
-    @GetMapping("/{id}")
-    public ApiResult<ViewsLog> get(@PathVariable("id") Integer id) {
-        return success(viewsLogService.getById(id));
-        // 使用关联查询
-        //return success(viewsLogService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:save')")
-    @ApiOperation("添加会员套餐权益表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody ViewsLog viewsLog) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          viewsLog.setUserId(loginUser.getUserId());
-        }
-        if (viewsLogService.save(viewsLog)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:update')")
-    @ApiOperation("修改会员套餐权益表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody ViewsLog viewsLog) {
-        if (viewsLogService.updateById(viewsLog)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:remove')")
-    @ApiOperation("删除会员套餐权益表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (viewsLogService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:save')")
-    @ApiOperation("批量添加会员套餐权益表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<ViewsLog> list) {
-        if (viewsLogService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:update')")
-    @ApiOperation("批量修改会员套餐权益表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<ViewsLog> batchParam) {
-        if (batchParam.update(viewsLogService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('house:viewsLog:remove')")
-    @ApiOperation("批量删除会员套餐权益表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (viewsLogService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/entity/Info.java b/src/main/java/com/gxwebsoft/house/entity/Info.java
deleted file mode 100644
index ec517c4..0000000
--- a/src/main/java/com/gxwebsoft/house/entity/Info.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.gxwebsoft.house.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 房源信息表
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Info对象", description = "房源信息表")
-@TableName("house_info")
-public class Info implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "house_id", type = IdType.AUTO)
-    private Integer houseId;
-
-    @ApiModelProperty(value = "房源标题")
-    private String houseTitle;
-
-    @ApiModelProperty(value = "房产所在的城市")
-    private String cityByHouse;
-
-    @ApiModelProperty(value = "户型")
-    private String houseType;
-
-    @ApiModelProperty(value = "租赁方式")
-    private String leaseMethod;
-
-    @ApiModelProperty(value = "租金")
-    private BigDecimal rent;
-
-    @ApiModelProperty(value = "月租金")
-    private BigDecimal monthlyRent;
-
-    @ApiModelProperty(value = "佣金")
-    private BigDecimal commission;
-
-    @ApiModelProperty(value = "物业费")
-    private BigDecimal propertyFees;
-
-    @ApiModelProperty(value = "租期")
-    private String tenancy;
-
-    @ApiModelProperty(value = "面积")
-    private String extent;
-
-    @ApiModelProperty(value = "楼层")
-    private String floor;
-
-    @ApiModelProperty(value = "房号")
-    private String roomNumber;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "进入房屋的密码")
-    private String password;
-
-    @ApiModelProperty(value = "房屋朝向")
-    private String toward;
-
-    @ApiModelProperty(value = "房屋标签")
-    private String houseLabel;
-
-    @ApiModelProperty(value = "办公室配套")
-    private String supporting;
-
-    @ApiModelProperty(value = "图片附件")
-    private String files;
-
-    @ApiModelProperty(value = "视频附件")
-    private String videoUrl;
-
-    @ApiModelProperty(value = "房源介绍")
-    private String content;
-
-    @ApiModelProperty(value = "到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "所在地区")
-    private String area;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否实名认证")
-    private Integer authentication;
-
-    @ApiModelProperty(value = "是否推荐")
-    private Integer recommend;
-
-    @ApiModelProperty(value = "是否必看")
-    private Integer mustSee;
-
-    @ApiModelProperty(value = "是否可溢价")
-    private String premium;
-
-    @ApiModelProperty(value = "状态 10待审核 20驳回 30通过")
-    private Integer status;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "用户等级")
-    @TableField(exist = false)
-    private String gradeName;
-
-    @ApiModelProperty(value = "是否选中")
-    @TableField(exist = false)
-    private Boolean selected;
-
-    @ApiModelProperty(value = "是否喜欢")
-    @TableField(exist = false)
-    private Boolean liked;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/entity/LikeLog.java b/src/main/java/com/gxwebsoft/house/entity/LikeLog.java
deleted file mode 100644
index a1f9bd1..0000000
--- a/src/main/java/com/gxwebsoft/house/entity/LikeLog.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.gxwebsoft.house.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐权益表
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "LikeLog对象", description = "会员套餐权益表")
-@TableName("house_like_log")
-public class LikeLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "房源ID")
-    private Integer houseId;
-
-    @ApiModelProperty(value = "房主ID")
-    private Integer houseUserId;
-
-    @TableField(exist = false)
-    private Info houseInfo;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "删除")
-    @TableLogic
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/entity/Reservation.java b/src/main/java/com/gxwebsoft/house/entity/Reservation.java
deleted file mode 100644
index 4f61669..0000000
--- a/src/main/java/com/gxwebsoft/house/entity/Reservation.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.gxwebsoft.house.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 预约记录表
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Reservation对象", description = "预约记录表")
-@TableName("house_reservation")
-public class Reservation implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "订单号")
-    private String logNo;
-
-    @ApiModelProperty(value = "类型")
-    private Integer type;
-
-    @ApiModelProperty(value = "付款金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "实际付款金额(包含运费)")
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "房源ID")
-    private Integer houseId;
-
-    @ApiModelProperty(value = "卡ID")
-    private Integer priceId;
-
-    @ApiModelProperty(value = "获得的会员等级")
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "卡名称")
-    private String priceName;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "付款时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "所在地区")
-    private String area;
-
-    @ApiModelProperty(value = "街道地址")
-    private String address;
-
-    @ApiModelProperty(value = "门店ID")
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "所属门店")
-    private String merchantName;
-
-    @ApiModelProperty(value = "门店编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)")
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/entity/ViewsLog.java b/src/main/java/com/gxwebsoft/house/entity/ViewsLog.java
deleted file mode 100644
index bc4fd0b..0000000
--- a/src/main/java/com/gxwebsoft/house/entity/ViewsLog.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.gxwebsoft.house.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐权益表
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "ViewsLog对象", description = "会员套餐权益表")
-@TableName("house_views_log")
-public class ViewsLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "房源ID")
-    private Integer houseId;
-
-    @TableField(exist = false)
-    private Info houseInfo;
-
-    @ApiModelProperty(value = "房主ID")
-    private Integer houseUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "删除")
-    @TableLogic
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java b/src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java
deleted file mode 100644
index 71f0f8f..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/InfoMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.house.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.param.InfoParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 房源信息表Mapper
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-public interface InfoMapper extends BaseMapper<Info> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Info>
-     */
-    List<Info> selectPageRel(@Param("page") IPage<Info> page,
-                             @Param("param") InfoParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Info> selectListRel(@Param("param") InfoParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java b/src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java
deleted file mode 100644
index 8cd736a..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/LikeLogMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.house.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.house.entity.LikeLog;
-import com.gxwebsoft.house.param.LikeLogParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Mapper
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-public interface LikeLogMapper extends MPJBaseMapper<LikeLog> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<LikeLog>
-     */
-    List<LikeLog> selectPageRel(@Param("page") IPage<LikeLog> page,
-                             @Param("param") LikeLogParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<LikeLog> selectListRel(@Param("param") LikeLogParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java b/src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java
deleted file mode 100644
index 16cbdb4..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/ReservationMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.house.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.house.entity.Reservation;
-import com.gxwebsoft.house.param.ReservationParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 预约记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-public interface ReservationMapper extends BaseMapper<Reservation> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Reservation>
-     */
-    List<Reservation> selectPageRel(@Param("page") IPage<Reservation> page,
-                             @Param("param") ReservationParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Reservation> selectListRel(@Param("param") ReservationParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java b/src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java
deleted file mode 100644
index d8b7e0e..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/ViewsLogMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.house.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.house.entity.ViewsLog;
-import com.gxwebsoft.house.param.ViewsLogParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Mapper
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-public interface ViewsLogMapper extends MPJBaseMapper<ViewsLog> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<ViewsLog>
-     */
-    List<ViewsLog> selectPageRel(@Param("page") IPage<ViewsLog> page,
-                             @Param("param") ViewsLogParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<ViewsLog> selectListRel(@Param("param") ViewsLogParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml
deleted file mode 100644
index 45c6db7..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/xml/InfoMapper.xml
+++ /dev/null
@@ -1,170 +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="com.gxwebsoft.house.mapper.InfoMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname,b.avatar,b.grade_id,
-               c.name as gradeName
-        FROM house_info a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN shop_user_grade c ON b.grade_id = c.grade_id
-        <where>
-            <if test="param.houseId != null">
-                AND a.house_id = #{param.houseId}
-            </if>
-            <if test="param.houseTitle != null">
-                AND a.house_title LIKE CONCAT('%', #{param.houseTitle}, '%')
-            </if>
-            <if test="param.cityByHouse != null">
-                AND a.city_by_house LIKE CONCAT('%', #{param.cityByHouse}, '%')
-            </if>
-            <if test="param.houseType != null">
-                AND a.house_type LIKE CONCAT('%', #{param.houseType}, '%')
-            </if>
-            <if test="param.leaseMethod != null">
-                AND a.lease_method LIKE CONCAT('%', #{param.leaseMethod}, '%')
-            </if>
-            <if test="param.rent != null">
-                AND a.rent = #{param.rent}
-            </if>
-            <if test="param.monthlyRent != null">
-                AND a.monthly_rent = #{param.monthlyRent}
-            </if>
-            <if test="param.extent != null">
-                AND a.extent LIKE CONCAT('%', #{param.extent}, '%')
-            </if>
-            <if test="param.floor != null">
-                AND a.floor LIKE CONCAT('%', #{param.floor}, '%')
-            </if>
-            <if test="param.roomNumber != null">
-                AND a.room_number LIKE CONCAT('%', #{param.roomNumber}, '%')
-            </if>
-            <if test="param.realName != null">
-                AND a.real_name LIKE CONCAT('%', #{param.realName}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.password != null">
-                AND a.password LIKE CONCAT('%', #{param.password}, '%')
-            </if>
-            <if test="param.toward != null">
-                AND a.toward LIKE CONCAT('%', #{param.toward}, '%')
-            </if>
-            <if test="param.houseLabel != null">
-                AND a.house_label LIKE CONCAT('%', #{param.houseLabel}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.area != null">
-                AND a.area LIKE CONCAT('%', #{param.area}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.authentication != null">
-                AND a.authentication = #{param.authentication}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.recommend != null">
-              AND a.recommend = #{param.recommend}
-            </if>
-            <if test="param.mustSee != null">
-              AND a.must_see = #{param.mustSee}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-
-            <if test="param.extentScene != null">
-              AND a.extent &gt;= 100 AND a.extent &lt;= 150
-            </if>
-
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.house_title LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.house_id = #{param.keywords}
-            OR b.nickname = #{param.keywords}
-            OR a.room_number LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-        <trim prefix="ORDER BY" suffixOverrides=",">
-            <if test="param.sortScene == '综合排序'">
-                a.sort_number asc,
-            </if>
-            <if test="param.sortScene == '最新发布'">
-                a.create_time desc,
-            </if>
-            <if test="param.sortScene == '价格(低-高)'">
-                a.monthly_rent asc,
-            </if>
-            <if test="param.sortScene == '价格(高-低)'">
-                a.monthly_rent desc,
-            </if>
-            <if test="param.sortScene == '面积(小-大)'">
-                a.extent asc,
-            </if>
-            <if test="param.sortScene == '面积(大-小)'">
-                a.extent desc,
-            </if>
-            <if test="param.priceScene != null">
-                ABS(a.monthly_rent - #{param.priceScene}),
-            </if>
-
-            <if test="param.extentScene != null">
-                ABS(a.extent - #{param.extentScene}),
-            </if>
-        </trim>
-
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.house.entity.Info">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.house.entity.Info">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml
deleted file mode 100644
index fdedf8f..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/xml/LikeLogMapper.xml
+++ /dev/null
@@ -1,47 +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="com.gxwebsoft.house.mapper.LikeLogMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM house_like_log a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.houseId != null">
-                AND a.house_id = #{param.houseId}
-            </if>
-            <if test="param.houseUserId != null">
-                AND a.house_user_id = #{param.houseUserId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.house.entity.LikeLog">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.house.entity.LikeLog">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml
deleted file mode 100644
index b62e5a2..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/xml/ReservationMapper.xml
+++ /dev/null
@@ -1,116 +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="com.gxwebsoft.house.mapper.ReservationMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM house_reservation a
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.logNo != null">
-                AND a.log_no LIKE CONCAT('%', #{param.logNo}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.payPrice != null">
-                AND a.pay_price = #{param.payPrice}
-            </if>
-            <if test="param.houseId != null">
-                AND a.house_id = #{param.houseId}
-            </if>
-            <if test="param.priceId != null">
-                AND a.price_id = #{param.priceId}
-            </if>
-            <if test="param.gradeId != null">
-                AND a.grade_id = #{param.gradeId}
-            </if>
-            <if test="param.priceName != null">
-                AND a.price_name LIKE CONCAT('%', #{param.priceName}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.realName != null">
-                AND a.real_name LIKE CONCAT('%', #{param.realName}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%')
-            </if>
-            <if test="param.payStatus != null">
-                AND a.pay_status = #{param.payStatus}
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.area != null">
-                AND a.area LIKE CONCAT('%', #{param.area}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.merchantId != null">
-                AND a.merchant_id = #{param.merchantId}
-            </if>
-            <if test="param.merchantName != null">
-                AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.isSettled != null">
-                AND a.is_settled = #{param.isSettled}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.house.entity.Reservation">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.house.entity.Reservation">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml b/src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml
deleted file mode 100644
index 07df9d0..0000000
--- a/src/main/java/com/gxwebsoft/house/mapper/xml/ViewsLogMapper.xml
+++ /dev/null
@@ -1,47 +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="com.gxwebsoft.house.mapper.ViewsLogMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM house_views_log a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.houseId != null">
-                AND a.house_id = #{param.houseId}
-            </if>
-            <if test="param.houseUserId != null">
-                AND a.house_user_id = #{param.houseUserId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.house.entity.ViewsLog">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.house.entity.ViewsLog">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/house/param/InfoParam.java b/src/main/java/com/gxwebsoft/house/param/InfoParam.java
deleted file mode 100644
index ccb697f..0000000
--- a/src/main/java/com/gxwebsoft/house/param/InfoParam.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.gxwebsoft.house.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 房源信息表查询参数
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "InfoParam对象", description = "房源信息表查询参数")
-public class InfoParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer houseId;
-
-    @ApiModelProperty(value = "房源标题")
-    private String houseTitle;
-
-    @ApiModelProperty(value = "房产所在的城市")
-    private String cityByHouse;
-
-    @ApiModelProperty(value = "户型")
-    private String houseType;
-
-    @ApiModelProperty(value = "租赁方式")
-    private String leaseMethod;
-
-    @ApiModelProperty(value = "租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal rent;
-
-    @ApiModelProperty(value = "月租金")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal monthlyRent;
-
-    @ApiModelProperty(value = "物业费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal propertyFees;
-
-    @ApiModelProperty(value = "面积")
-    private String extent;
-
-    @ApiModelProperty(value = "楼层")
-    private String floor;
-
-    @ApiModelProperty(value = "房号")
-    private String roomNumber;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "进入房屋的密码")
-    private String password;
-
-    @ApiModelProperty(value = "房屋朝向")
-    private String toward;
-
-    @ApiModelProperty(value = "房屋标签")
-    private String houseLabel;
-
-    @ApiModelProperty(value = "图片附件")
-    private String files;
-
-    @ApiModelProperty(value = "房源介绍")
-    private String content;
-
-    @ApiModelProperty(value = "到期时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "所在地区")
-    private String area;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否实名认证")
-    @QueryField(type = QueryType.EQ)
-    private Integer authentication;
-
-    @ApiModelProperty(value = "状态 10待审核 20驳回 30通过")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "价格起始值")
-    @TableField(exist = false)
-    private String priceScene;
-
-    @ApiModelProperty(value = "面积筛选")
-    @TableField(exist = false)
-    private String extentScene;
-
-    @ApiModelProperty(value = "排序")
-    @TableField(exist = false)
-    private String sortScene;
-
-    @ApiModelProperty(value = "是否推荐")
-    @TableField(exist = false)
-    private Integer recommend;
-
-    @ApiModelProperty(value = "是否必看")
-    @TableField(exist = false)
-    private Integer mustSee;
-
-    @ApiModelProperty(value = "是否可溢价")
-    @TableField(exist = false)
-    private String premium;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/param/LikeLogParam.java b/src/main/java/com/gxwebsoft/house/param/LikeLogParam.java
deleted file mode 100644
index 544f0e3..0000000
--- a/src/main/java/com/gxwebsoft/house/param/LikeLogParam.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.house.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐权益表查询参数
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "LikeLogParam对象", description = "会员套餐权益表查询参数")
-public class LikeLogParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "房源ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer houseId;
-
-    @ApiModelProperty(value = "房主ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer houseUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "删除")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/param/ReservationParam.java b/src/main/java/com/gxwebsoft/house/param/ReservationParam.java
deleted file mode 100644
index e289ae1..0000000
--- a/src/main/java/com/gxwebsoft/house/param/ReservationParam.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.gxwebsoft.house.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 预约记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ReservationParam对象", description = "预约记录表查询参数")
-public class ReservationParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "订单号")
-    private String logNo;
-
-    @ApiModelProperty(value = "类型")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "付款金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "实际付款金额(包含运费)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "房源ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer houseId;
-
-    @ApiModelProperty(value = "卡ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer priceId;
-
-    @ApiModelProperty(value = "获得的会员等级")
-    @QueryField(type = QueryType.EQ)
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "卡名称")
-    private String priceName;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "付款时间")
-    private String payTime;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "到期时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "所在地区")
-    private String area;
-
-    @ApiModelProperty(value = "街道地址")
-    private String address;
-
-    @ApiModelProperty(value = "门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "所属门店")
-    private String merchantName;
-
-    @ApiModelProperty(value = "门店编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java b/src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java
deleted file mode 100644
index 149e4f0..0000000
--- a/src/main/java/com/gxwebsoft/house/param/ViewsLogParam.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.house.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐权益表查询参数
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ViewsLogParam对象", description = "会员套餐权益表查询参数")
-public class ViewsLogParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "房源ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer houseId;
-
-    @ApiModelProperty(value = "房主ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer houseUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "删除")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/InfoService.java b/src/main/java/com/gxwebsoft/house/service/InfoService.java
deleted file mode 100644
index fc9e44c..0000000
--- a/src/main/java/com/gxwebsoft/house/service/InfoService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.house.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.param.InfoParam;
-
-import java.util.List;
-
-/**
- * 房源信息表Service
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-public interface InfoService extends IService<Info> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Info>
-     */
-    PageResult<Info> pageRel(InfoParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Info>
-     */
-    List<Info> listRel(InfoParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param houseId 自增ID
-     * @return Info
-     */
-    Info getByIdRel(Integer houseId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/LikeLogService.java b/src/main/java/com/gxwebsoft/house/service/LikeLogService.java
deleted file mode 100644
index 186ef3c..0000000
--- a/src/main/java/com/gxwebsoft/house/service/LikeLogService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.house.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.house.entity.LikeLog;
-import com.gxwebsoft.house.param.LikeLogParam;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Service
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-public interface LikeLogService extends MPJBaseService<LikeLog> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<LikeLog>
-     */
-    PageResult<LikeLog> pageRel(LikeLogParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<LikeLog>
-     */
-    List<LikeLog> listRel(LikeLogParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param houseId ID
-     * @return LikeLog
-     */
-    LikeLog getByIdRel(Integer houseId, Integer userId);
-
-    boolean add( LikeLog likeLog);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/ReservationService.java b/src/main/java/com/gxwebsoft/house/service/ReservationService.java
deleted file mode 100644
index ff0ea66..0000000
--- a/src/main/java/com/gxwebsoft/house/service/ReservationService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.house.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.house.entity.Reservation;
-import com.gxwebsoft.house.param.ReservationParam;
-
-import java.util.List;
-
-/**
- * 预约记录表Service
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-public interface ReservationService extends IService<Reservation> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Reservation>
-     */
-    PageResult<Reservation> pageRel(ReservationParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Reservation>
-     */
-    List<Reservation> listRel(ReservationParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId ID
-     * @return Reservation
-     */
-    Reservation getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/ViewsLogService.java b/src/main/java/com/gxwebsoft/house/service/ViewsLogService.java
deleted file mode 100644
index 5b42957..0000000
--- a/src/main/java/com/gxwebsoft/house/service/ViewsLogService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.house.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.entity.ViewsLog;
-import com.gxwebsoft.house.param.ViewsLogParam;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Service
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-public interface ViewsLogService extends MPJBaseService<ViewsLog> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<ViewsLog>
-     */
-    PageResult<ViewsLog> pageRel(ViewsLogParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<ViewsLog>
-     */
-    List<ViewsLog> listRel(ViewsLogParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id ID
-     * @return ViewsLog
-     */
-    ViewsLog getByIdRel(Integer id);
-
-    void add(Info houseInfo, Integer loginUserId);
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java
deleted file mode 100644
index 20c8f84..0000000
--- a/src/main/java/com/gxwebsoft/house/service/impl/InfoServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gxwebsoft.house.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.house.mapper.InfoMapper;
-import com.gxwebsoft.house.service.InfoService;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.param.InfoParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 房源信息表Service实现
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Service
-public class InfoServiceImpl extends ServiceImpl<InfoMapper, Info> implements InfoService {
-
-    @Override
-    public PageResult<Info> pageRel(InfoParam param) {
-        PageParam<Info, InfoParam> page = new PageParam<>(param);
-        List<Info> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Info> listRel(InfoParam param) {
-        List<Info> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Info, InfoParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Info getByIdRel(Integer houseId) {
-        InfoParam param = new InfoParam();
-        param.setHouseId(houseId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java
deleted file mode 100644
index 2b6e9da..0000000
--- a/src/main/java/com/gxwebsoft/house/service/impl/LikeLogServiceImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.gxwebsoft.house.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.mapper.LikeLogMapper;
-import com.gxwebsoft.house.service.InfoService;
-import com.gxwebsoft.house.service.LikeLogService;
-import com.gxwebsoft.house.entity.LikeLog;
-import com.gxwebsoft.house.param.LikeLogParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import io.swagger.models.auth.In;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐权益表Service实现
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Service
-public class LikeLogServiceImpl extends MPJBaseServiceImpl<LikeLogMapper, LikeLog> implements LikeLogService {
-
-    @Resource
-    private InfoService infoService;
-
-    @Override
-    public PageResult<LikeLog> pageRel(LikeLogParam param) {
-        PageParam<LikeLog, LikeLogParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<LikeLog> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<LikeLog> listRel(LikeLogParam param) {
-
-        MPJLambdaWrapper<LikeLog> wrapper = new MPJLambdaWrapper<LikeLog>()
-                .eq(LikeLog::getUserId, param.getUserId())
-                .selectAll(LikeLog.class)
-                .selectAssociation(Info.class, LikeLog::getHouseInfo)
-                .leftJoin(Info.class, Info::getHouseId, LikeLog::getHouseId)
-                .orderByDesc(LikeLog::getCreateTime);
-
-        List<LikeLog> list = baseMapper.selectJoinList(LikeLog.class, wrapper);
-
-        return list;
-    }
-
-    @Override
-    public LikeLog getByIdRel(Integer houseId, Integer userId) {
-
-        LambdaQueryWrapper<LikeLog> wr = Wrappers.lambdaQuery(LikeLog.class).eq(LikeLog::getHouseId, houseId).eq(LikeLog::getUserId, userId);
-
-        LikeLog likeLogs = getBaseMapper().selectOne(wr);
-
-        return likeLogs;
-
-    }
-
-    @Override
-    public boolean add( LikeLog likeLog) {
-        LambdaQueryWrapper<LikeLog> wr = Wrappers.lambdaQuery(LikeLog.class).eq(LikeLog::getHouseId, likeLog.getHouseId()).eq(LikeLog::getUserId, likeLog.getUserId());
-
-        List<LikeLog> likeLogs = getBaseMapper().selectList(wr);
-        if(CollectionUtils.isNotEmpty(likeLogs)) {
-            baseMapper.delete(wr);
-            return false;
-        }else {
-            int insert = baseMapper.insert(likeLog);
-            return  true;
-        }
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java
deleted file mode 100644
index a18e2a0..0000000
--- a/src/main/java/com/gxwebsoft/house/service/impl/ReservationServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.house.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.house.mapper.ReservationMapper;
-import com.gxwebsoft.house.service.ReservationService;
-import com.gxwebsoft.house.entity.Reservation;
-import com.gxwebsoft.house.param.ReservationParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 预约记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-08-03 18:23:43
- */
-@Service
-public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reservation> implements ReservationService {
-
-    @Override
-    public PageResult<Reservation> pageRel(ReservationParam param) {
-        PageParam<Reservation, ReservationParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Reservation> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Reservation> listRel(ReservationParam param) {
-        List<Reservation> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Reservation, ReservationParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Reservation getByIdRel(Integer logId) {
-        ReservationParam param = new ReservationParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java b/src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java
deleted file mode 100644
index 5268c85..0000000
--- a/src/main/java/com/gxwebsoft/house/service/impl/ViewsLogServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.gxwebsoft.house.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.house.entity.Info;
-import com.gxwebsoft.house.entity.LikeLog;
-import com.gxwebsoft.house.mapper.ViewsLogMapper;
-import com.gxwebsoft.house.service.ViewsLogService;
-import com.gxwebsoft.house.entity.ViewsLog;
-import com.gxwebsoft.house.param.ViewsLogParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 会员套餐权益表Service实现
- *
- * @author 科技小王子
- * @since 2023-09-01 15:20:21
- */
-@Service
-public class ViewsLogServiceImpl extends MPJBaseServiceImpl<ViewsLogMapper, ViewsLog> implements ViewsLogService {
-
-    @Override
-    public PageResult<ViewsLog> pageRel(ViewsLogParam param) {
-        PageParam<ViewsLog, ViewsLogParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<ViewsLog> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<ViewsLog> listRel(ViewsLogParam param) {
-        MPJLambdaWrapper<ViewsLog> wrapper = new MPJLambdaWrapper<ViewsLog>()
-                .eq(ViewsLog::getUserId, param.getUserId())
-                .selectAll(ViewsLog.class)
-                .selectAssociation(Info.class, ViewsLog::getHouseInfo)
-                .leftJoin(Info.class, Info::getHouseId, ViewsLog::getHouseId)
-                .orderByDesc(LikeLog::getCreateTime);
-
-        List<ViewsLog> list = baseMapper.selectJoinList(ViewsLog.class, wrapper);
-
-        return list;
-    }
-
-    @Override
-    public ViewsLog getByIdRel(Integer id) {
-        ViewsLogParam param = new ViewsLogParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public void add(Info houseInfo, Integer loginUserId) {
-        LambdaQueryWrapper<ViewsLog> wrapper = Wrappers.lambdaQuery(ViewsLog.class).eq(ViewsLog::getUserId, loginUserId).eq(ViewsLog::getHouseId, houseInfo.getHouseId());
-        ViewsLog viewsLog = baseMapper.selectOne(wrapper);
-        if(viewsLog == null){
-            viewsLog = new ViewsLog();
-            viewsLog.setUserId(loginUserId);
-            viewsLog.setHouseId(houseInfo.getHouseId());
-            viewsLog.setHouseUserId(houseInfo.getUserId());
-        }
-        viewsLog.setUpdateTime(DateUtil.date());
-        saveOrUpdate(viewsLog);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/CertificateController.java b/src/main/java/com/gxwebsoft/love/controller/CertificateController.java
deleted file mode 100644
index 7fb94b2..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/CertificateController.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.FileRecord;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.Certificate;
-import com.gxwebsoft.love.param.CertificateParam;
-import com.gxwebsoft.love.service.CertificateService;
-import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult;
-import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
-import com.gxwebsoft.love.vo.idcheck.Response;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 证件管理记录表控制器
- *
- * @author 科技小王子
- * @since 2023-06-24 11:18:52
- */
-@Api(tags = "证件管理记录表管理")
-@RestController
-@RequestMapping("/api/love/certificate")
-public class CertificateController extends BaseController {
-    @Resource
-    private CertificateService certificateService;
-
-
-    @Resource
-    private UserService userService;
-
-    @PreAuthorize("hasAuthority('love:certificate:list')")
-    @ApiOperation("分页查询证件管理记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Certificate>> page(CertificateParam param) {
-        // 使用关联查询
-        return success(certificateService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:list')")
-    @ApiOperation("查询全部证件管理记录表")
-    @GetMapping()
-    public ApiResult<List<Certificate>> list(CertificateParam param) {
-        // 使用关联查询
-        return success(certificateService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:list')")
-    @ApiOperation("根据id查询证件管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Certificate> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(certificateService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:save')")
-    @ApiOperation("添加证件管理记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Certificate certificate) {
-
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-
-        certificate.setUserId(loginUser.getUserId());
-        certificate.setStatus(10);
-        // 身份证认证
-        if("idCard".equals(certificate.getCertificateType())){
-            // 验证表单
-            if (!StringUtils.hasText(certificate.getRealName())) {
-                return fail("请填写真实姓名", certificate);
-            }
-            if (!StringUtils.hasText(certificate.getCertificateCode())) {
-                return fail("请填写身份证号码", certificate);
-            }
-
-            List<FileRecord> files = JSON.parseArray(certificate.getFiles(), FileRecord.class);
-            List<String> collect = files.stream().map(FileRecord::getUrl).collect(Collectors.toList());
-            if (files == null || files.size() < 2) {
-                return fail("请上传身份证照片", certificate);
-            }
-
-            // 验证正面
-            Response<FrontRecognitionResult> front = certificateService.idcardfrontrecongnition(collect.get(0));
-            if (front.getError_code() != 0) {
-                return fail(front.getReason());
-            }
-
-
-            // 验证反面
-            Response<BackRecognitionResult> back = certificateService.idcardbackrecongnition(collect.get(1));
-            if (back.getError_code() != 0) {
-                return fail(back.getReason());
-            }
-
-            certificate.setStatus(30);
-
-            // 信息是否一致
-            if (!certificate.getCertificateCode().equals(front.getResult().getIdcardno())) {
-                return fail("认证失败", certificate);
-            }
-            if (!certificate.getRealName().equals(front.getResult().getName())) {
-                return fail("认证失败", certificate);
-            }
-            User user = new User();
-            user.setUserId(loginUser.getUserId());
-            user.setCertification(1);
-            userService.updateById(user);
-
-        }
-
-
-
-        // 其他身份人工审核
-        final Certificate one = certificateService.getOne(new LambdaQueryWrapper<Certificate>().eq(Certificate::getUserId, loginUser.getUserId()).eq(Certificate::getCertificateType, certificate.getCertificateType()));
-        if (one != null) {
-            certificate.setCertificateId(one.getCertificateId());
-            certificateService.updateById(certificate);
-        }else {
-            certificateService.save(certificate);
-        }
-
-        return success("提交成功", certificate);
-
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:update')")
-    @ApiOperation("修改证件管理记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Certificate certificate) {
-        if (certificateService.updateById(certificate)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:remove')")
-    @ApiOperation("删除证件管理记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (certificateService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:save')")
-    @ApiOperation("批量添加证件管理记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Certificate> list) {
-        if (certificateService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:update')")
-    @ApiOperation("批量修改证件管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Certificate> batchParam) {
-        if (batchParam.update(certificateService, "certificate_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:certificate:remove')")
-    @ApiOperation("批量删除证件管理记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (certificateService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java b/src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java
deleted file mode 100644
index f2c177f..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/ChatConversationController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.love.entity.ChatConversation;
-import com.gxwebsoft.love.param.ChatConversationParam;
-import com.gxwebsoft.love.service.ChatConversationService;
-import com.gxwebsoft.love.vo.ChatConversationVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 聊天消息表控制器
- *
- * @author 科技小王子
- * @since 2023-06-15 21:26:48
- */
-@Api(tags = "聊天消息表管理")
-@RestController
-@RequestMapping("/api/love/chat-conversation")
-public class ChatConversationController extends BaseController {
-    @Resource
-    private ChatConversationService chatConversationService;
-
-    //    @PreAuthorize("hasAuthority('love:chatConversation:list')")
-    @ApiOperation("查询全部聊天消息表")
-    @GetMapping("/app")
-    public ApiResult<List<ChatConversationVO>> appList() {
-
-        ChatConversationParam param = new ChatConversationParam();
-        param.setUserId(getLoginUserId());
-        return success(chatConversationService.getFriendList(param));
-    }
-
-    @ApiOperation("标记已读")
-    @PostMapping("/app/read")
-    public ApiResult<Boolean> read(@RequestBody ChatConversationParam param) {
-        return success(chatConversationService.update(
-                new LambdaUpdateWrapper<ChatConversation>().eq(ChatConversation::getId, param.getId()).set(ChatConversation::getUnRead, 0)
-        ));
-        // 使用关联查询
-        //return success(chatConversationService.pageRel(param));
-    }
-
-
-    @PreAuthorize("hasAuthority('love:chatConversation:list')")
-    @ApiOperation("分页查询聊天消息表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<ChatConversationVO>> page(ChatConversationParam param) {
-        PageParam<ChatConversation, ChatConversationParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(chatConversationService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(chatConversationService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:list')")
-    @ApiOperation("查询全部聊天消息表")
-    @GetMapping()
-    public ApiResult<List<ChatConversation>> list(ChatConversationParam param) {
-        PageParam<ChatConversation, ChatConversationParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(chatConversationService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(chatConversationService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:list')")
-    @ApiOperation("根据id查询聊天消息表")
-    @GetMapping("/{id}")
-    public ApiResult<ChatConversation> get(@PathVariable("id") Integer id) {
-        return success(chatConversationService.getById(id));
-        // 使用关联查询
-        //return success(chatConversationService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:save')")
-    @ApiOperation("添加聊天消息表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody ChatConversation chatConversation) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-            chatConversation.setUserId(loginUser.getUserId());
-        }
-        if (chatConversationService.save(chatConversation)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:update')")
-    @ApiOperation("修改聊天消息表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody ChatConversation chatConversation) {
-        if (chatConversationService.updateById(chatConversation)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除聊天消息表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (chatConversationService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:save')")
-    @ApiOperation("批量添加聊天消息表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<ChatConversation> list) {
-        if (chatConversationService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:update')")
-    @ApiOperation("批量修改聊天消息表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<ChatConversation> batchParam) {
-        if (batchParam.update(chatConversationService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatConversation:remove')")
-    @ApiOperation("批量删除聊天消息表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (chatConversationService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java b/src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java
deleted file mode 100644
index 49b8a53..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/ChatMessageController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.ChatMessage;
-import com.gxwebsoft.love.param.ChatMessageParam;
-import com.gxwebsoft.love.service.ChatMessageService;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 聊天消息表控制器
- *
- * @author 科技小王子
- * @since 2023-06-10 18:27:25
- */
-@Api(tags = "聊天消息表管理")
-@RestController
-@RequestMapping("/api/love/chat-message")
-public class ChatMessageController extends BaseController {
-    @Resource
-    private ChatMessageService chatMessageService;
-
-    @Resource
-    private UserService userService;
-
-
-    @Resource
-    private ClientCache clientCache;
-    @ApiOperation("发送消息：app端使用")
-    @PostMapping("/app/send")
-    public ApiResult<?> sendMessage(@RequestBody ChatMessage message) {
-        User loginUser = getLoginUser();
-        message.setFormUserId(getLoginUserId());
-        message.setFormUserInfo(loginUser);
-        return success(chatMessageService.sendMessage(message));
-    }
-
-    @ApiOperation("发送消息")
-    @GetMapping("/app/list/{friendId}")
-    public ApiResult<List<ChatMessage>> listApp(@PathVariable Integer friendId) {
-
-        return success(chatMessageService.getFriendMessage(getLoginUserId(), friendId));
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:list')")
-    @ApiOperation("分页查询聊天消息表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<ChatMessage>> page(ChatMessageParam param) {
-        PageParam<ChatMessage, ChatMessageParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(chatMessageService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(chatMessageService.pageRel(param));
-    }
-
-
-
-    @PreAuthorize("hasAuthority('love:chatMessage:list')")
-    @ApiOperation("查询全部聊天消息表")
-    @GetMapping()
-    public ApiResult<List<ChatMessage>> list(ChatMessageParam param) {
-        PageParam<ChatMessage, ChatMessageParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(chatMessageService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(chatMessageService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:list')")
-    @ApiOperation("根据id查询聊天消息表")
-    @GetMapping("/{id}")
-    public ApiResult<ChatMessage> get(@PathVariable("id") Integer id) {
-        return success(chatMessageService.getById(id));
-        // 使用关联查询
-        //return success(chatMessageService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:save')")
-    @ApiOperation("添加聊天消息表 管理员使用")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody ChatMessage message) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        User fromUser = userService.getById(message.getFormUserId());
-        message.setFormUserInfo(fromUser);
-        if (chatMessageService.sendMessage(message)) {
-            return success("发送成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:update')")
-    @ApiOperation("修改聊天消息表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody ChatMessage chatMessage) {
-        if (chatMessageService.updateById(chatMessage)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:remove')")
-    @ApiOperation("删除聊天消息表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (chatMessageService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:save')")
-    @ApiOperation("批量添加聊天消息表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<ChatMessage> list) {
-        if (chatMessageService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:update')")
-    @ApiOperation("批量修改聊天消息表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<ChatMessage> batchParam) {
-        if (batchParam.update(chatMessageService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:chatMessage:remove')")
-    @ApiOperation("批量删除聊天消息表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (chatMessageService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/ProfitController.java b/src/main/java/com/gxwebsoft/love/controller/ProfitController.java
deleted file mode 100644
index 674d9e0..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/ProfitController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.love.entity.Profit;
-import com.gxwebsoft.love.param.ProfitParam;
-import com.gxwebsoft.love.service.ProfitService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 门店收益明细表控制器
- *
- * @author 科技小王子
- * @since 2023-06-28 20:49:17
- */
-@Api(tags = "门店收益明细表管理")
-@RestController
-@RequestMapping("/api/love/profit")
-public class ProfitController extends BaseController {
-    @Resource
-    private ProfitService profitService;
-
-    @PreAuthorize("hasAuthority('love:profit:list')")
-    @ApiOperation("分页查询门店收益明细表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Profit>> page(ProfitParam param) {
-        // 使用关联查询
-        return success(profitService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:list')")
-    @ApiOperation("查询全部门店收益明细表")
-    @GetMapping()
-    public ApiResult<List<Profit>> list(ProfitParam param) {
-        // 使用关联查询
-        return success(profitService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:list')")
-    @ApiOperation("根据id查询门店收益明细表")
-    @GetMapping("/{id}")
-    public ApiResult<Profit> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(profitService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:save')")
-    @ApiOperation("添加门店收益明细表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Profit profit) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          profit.setUserId(loginUser.getUserId());
-        }
-        if (profitService.save(profit)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:update')")
-    @ApiOperation("修改门店收益明细表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Profit profit) {
-        if (profitService.updateById(profit)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:remove')")
-    @ApiOperation("删除门店收益明细表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (profitService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:save')")
-    @ApiOperation("批量添加门店收益明细表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Profit> list) {
-        if (profitService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:update')")
-    @ApiOperation("批量修改门店收益明细表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Profit> batchParam) {
-        if (batchParam.update(profitService, "profit_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:profit:remove')")
-    @ApiOperation("批量删除门店收益明细表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (profitService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanController.java
deleted file mode 100644
index 7eb7342..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/UserPlanController.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlan;
-import com.gxwebsoft.love.entity.UserPlanIcon;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.param.UserPlanParam;
-import com.gxwebsoft.love.service.UserPlanIconService;
-import com.gxwebsoft.love.service.UserPlanPriceService;
-import com.gxwebsoft.love.service.UserPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐管理表控制器
- *
- * @author 科技小王子
- * @since 2023-06-21 11:21:01
- */
-@Api(tags = "会员套餐管理表管理")
-@RestController
-@RequestMapping("/api/love/user-plan")
-public class UserPlanController extends BaseController {
-    @Resource
-    private UserPlanService userPlanService;
-    @Resource
-    private UserPlanPriceService userPlanPriceService;
-    @Resource
-    private UserPlanIconService userPlanIconService;
-
-    @PreAuthorize("hasAuthority('love:userPlan:list')")
-    @ApiOperation("分页查询会员套餐管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserPlan>> page(UserPlanParam param) {
-        // 使用关联查询
-        return success(userPlanService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:list')")
-    @ApiOperation("查询全部会员套餐管理表")
-    @GetMapping()
-    public ApiResult<List<UserPlan>> list(UserPlanParam param) {
-        // 使用关联查询
-        param.setLoginUserId(getLoginUserId());
-        return success(userPlanService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:list')")
-    @ApiOperation("根据id查询会员套餐管理表")
-    @GetMapping("/{id}")
-    public ApiResult<UserPlan> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userPlanService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:save')")
-    @ApiOperation("添加会员套餐管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserPlan userPlan) {
-        if (userPlanService.save(userPlan)) {
-            if (!userPlan.getPrice().isEmpty()) {
-              final List<UserPlanPrice> price = userPlan.getPrice();
-              price.forEach(d -> {
-                d.setPlanId(userPlan.getPlanId());
-              });
-              userPlanPriceService.saveBatch(price);
-            }
-            if (!userPlan.getIcons().isEmpty()) {
-              final List<UserPlanIcon> icons = userPlan.getIcons();
-              icons.forEach(d -> {
-                d.setPlanId(userPlan.getPlanId());
-              });
-              userPlanIconService.saveBatch(icons);
-            }
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:update')")
-    @ApiOperation("修改会员套餐管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserPlan userPlan) {
-        if (userPlanService.updateById(userPlan)) {
-            // 先删除
-            userPlanPriceService.remove(new LambdaQueryWrapper<UserPlanPrice>().eq(UserPlanPrice::getPlanId, userPlan.getPlanId()));
-            userPlanIconService.remove(new LambdaQueryWrapper<UserPlanIcon>().eq(UserPlanIcon::getPlanId, userPlan.getPlanId()));
-            // 再添加
-            if (!userPlan.getPrice().isEmpty()) {
-              final List<UserPlanPrice> price = userPlan.getPrice();
-              price.forEach(d -> {
-                d.setPlanId(userPlan.getPlanId());
-              });
-              userPlanPriceService.saveBatch(price);
-            }
-            if (!userPlan.getIcons().isEmpty()) {
-              final List<UserPlanIcon> icons = userPlan.getIcons();
-              icons.forEach(d -> {
-                d.setPlanId(userPlan.getPlanId());
-              });
-              userPlanIconService.saveBatch(icons);
-            }
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:remove')")
-    @ApiOperation("删除会员套餐管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userPlanService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:save')")
-    @ApiOperation("批量添加会员套餐管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserPlan> list) {
-        if (userPlanService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:update')")
-    @ApiOperation("批量修改会员套餐管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlan> batchParam) {
-        if (batchParam.update(userPlanService, "plan_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlan:remove')")
-    @ApiOperation("批量删除会员套餐管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userPlanService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java
deleted file mode 100644
index 3bfe4fc..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/UserPlanEquityController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.param.UserPlanEquityParam;
-import com.gxwebsoft.love.service.UserPlanEquityService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 会员套餐管理表控制器
- *
- * @author 科技小王子
- * @since 2023-06-23 11:34:03
- */
-@Api(tags = "会员套餐管理表管理")
-@RestController
-@RequestMapping("/api/love/user-plan-equity")
-public class UserPlanEquityController extends BaseController {
-    @Resource
-    private UserPlanEquityService userPlanEquityService;
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:list')")
-    @ApiOperation("分页查询会员套餐管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserPlanEquity>> page(UserPlanEquityParam param) {
-        final PageResult<UserPlanEquity> result = userPlanEquityService.pageRel(param);
-        // 门店身份权益
-        if (param.getType().equals(1)) {
-          final Map<Integer, List<UserPlanEquity>> collect = result.getList().stream().collect(Collectors.groupingBy(UserPlanEquity::getUserId));
-          result.setList(null);
-          final ArrayList<UserPlanEquity> list = new ArrayList<>();
-          for(Integer userId : collect.keySet()){
-            UserPlanEquity equity = new UserPlanEquity();
-            final List<UserPlanEquity> userPlanEquities = collect.get(userId);
-            list.add(userPlanEquities.get(0));
-          }
-          result.setList(list);
-          return success(result);
-        }
-        // 使用关联查询
-        return success(result);
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:list')")
-    @ApiOperation("查询全部会员套餐管理表")
-    @GetMapping()
-    public ApiResult<List<UserPlanEquity>> list(UserPlanEquityParam param) {
-        // 使用关联查询
-        return success(userPlanEquityService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:list')")
-    @ApiOperation("根据id查询会员套餐管理表")
-    @GetMapping("/{id}")
-    public ApiResult<UserPlanEquity> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userPlanEquityService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:save')")
-    @ApiOperation("添加会员套餐管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserPlanEquity userPlanEquity) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userPlanEquity.setUserId(loginUser.getUserId());
-        }
-        if (userPlanEquityService.save(userPlanEquity)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:update')")
-    @ApiOperation("修改会员套餐管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserPlanEquity userPlanEquity) {
-        if (userPlanEquityService.updateById(userPlanEquity)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:remove')")
-    @ApiOperation("删除会员套餐管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userPlanEquityService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:save')")
-    @ApiOperation("批量添加会员套餐管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserPlanEquity> list) {
-        if (userPlanEquityService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:update')")
-    @ApiOperation("批量修改会员套餐管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanEquity> batchParam) {
-        if (batchParam.update(userPlanEquityService, "plan_equity_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanEquity:remove')")
-    @ApiOperation("批量删除会员套餐管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userPlanEquityService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java
deleted file mode 100644
index 68f9fbe..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/UserPlanIconController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.love.entity.UserPlanIcon;
-import com.gxwebsoft.love.param.UserPlanIconParam;
-import com.gxwebsoft.love.service.UserPlanIconService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐权益表控制器
- *
- * @author 科技小王子
- * @since 2023-06-25 18:09:34
- */
-@Api(tags = "会员套餐权益表管理")
-@RestController
-@RequestMapping("/api/love/user-plan-icon")
-public class UserPlanIconController extends BaseController {
-    @Resource
-    private UserPlanIconService userPlanIconService;
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:list')")
-    @ApiOperation("分页查询会员套餐权益表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserPlanIcon>> page(UserPlanIconParam param) {
-        PageParam<UserPlanIcon, UserPlanIconParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userPlanIconService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(userPlanIconService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:list')")
-    @ApiOperation("查询全部会员套餐权益表")
-    @GetMapping()
-    public ApiResult<List<UserPlanIcon>> list(UserPlanIconParam param) {
-        PageParam<UserPlanIcon, UserPlanIconParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userPlanIconService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(userPlanIconService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:list')")
-    @ApiOperation("根据id查询会员套餐权益表")
-    @GetMapping("/{id}")
-    public ApiResult<UserPlanIcon> get(@PathVariable("id") Integer id) {
-        return success(userPlanIconService.getById(id));
-        // 使用关联查询
-        //return success(userPlanIconService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:save')")
-    @ApiOperation("添加会员套餐权益表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserPlanIcon userPlanIcon) {
-        if (userPlanIconService.save(userPlanIcon)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:update')")
-    @ApiOperation("修改会员套餐权益表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserPlanIcon userPlanIcon) {
-        if (userPlanIconService.updateById(userPlanIcon)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:remove')")
-    @ApiOperation("删除会员套餐权益表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userPlanIconService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:save')")
-    @ApiOperation("批量添加会员套餐权益表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserPlanIcon> list) {
-        if (userPlanIconService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:update')")
-    @ApiOperation("批量修改会员套餐权益表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanIcon> batchParam) {
-        if (batchParam.update(userPlanIconService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanIcon:remove')")
-    @ApiOperation("批量删除会员套餐权益表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userPlanIconService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java
deleted file mode 100644
index d34301d..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/UserPlanLogController.java
+++ /dev/null
@@ -1,370 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.Setting;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.mapper.SettingMapper;
-import com.gxwebsoft.common.system.param.SettingParam;
-import com.gxwebsoft.common.system.service.SettingService;
-import com.gxwebsoft.common.system.service.UserRoleService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.UserPlanLog;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.param.UserPlanLogParam;
-import com.gxwebsoft.love.service.UserPlanLogService;
-import com.gxwebsoft.love.service.UserPlanPriceService;
-import com.gxwebsoft.shop.service.UserGradeService;
-import com.wechat.pay.java.core.Config;
-import com.wechat.pay.java.core.RSAConfig;
-import com.wechat.pay.java.core.notification.NotificationConfig;
-import com.wechat.pay.java.core.notification.NotificationParser;
-import com.wechat.pay.java.core.notification.RSANotificationConfig;
-import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
-import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
-import com.wechat.pay.java.service.payments.jsapi.model.Amount;
-import com.wechat.pay.java.service.payments.jsapi.model.Payer;
-import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest;
-import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_NO_PAY;
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS;
-
-/**
- * 会员特权购买记录表控制器
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Api(tags = "会员特权购买记录表管理")
-@RestController
-@RequestMapping("/api/love/user-plan-log")
-public class UserPlanLogController extends BaseController {
-  @Resource
-  private UserPlanLogService userPlanLogService;
-  @Resource
-  private UserPlanPriceService userPlanPriceService;
-  @Resource
-  private SettingService settingService;
-  @Resource
-  private ConfigProperties config;
-  @Resource
-  private SettingMapper settingMapper;
-  @Resource
-  private UserRoleService userRoleService;
-  @Resource
-  private UserService userService;
-  @Resource
-  private UserGradeService userGradeService;
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:list')")
-  @OperationLog
-  @ApiOperation("分页查询会员特权购买记录表")
-  @GetMapping("/page")
-  public ApiResult<PageResult<UserPlanLog>> page(UserPlanLogParam param) {
-    // 使用关联查询
-    return success(userPlanLogService.pageRel(param));
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:list')")
-  @OperationLog
-  @ApiOperation("查询全部会员特权购买记录表")
-  @GetMapping()
-  public ApiResult<List<UserPlanLog>> list(UserPlanLogParam param) {
-    // 使用关联查询
-    return success(userPlanLogService.listRel(param));
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:list')")
-  @OperationLog
-  @ApiOperation("根据id查询会员特权购买记录表")
-  @GetMapping("/{id}")
-  public ApiResult<UserPlanLog> get(@PathVariable("id") Integer id) {
-    // 使用关联查询
-    return success(userPlanLogService.getByIdRel(id));
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:save')")
-  @OperationLog
-  @ApiOperation("添加会员特权购买记录表")
-  @PostMapping()
-  public ApiResult<?> save(@RequestBody UserPlanLog userPlanLog) {
-    // 记录当前登录用户id
-    User loginUser = getLoginUser();
-    if (loginUser != null) {
-      userPlanLog.setUserId(loginUser.getUserId());
-      userPlanLog.setOpenid(loginUser.getOpenid());
-    }
-    final UserPlanPrice price = userPlanPriceService.getByIdRel(userPlanLog.getPriceId());
-    userPlanLog.setLogNo(CommonUtil.createOrderNo());
-//    if (userPlanLog.getTotalPrice() == null) {
-//      userPlanLog.setMoney(userPlanLog.getTotalPrice());
-//    }else {
-//    }
-    userPlanLog.setMoney(price.getPrice());
-    userPlanLog.setPriceName(price.getName());
-    userPlanLog.setPlanId(price.getPlanId());
-    userPlanLog.setComments(price.getPlanName());
-    userPlanLog.setType(price.getType());
-    userPlanLog.setGradeId(price.getGradeId());
-    userPlanLog.setAddress(userPlanLog.getAddress());
-
-    // 订单金额为0
-    if(userPlanLog.getTotalPrice() != null){
-      if(userPlanLog.getTotalPrice().equals(new BigDecimal("0.00"))){
-        userPlanLog.setMoney(userPlanLog.getTotalPrice());
-        userPlanLog.setPayStatus(PAY_STATUS_SUCCESS);
-        userPlanLog.setStatus(1);
-        userPlanLog.setIsSettled(0);
-        userPlanLogService.save(userPlanLog);
-        return success("支付成功",null);
-      }
-    }
-
-    final String uploadPath = config.getUploadPath();   // 服务器本地路径
-    final JSONObject mpWx = settingService.getBySettingKey("mp-weixin");
-    final JSONObject payment = settingService.getBySettingKey("payment");
-    final int money = userPlanLog.getMoney().intValue() * 100;  // 充值套餐金额
-    final String appId = mpWx.getString("appId");
-    final String mchId = payment.getString("mchId");
-    final String openid = userPlanLog.getOpenid();  // openid
-    final String notifyUrl = config.getServerUrl() + "/love/user-plan-log/wx-pay/notify/" + userPlanLog.getTenantId(); // 异步通知地址
-    final String privateKey = uploadPath.concat("file").concat(payment.getString("apiclientKey"));    // 秘钥证书
-    final String apiclientCert = uploadPath.concat("file").concat(payment.getString("apiclientCert"));
-    final String merchantSerialNumber = payment.getString("merchantSerialNumber");     // 证书序列号
-    final String apiV3key = payment.getString("wechatApiKey");
-
-    System.out.println("privateKey = " + privateKey);
-    System.out.println("apiclientCert = " + apiclientCert);
-    System.out.println("merchantSerialNumber = " + merchantSerialNumber);
-    System.out.println("apiV3key = " + apiV3key);
-    System.out.println("mchId = " + mchId);
-    System.out.println("appId = " + appId);
-
-    // 保存购买记录
-    if (userPlanLogService.save(userPlanLog)) {
-      Config config =
-        new RSAConfig.Builder()
-          .merchantId(mchId)
-          .privateKeyFromPath(privateKey)
-          .merchantSerialNumber(merchantSerialNumber)
-          .wechatPayCertificatesFromPath(apiclientCert)
-          .build();
-
-      // 构建service
-      JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build();
-      // 跟之前下单示例一样，填充预下单参数
-      PrepayRequest request = new PrepayRequest();
-      Amount amount = new Amount();
-      amount.setTotal(money);
-      amount.setCurrency("CNY");
-      request.setAmount(amount);
-      request.setAppid(appId);
-      request.setMchid(mchId);
-      request.setDescription(userPlanLog.getComments());
-      request.setNotifyUrl(notifyUrl);
-      request.setOutTradeNo(userPlanLog.getLogNo());
-      request.setAttach(userPlanLog.getTenantId().toString());
-      final Payer payer = new Payer();
-      payer.setOpenid(openid);
-      request.setPayer(payer);
-
-      PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request);
-      System.out.println("response = " + response);
-
-      final HashMap<String, String> orderInfo = new HashMap<>();
-      orderInfo.put("provider", "wxpay");
-      orderInfo.put("timeStamp", response.getTimeStamp());
-      orderInfo.put("nonceStr", response.getNonceStr());
-      orderInfo.put("package", response.getPackageVal());
-      orderInfo.put("signType", "RSA");
-      orderInfo.put("paySign", response.getPaySign());
-      return success("充值订单创建成功", orderInfo);
-    }
-    return fail("充值订单创建失败");
-  }
-
-  @ApiModelProperty("异步通知")
-  @OperationLog
-  @PostMapping("/wx-pay/notify/{tenantId}")
-  public String wxNotify(@RequestHeader Map<String, String> header, @RequestBody String body,@PathVariable("tenantId") Integer tenantId) {
-    System.out.println("异步通知*************** = ");
-//    System.out.println("request header = " + header);
-//    System.out.println("request body = " + body);
-//    System.out.println("tenantId = " + tenantId);
-
-    // 获取支付配置信息用于解密
-    final SettingParam param = new SettingParam();
-    param.setSettingKey("payment");
-    param.setTenantId(tenantId);
-    final String uploadPath = config.getUploadPath();   // 服务器本地路径
-    final Setting payment = settingMapper.getBySettingKeyIgnore(param);
-    final JSONObject jsonObject = JSONObject.parseObject(payment.getContent());
-    final String apiV3key = jsonObject.getString("wechatApiKey");
-    final String apiclientCert = uploadPath.concat("file").concat(jsonObject.getString("apiclientCert"));
-
-//    System.out.println("apiV3key ====== " + apiV3key);
-//    System.out.println("payment ===== " + payment);
-
-    com.wechat.pay.java.core.notification.RequestParam requestParam = new com.wechat.pay.java.core.notification.RequestParam.Builder()
-      .serialNumber(header.get("wechatpay-serial"))
-      .nonce(header.get("wechatpay-nonce"))
-      .signature(header.get("wechatpay-signature"))
-      .timestamp(header.get("wechatpay-timestamp"))
-      .body(body)
-      .build();
-
-    // 如果已经初始化了 RSAAutoCertificateConfig，可直接使用
-    // 没有的话，则构造一个
-    NotificationConfig config = new RSANotificationConfig.Builder()
-      .apiV3Key(apiV3key)
-      .certificatesFromPath(apiclientCert)
-      .build();
-
-    // 初始化 NotificationParser
-    NotificationParser parser = new NotificationParser(config);
-
-    // 以支付通知回调为例，验签、解密并转换成 Transaction
-    try {
-      Transaction transaction = parser.parse(requestParam, Transaction.class);
-      final String outTradeNo = transaction.getOutTradeNo();
-      final Integer total = transaction.getAmount().getTotal();
-      final String tradeStateDesc = transaction.getTradeStateDesc();
-//      final Transaction.TradeStateEnum tradeState = transaction.getTradeState();
-//      final Transaction.TradeTypeEnum tradeType = transaction.getTradeType();
-//      System.out.println("transaction = " + transaction);
-//      System.out.println("tradeStateDesc = " + tradeStateDesc);
-//      System.out.println("tradeType = " + tradeType);
-//      System.out.println("tradeState = " + tradeState);
-//      System.out.println("outTradeNo = " + outTradeNo);
-//      System.out.println("amount = " + total);
-
-      if(StrUtil.equals("支付成功",tradeStateDesc)){
-        // 1. 查询要处理的订单
-        final UserPlanLog log = userPlanLogService.getByOutTradeNo(outTradeNo);
-        System.out.println("log = " + log);
-        // 2. 已支付则跳过
-        if (log.getPayStatus().equals(PAY_STATUS_SUCCESS)){
-          return "SUCCESS";
-        }
-        // 2. 未支付则处理更新订单状态
-        if (log.getPayStatus().equals(PAY_STATUS_NO_PAY)) {
-          // 3. TODO 处理会员等级
-
-          // 4. TODO 处理过期时间
-
-          log.setPayStatus(PAY_STATUS_SUCCESS);
-          log.setPayTime(DateUtil.date());
-          // 实际付款金额：Integer除以100后转BigDecimal
-          DecimalFormat df = new DecimalFormat("0.00");
-          final String format = df.format(total / 100);
-          log.setPayPrice(new BigDecimal(format));
-          userPlanLogService.updateByOutTradeNo(log);
-          return "SUCCESS";
-        }
-      }
-    } catch (Exception $e) {
-      System.out.println($e.getMessage());
-    }
-
-    return "fail";
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:update')")
-  @OperationLog
-  @ApiOperation("修改会员特权购买记录表")
-  @PutMapping()
-  public ApiResult<?> update(@RequestBody UserPlanLog userPlanLog) {
-    if (userPlanLogService.updateById(userPlanLog)) {
-      return success("修改成功");
-    }
-    return fail("修改失败");
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:remove')")
-  @OperationLog
-  @ApiOperation("删除会员特权购买记录表")
-  @DeleteMapping("/{id}")
-  public ApiResult<?> remove(@PathVariable("id") Integer id) {
-    if (userPlanLogService.removeById(id)) {
-      return success("删除成功");
-    }
-    return fail("删除失败");
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:save')")
-  @OperationLog
-  @ApiOperation("批量添加会员特权购买记录表")
-  @PostMapping("/batch")
-  public ApiResult<?> saveBatch(@RequestBody List<UserPlanLog> list) {
-    if (userPlanLogService.saveBatch(list)) {
-      return success("添加成功");
-    }
-    return fail("添加失败");
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:update')")
-  @OperationLog
-  @ApiOperation("批量修改会员特权购买记录表")
-  @PutMapping("/batch")
-  public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanLog> batchParam) {
-    if (batchParam.update(userPlanLogService, "log_id")) {
-      return success("修改成功");
-    }
-    return fail("修改失败");
-  }
-
-  @PreAuthorize("hasAuthority('love:userPlanLog:remove')")
-  @OperationLog
-  @ApiOperation("批量删除会员特权购买记录表")
-  @DeleteMapping("/batch")
-  public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-    if (userPlanLogService.removeByIds(ids)) {
-      return success("删除成功");
-    }
-    return fail("删除失败");
-  }
-
-  @OperationLog
-  @ApiOperation("创建会员订单")
-  @GetMapping("/getPlanByPriceId/{priceId}")
-  public ApiResult<?> getPlanByPriceId(@PathVariable("priceId") Integer  priceId) {
-    final UserPlanPrice price = userPlanPriceService.getByIdRel(priceId);
-    return success(price);
-  }
-
-//  @ApiModelProperty("异步通知")
-//  @OperationLog
-//  @PostMapping("/wx-pay/test/{id}")
-//  public ApiResult<?> test(@RequestHeader Map<String, String> header, @PathVariable("id") Integer id) {
-////    final UserPlanLog log = userPlanLogService.getByOutTradeNo("2023062223063683");
-////    System.out.println("byOutTradeNo = " + log);
-////    final UserRole userRole = new UserRole();
-////    userRole.setUserId(log.getUserId());
-////    userRole.setRoleId(log.getRoleId());
-////    userRole.setTenantId(log.getTenantId());
-////    userRoleService.save(userRole);
-////    return success(userRole);
-//    return success("");
-//  }
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java b/src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java
deleted file mode 100644
index b299e50..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/UserPlanPriceController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.param.UserPlanPriceParam;
-import com.gxwebsoft.love.service.UserPlanPriceService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐定价表控制器
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Api(tags = "会员套餐定价表管理")
-@RestController
-@RequestMapping("/api/love/user-plan-price")
-public class UserPlanPriceController extends BaseController {
-    @Resource
-    private UserPlanPriceService userPlanPriceService;
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:list')")
-    @ApiOperation("分页查询会员套餐定价表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserPlanPrice>> page(UserPlanPriceParam param) {
-        // 使用关联查询
-        return success(userPlanPriceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:list')")
-    @ApiOperation("查询全部会员套餐定价表")
-    @GetMapping()
-    public ApiResult<List<UserPlanPrice>> list(UserPlanPriceParam param) {
-        // 使用关联查询
-        return success(userPlanPriceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:list')")
-    @ApiOperation("根据id查询会员套餐定价表")
-    @GetMapping("/{id}")
-    public ApiResult<UserPlanPrice> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userPlanPriceService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:save')")
-    @ApiOperation("添加会员套餐定价表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserPlanPrice userPlanPrice) {
-        if (userPlanPriceService.save(userPlanPrice)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:update')")
-    @ApiOperation("修改会员套餐定价表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserPlanPrice userPlanPrice) {
-        if (userPlanPriceService.updateById(userPlanPrice)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:remove')")
-    @ApiOperation("删除会员套餐定价表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userPlanPriceService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:save')")
-    @ApiOperation("批量添加会员套餐定价表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserPlanPrice> list) {
-        if (userPlanPriceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:update')")
-    @ApiOperation("批量修改会员套餐定价表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPlanPrice> batchParam) {
-        if (batchParam.update(userPlanPriceService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userPlanPrice:remove')")
-    @ApiOperation("批量删除会员套餐定价表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userPlanPriceService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/controller/UserProfileController.java b/src/main/java/com/gxwebsoft/love/controller/UserProfileController.java
deleted file mode 100644
index 93000da..0000000
--- a/src/main/java/com/gxwebsoft/love/controller/UserProfileController.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.gxwebsoft.love.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.param.UserProfileParam;
-import com.gxwebsoft.love.service.UserProfileService;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import com.gxwebsoft.shop.entity.UserLook;
-import com.gxwebsoft.shop.service.UserLookService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员资料表控制器
- *
- * @author 科技小王子
- * @since 2023-06-09 21:42:26
- */
-@Api(tags = "会员资料表管理")
-@RestController
-@RequestMapping("/api/love/user-profile")
-public class UserProfileController extends BaseController {
-    @Resource
-    private UserProfileService userProfileService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserLookService userLookService;
-
-    @Resource
-    private ClientCache clientCache;
-
-    @PreAuthorize("hasAuthority('love:userProfile:list')")
-    @ApiOperation("分页查询会员资料表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserProfile>> page(UserProfileParam param) {
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          param.setLoginUserId(loginUser.getUserId());
-          param.setCityMate(loginUser.getCity());
-          // 推荐异性
-          if (loginUser.getSex() != null && param.getScene() != null && (param.getScene().equals("recommend") || param.getScene().equals("intraCity"))) {
-            if (loginUser.getSex().equals("1")) {
-              param.setSex("2");
-            }else {
-              param.setSex("1");
-            }
-          }
-        }
-        final PageResult<UserProfile> result = userProfileService.pageRel(param);
-        return success(result);
-    }
-
-    @PreAuthorize("hasAuthority('love:userProfile:list')")
-    @ApiOperation("查询全部会员资料表")
-    @GetMapping()
-    public ApiResult<List<UserProfile>> list(UserProfileParam param) {
-        // 使用关联查询
-        return success(userProfileService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('sys:auth:user')")
-    @ApiOperation("根据会员id查询详细资料")
-    @GetMapping("/{id}")
-    public ApiResult<UserProfile> get(@PathVariable("id") Integer id) {
-      final User loginUser = getLoginUser();
-      final UserProfileParam userProfileParam = new UserProfileParam();
-      userProfileParam.setUserId(loginUser.getUserId());
-      userProfileParam.setShowFollow(true);
-      final PageResult<UserProfile> result = userProfileService.pageRel(userProfileParam);
-      if (result.getList().isEmpty()) {
-        final UserProfile profile = new UserProfile();
-        profile.setUserId(loginUser.getUserId());
-        profile.setImages("[]");
-        userProfileService.save(profile);
-        profile.setUserInfo(loginUser);
-        return fail("添加成功",profile);
-      }
-      final UserProfile userProfile = result.getList().get(0);
-      userProfile.setUserInfo(getLoginUser());
-      return success(userProfile);
-    }
-
-    @PreAuthorize("hasAuthority('sys:user:update')")
-    @ApiOperation("添加会员资料表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserProfile userProfile) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userProfile.setUserId(loginUser.getUserId());
-        }
-        if (userProfileService.save(userProfile)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:user:update')")
-    @ApiOperation("修改会员资料表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserProfile userProfile) {
-        if (userProfileService.updateById(userProfile)) {
-            userService.updateById(userProfile.getUserInfo());
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userProfile:remove')")
-    @ApiOperation("删除会员资料表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userProfileService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userProfile:save')")
-    @ApiOperation("批量添加会员资料表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserProfile> list) {
-        if (userProfileService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userProfile:update')")
-    @ApiOperation("批量修改会员资料表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserProfile> batchParam) {
-        if (batchParam.update(userProfileService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userProfile:remove')")
-    @ApiOperation("批量删除会员资料表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userProfileService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('love:userProfile:list')")
-    @ApiOperation("根据会员id查询详细资料")
-    @GetMapping("/detail/{id}")
-    public ApiResult<UserProfile> detail(@PathVariable("id") Integer id) {
-      final UserProfileParam param = new UserProfileParam();
-      param.setShowFollow(true);
-      param.setLoginUserId(getLoginUserId());
-      param.setUserId(id);
-      final PageResult<UserProfile> result = userProfileService.pageRel(param);
-      if (result.getCount() > 0) {
-        final UserProfile profile = result.getList().get(0);
-        profile.setUserInfo(userService.getById(id));
-        // 添加访客查看记录
-        addUserLook(id);
-        return success(profile);
-      }
-      return fail("用户不存在",null);
-    }
-
-    @Async
-    public void addUserLook(Integer toUserId) {
-      User loginUser = getLoginUser();
-      if (loginUser != null && !loginUser.getUserId().equals(toUserId)) {
-          boolean noLog = userLookService.count(new LambdaQueryWrapper<UserLook>().eq(UserLook::getUserId, loginUser.getUserId()).eq(UserLook::getToUserId, toUserId)) == 0;
-          if (noLog) {
-          final UserLook userLook = new UserLook();
-          userLook.setUserId(getLoginUserId());
-          userLook.setToUserId(toUserId);
-          userLookService.save(userLook);
-          clientCache.sendUserEvent(userLook.getToUserId() + "","look", 1);
-        }
-      }
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/Certificate.java b/src/main/java/com/gxwebsoft/love/entity/Certificate.java
deleted file mode 100644
index f1bb26c..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/Certificate.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 证件管理记录表
- *
- * @author 科技小王子
- * @since 2023-06-24 11:18:52
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Certificate对象", description = "证件管理记录表")
-@TableName("love_certificate")
-public class Certificate implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "证件id")
-    @TableId(value = "certificate_id", type = IdType.AUTO)
-    private Integer certificateId;
-
-    @ApiModelProperty(value = "证件名称")
-    private String certificateName;
-
-    @ApiModelProperty(value = "证件全称")
-    private String fullName;
-
-    @ApiModelProperty(value = "证件标识")
-    private String certificateCode;
-
-    @ApiModelProperty(value = "证件类型")
-    private String certificateType;
-
-    @ApiModelProperty(value = "证件照片")
-    private String files;
-
-    @ApiModelProperty(value = "房产所在的城市")
-    private String cityByHouse;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "证件到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "企业法人")
-    private String businessEntity;
-
-    @ApiModelProperty(value = "毕业院校")
-    private String college;
-
-    @ApiModelProperty(value = "学历")
-    private String education;
-
-    @ApiModelProperty(value = "认证方式")
-    private String authType;
-
-    @ApiModelProperty(value = "车辆品牌")
-    private String carBrand;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否实名认证")
-    private Integer authentication;
-
-    @ApiModelProperty(value = "状态")
-    private Integer status;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/ChatConversation.java b/src/main/java/com/gxwebsoft/love/entity/ChatConversation.java
deleted file mode 100644
index bba7f28..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/ChatConversation.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 聊天消息表
- *
- * @author 科技小王子
- * @since 2023-06-15 21:26:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "ChatConversation对象", description = "聊天消息表")
-@TableName("love_chat_conversation")
-public class ChatConversation implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "好友ID")
-    private Integer friendId;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "好友信息")
-    private User friendInfo;
-
-    @ApiModelProperty(value = "消息类型")
-    private Integer type;
-
-    @ApiModelProperty(value = "消息内容")
-    private String content;
-
-    @ApiModelProperty(value = "未读消息")
-    private int unRead;
-
-    @ApiModelProperty(value = "状态, 0未读, 1已读")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/ChatMessage.java b/src/main/java/com/gxwebsoft/love/entity/ChatMessage.java
deleted file mode 100644
index 61717b8..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/ChatMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 聊天消息表
- *
- * @author 科技小王子
- * @since 2023-06-10 18:27:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "ChatMessage对象", description = "聊天消息表")
-@TableName("love_chat_message")
-public class ChatMessage implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "发送用户ID")
-    private Integer formUserId;
-
-    @ApiModelProperty(value = "接收人ID")
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "发送人")
-    @TableField(exist = false)
-    private User formUserInfo;
-
-    @ApiModelProperty(value = "接收人")
-    @TableField(exist = false)
-    private User toUserInfo;
-
-    @ApiModelProperty(value = "消息类型")
-    private String type;
-
-    @ApiModelProperty(value = "消息内容")
-    private String content;
-
-    @ApiModelProperty(value = "状态, 0未读, 1已读")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/Profit.java b/src/main/java/com/gxwebsoft/love/entity/Profit.java
deleted file mode 100644
index b588c83..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/Profit.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 门店收益明细表
- *
- * @author 科技小王子
- * @since 2023-06-28 20:49:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Profit对象", description = "门店收益明细表")
-@TableName("love_profit")
-public class Profit implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "profit_id", type = IdType.AUTO)
-    private Integer profitId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "购买记录ID")
-    private Integer logId;
-
-    @ApiModelProperty(value = "余额变动场景(10推荐奖励 20解锁奖励 30团队收益 40区域分红)")
-    private Integer scene;
-
-    @ApiModelProperty(value = "变动金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "变动后余额")
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "我推荐的玩家")
-    @TableField(exist = false)
-    private Integer playerId;
-
-    @ApiModelProperty(value = "玩家昵称")
-    @TableField(exist = false)
-    private String playerNickname;
-
-    @ApiModelProperty(value = "我推荐的玩家")
-    @TableField(exist = false)
-    private String playerAvatar;
-
-    @ApiModelProperty(value = "消费金额")
-    @TableField(exist = false)
-    private BigDecimal orderPrice;
-
-    @ApiModelProperty(value = "结算状态")
-    @TableField(exist = false)
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介")
-    @TableField(exist = false)
-    private Integer type;
-
-    @ApiModelProperty(value = "会员等级")
-    @TableField(exist = false)
-    private String gradeName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlan.java b/src/main/java/com/gxwebsoft/love/entity/UserPlan.java
deleted file mode 100644
index a3bd11b..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/UserPlan.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 会员套餐管理表
- *
- * @author 科技小王子
- * @since 2023-06-21 11:21:01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserPlan对象", description = "会员套餐管理表")
-@TableName("love_user_plan")
-public class UserPlan implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "套餐ID")
-    @TableId(value = "plan_id", type = IdType.AUTO)
-    private Integer planId;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String name;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介")
-    private Integer type;
-
-    @ApiModelProperty(value = "副标题")
-    private String subName;
-
-    @ApiModelProperty(value = "会员身份")
-    private Integer roleId;
-
-    @ApiModelProperty(value = "会员等级")
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "角色名称")
-    @TableField(exist = false)
-    private String roleName;
-
-    @ApiModelProperty(value = "会员等级")
-    @TableField(exist = false)
-    private String gradeName;
-
-    @ApiModelProperty(value = "套餐价格")
-    @TableField(exist = false)
-    private List<UserPlanPrice> price;
-
-    @ApiModelProperty(value = "解锁的权益")
-    @TableField(exist = false)
-    private List<UserPlanEquity> equity;
-
-    @ApiModelProperty(value = "购买记录")
-    @TableField(exist = false)
-    private List<UserPlanLog> log;
-
-    @ApiModelProperty(value = "权益图标")
-    @TableField(exist = false)
-    private List<UserPlanIcon> icons;
-
-    @ApiModelProperty(value = "过期时间")
-    @TableField(exist = false)
-    private String expirationTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java
deleted file mode 100644
index 1a86244..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/UserPlanEquity.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 会员套餐管理表
- *
- * @author 科技小王子
- * @since 2023-06-23 11:34:03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserPlanEquity对象", description = "会员套餐管理表")
-@TableName("love_user_plan_equity")
-public class UserPlanEquity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "权益ID")
-    @TableId(value = "plan_equity_id", type = IdType.AUTO)
-    private Integer planEquityId;
-
-    @ApiModelProperty(value = "套餐ID")
-    private Integer planId;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介")
-    private Integer type;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String planName;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在区县")
-    private String region;
-
-    @ApiModelProperty(value = "完整地区")
-    private String area;
-
-    @ApiModelProperty(value = "门店地址")
-    private String address;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "到期时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "会员昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String userAvatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java
deleted file mode 100644
index 89270ed..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/UserPlanLog.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 会员特权购买记录表
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserPlanLog对象", description = "会员特权购买记录表")
-@TableName("love_user_plan_log")
-public class UserPlanLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "订单号")
-    private String logNo;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介 2线下")
-    private Integer type;
-
-    @ApiModelProperty(value = "付款金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "套餐ID")
-    private Integer planId;
-
-    @ApiModelProperty(value = "支付状态")
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "支付时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "过期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "实际付款金额")
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "价格ID")
-    private Integer priceId;
-
-    @ApiModelProperty(value = "会员等级ID")
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "名称")
-    private String priceName;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在区县")
-    private String region;
-
-    @ApiModelProperty(value = "完整地区")
-    private String area;
-
-    @ApiModelProperty(value = "门店地址")
-    private String address;
-
-    @ApiModelProperty(value = "门店ID")
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "所属门店")
-    private String merchantName;
-
-    @ApiModelProperty(value = "所属门店")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "结算状态")
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "套餐名称")
-    @TableField(exist = false)
-    private String planName;
-
-    @ApiModelProperty(value = "套餐图标")
-    @TableField(exist = false)
-    private String planIcon;
-
-    @ApiModelProperty(value = "会员昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String userAvatar;
-
-    @ApiModelProperty(value = "openid")
-    @TableField(exist = false)
-    private String openid;
-
-    @ApiModelProperty(value = "会员身份")
-    @TableField(exist = false)
-    private Integer roleId;
-
-    @ApiModelProperty(value = "推荐人ID")
-    @TableField(exist = false)
-    private Integer dealerId;
-
-    @ApiModelProperty(value = "间接推荐人")
-    @TableField(exist = false)
-    private Integer dealerId2;
-
-    @ApiModelProperty(value = "付款金额")
-    @TableField(exist = false)
-    private BigDecimal totalPrice;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java b/src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java
deleted file mode 100644
index ee311e7..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/UserPlanPrice.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 会员套餐定价表
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserPlanPrice对象", description = "会员套餐定价表")
-@TableName("love_user_plan_price")
-public class UserPlanPrice implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "套餐ID")
-    private Integer planId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String name;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "套餐名称")
-    @TableField(exist = false)
-    private String planName;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介 2线下")
-    @TableField(exist = false)
-    private Integer type;
-
-    @ApiModelProperty(value = "会员等级")
-    @TableField(exist = false)
-    private Integer gradeId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/entity/UserProfile.java b/src/main/java/com/gxwebsoft/love/entity/UserProfile.java
deleted file mode 100644
index c7baa95..0000000
--- a/src/main/java/com/gxwebsoft/love/entity/UserProfile.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.gxwebsoft.love.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 会员资料表
- *
- * @author 科技小王子
- * @since 2023-06-09 21:42:26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserProfile对象", description = "会员资料表")
-@TableName("love_user_profile")
-public class UserProfile implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "兴趣爱好")
-    private String interest;
-
-    @ApiModelProperty(value = "年龄")
-    @TableField(exist = false)
-    private Integer age;
-
-    @ApiModelProperty(value = "身高")
-    private String height;
-
-    @ApiModelProperty(value = "月收入")
-    private String monthlyPay;
-
-    @ApiModelProperty(value = "年收入")
-    private String yearlyPay;
-
-    @ApiModelProperty(value = "学历")
-    private String education;
-
-    @ApiModelProperty(value = "职业")
-    private String vocation;
-
-    @ApiModelProperty(value = "婚姻状况")
-    private String maritalStatus;
-
-    @ApiModelProperty(value = "有无小孩")
-    private String hasChildren;
-
-    @ApiModelProperty(value = "是否要小孩")
-    private String haveChild;
-
-    @ApiModelProperty(value = "职业")
-    private String position;
-
-    @ApiModelProperty(value = "体重")
-    private String weight;
-
-    @ApiModelProperty(value = "体型")
-    private String shape;
-
-    @ApiModelProperty(value = "是否有车")
-    private String hasCar;
-
-    @ApiModelProperty(value = "是否有房")
-    private String hasHouse;
-
-    @ApiModelProperty(value = "何时想结婚")
-    private String whenMarried;
-
-    @ApiModelProperty(value = "择偶条件-年龄")
-    private String ageMate;
-
-    @ApiModelProperty(value = "择偶条件-身高")
-    private String heightMate;
-
-    @ApiModelProperty(value = "择偶条件-月收入")
-    private String monthlyPayMate;
-
-    @ApiModelProperty(value = "择偶条件-年收入")
-    private String yearlyPayMate;
-
-    @ApiModelProperty(value = "所在国家")
-    private String country;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "所在地区")
-    private String area;
-
-    @ApiModelProperty(value = "择偶条件-所在省份")
-    private String provinceMate;
-
-    @ApiModelProperty(value = "择偶条件-所在城市")
-    private String cityMate;
-
-    @ApiModelProperty(value = "择偶条件-所在辖区")
-    private String regionMate;
-
-    @ApiModelProperty(value = "择偶条件-地区")
-    private String areaMate;
-
-    @ApiModelProperty(value = "择偶条件-学历")
-    private String educationMate;
-
-    @ApiModelProperty(value = "择偶条件-婚姻状况")
-    private String maritalStatusMate;
-
-    @ApiModelProperty(value = "择偶条件-有无小孩")
-    private String hasChildrenMate;
-
-    @ApiModelProperty(value = "择偶条件-是否要小孩")
-    private String haveChildMate;
-
-    @ApiModelProperty(value = "择偶条件-职业")
-    private String vocationMate;
-
-    @ApiModelProperty(value = "择偶条件-体重")
-    private String weightMate;
-
-    @ApiModelProperty(value = "择偶条件-体型")
-    private String shapeMate;
-
-    @ApiModelProperty(value = "择偶条件-是否吸烟")
-    private String isSmokingMate;
-
-    @ApiModelProperty(value = "择偶条件-是否喝酒")
-    private String isDrinkMate;
-
-    @ApiModelProperty(value = "择偶条件-是否有车")
-    private String hasCarMate;
-
-    @ApiModelProperty(value = "择偶条件-是否有房")
-    private String hasHouseMate;
-
-    @ApiModelProperty(value = "择偶条件-何时想结婚")
-    private String whenMarriedMate;
-
-    @ApiModelProperty(value = "是否推荐")
-    private Integer recommend;
-
-    @ApiModelProperty(value = "图片附件")
-    private String images;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "用户信息")
-    @TableField(exist = false)
-    private User userInfo;
-
-    @ApiModelProperty(value = "是否关注")
-    @TableField(exist = false)
-    private Boolean follow;
-
-    @ApiModelProperty(value = "是否点赞")
-    @TableField(exist = false)
-    private Boolean liked;
-
-    @ApiModelProperty(value = "用户所在城市")
-    @TableField(exist = false)
-    private String userCity;
-}
diff --git a/src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java b/src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java
deleted file mode 100644
index 22aa282..0000000
--- a/src/main/java/com/gxwebsoft/love/enums/ChatMessageType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gxwebsoft.love.enums;
-
-public enum ChatMessageType {
-    TEXT( 1, "text"),
-    IMAGE(2, "image"),
-    VOICE(3, "voice"),
-    CARD(4, "card"),
-    ;
-
-    private int index;
-
-    private String name;
-    ChatMessageType(int i, String text) {
-        this.name = text;
-        this.index = i;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java b/src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java
deleted file mode 100644
index f1258e6..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/CertificateMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.Certificate;
-import com.gxwebsoft.love.param.CertificateParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 证件管理记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-24 11:18:52
- */
-public interface CertificateMapper extends BaseMapper<Certificate> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Certificate>
-     */
-    List<Certificate> selectPageRel(@Param("page") IPage<Certificate> page,
-                             @Param("param") CertificateParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Certificate> selectListRel(@Param("param") CertificateParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java b/src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java
deleted file mode 100644
index 85fbe29..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/ChatConversationMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.gxwebsoft.love.entity.ChatConversation;
-import com.gxwebsoft.love.param.ChatConversationParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 聊天消息表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-15 21:26:48
- */
-public interface ChatConversationMapper extends MPJBaseMapper<ChatConversation> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<ChatConversation>
-     */
-    List<ChatConversation> selectPageRel(@Param("page") IPage<ChatConversation> page,
-                             @Param("param") ChatConversationParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<ChatConversation> selectListRel(@Param("param") ChatConversationParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java b/src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java
deleted file mode 100644
index 755add5..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/ChatMessageMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.ChatMessage;
-import com.gxwebsoft.love.param.ChatMessageParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 聊天消息表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-10 18:27:25
- */
-public interface ChatMessageMapper extends BaseMapper<ChatMessage> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<ChatMessage>
-     */
-    List<ChatMessage> selectPageRel(@Param("page") IPage<ChatMessage> page,
-                             @Param("param") ChatMessageParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<ChatMessage> selectListRel(@Param("param") ChatMessageParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java b/src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java
deleted file mode 100644
index 2007555..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/ProfitMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.Profit;
-import com.gxwebsoft.love.param.ProfitParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 门店收益明细表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-28 20:49:17
- */
-public interface ProfitMapper extends BaseMapper<Profit> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Profit>
-     */
-    List<Profit> selectPageRel(@Param("page") IPage<Profit> page,
-                             @Param("param") ProfitParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Profit> selectListRel(@Param("param") ProfitParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java
deleted file mode 100644
index a5a16eb..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/UserPlanEquityMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.param.UserPlanEquityParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员套餐管理表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-23 11:34:03
- */
-public interface UserPlanEquityMapper extends BaseMapper<UserPlanEquity> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserPlanEquity>
-     */
-    List<UserPlanEquity> selectPageRel(@Param("page") IPage<UserPlanEquity> page,
-                             @Param("param") UserPlanEquityParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserPlanEquity> selectListRel(@Param("param") UserPlanEquityParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java
deleted file mode 100644
index 9446d09..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/UserPlanIconMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.UserPlanIcon;
-import com.gxwebsoft.love.param.UserPlanIconParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-25 18:09:34
- */
-public interface UserPlanIconMapper extends BaseMapper<UserPlanIcon> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserPlanIcon>
-     */
-    List<UserPlanIcon> selectPageRel(@Param("page") IPage<UserPlanIcon> page,
-                             @Param("param") UserPlanIconParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserPlanIcon> selectListRel(@Param("param") UserPlanIconParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java
deleted file mode 100644
index 54de524..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/UserPlanLogMapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.UserPlanLog;
-import com.gxwebsoft.love.param.UserPlanLogParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员特权购买记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-public interface UserPlanLogMapper extends BaseMapper<UserPlanLog> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserPlanLog>
-     */
-    List<UserPlanLog> selectPageRel(@Param("page") IPage<UserPlanLog> page,
-                             @Param("param") UserPlanLogParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserPlanLog> selectListRel(@Param("param") UserPlanLogParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    List<UserPlanLog> getByOutTradeNo(@Param("param") UserPlanLogParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    void updateByOutTradeNo(@Param("param") UserPlanLog outTradeNo);
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java
deleted file mode 100644
index d076ee4..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/UserPlanMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.UserPlan;
-import com.gxwebsoft.love.param.UserPlanParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员套餐管理表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-21 11:21:01
- */
-public interface UserPlanMapper extends BaseMapper<UserPlan> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserPlan>
-     */
-    List<UserPlan> selectPageRel(@Param("page") IPage<UserPlan> page,
-                             @Param("param") UserPlanParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserPlan> selectListRel(@Param("param") UserPlanParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java
deleted file mode 100644
index a40082c..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/UserPlanPriceMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.param.UserPlanPriceParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员套餐定价表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-public interface UserPlanPriceMapper extends BaseMapper<UserPlanPrice> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserPlanPrice>
-     */
-    List<UserPlanPrice> selectPageRel(@Param("page") IPage<UserPlanPrice> page,
-                             @Param("param") UserPlanPriceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserPlanPrice> selectListRel(@Param("param") UserPlanPriceParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java b/src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java
deleted file mode 100644
index cb94139..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/UserProfileMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.love.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.param.UserProfileParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员资料表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-09 21:42:26
- */
-public interface UserProfileMapper extends BaseMapper<UserProfile> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserProfile>
-     */
-    List<UserProfile> selectPageRel(@Param("page") IPage<UserProfile> page,
-                             @Param("param") UserProfileParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserProfile> selectListRel(@Param("param") UserProfileParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml
deleted file mode 100644
index 5f86af5..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/CertificateMapper.xml
+++ /dev/null
@@ -1,84 +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="com.gxwebsoft.love.mapper.CertificateMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.avatar
-        FROM love_certificate a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.certificateId != null">
-                AND a.certificate_id = #{param.certificateId}
-            </if>
-            <if test="param.certificateName != null">
-                AND a.certificate_name LIKE CONCAT('%', #{param.certificateName}, '%')
-            </if>
-            <if test="param.fullName != null">
-                AND a.full_name LIKE CONCAT('%', #{param.fullName}, '%')
-            </if>
-            <if test="param.certificateCode != null">
-                AND a.certificate_code LIKE CONCAT('%', #{param.certificateCode}, '%')
-            </if>
-            <if test="param.certificateType != null">
-                AND a.certificate_type = #{param.certificateType}
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.realName != null">
-                AND a.real_name LIKE CONCAT('%', #{param.realName}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.businessEntity != null">
-                AND a.business_entity LIKE CONCAT('%', #{param.businessEntity}, '%')
-            </if>
-            <if test="param.college != null">
-                AND a.college LIKE CONCAT('%', #{param.college}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.authentication != null">
-                AND a.authentication = #{param.authentication}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.Certificate">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.Certificate">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml
deleted file mode 100644
index f688dbd..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/ChatConversationMapper.xml
+++ /dev/null
@@ -1,53 +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="com.gxwebsoft.love.mapper.ChatConversationMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM love_chat_conversation a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.friendId != null">
-                AND a.friend_id = #{param.friendId}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.ChatConversation">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.ChatConversation">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml
deleted file mode 100644
index a0dcd20..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/ChatMessageMapper.xml
+++ /dev/null
@@ -1,53 +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="com.gxwebsoft.love.mapper.ChatMessageMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM love_chat_message a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.formUserId != null">
-                AND a.form_user_id = #{param.formUserId}
-            </if>
-            <if test="param.toUserId != null">
-                AND a.to_user_id = #{param.toUserId}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.ChatMessage">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.ChatMessage">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml
deleted file mode 100644
index 131b972..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/ProfitMapper.xml
+++ /dev/null
@@ -1,83 +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="com.gxwebsoft.love.mapper.ProfitMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.type,b.money,b.user_id as playerId,b.comments,b.money as orderPrice,b.is_settled,b.type,b.grade_id,
-               c.nickname as playerNickname,c.avatar as playerAvatar,
-               d.name as gradeName
-        FROM love_profit a
-        LEFT JOIN love_user_plan_log b ON a.log_id = b.log_id AND b.pay_status = 20
-        LEFT JOIN sys_user c ON b.user_id = c.user_id
-        LEFT JOIN shop_user_grade d ON b.grade_id = d.grade_id
-        <where>
-            <if test="param.profitId != null">
-                AND a.profit_id = #{param.profitId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.scene != null">
-                AND a.scene = #{param.scene}
-            </if>
-            <if test="param.sceneMultiple != null">
-              AND a.scene IN
-              <foreach collection="param.sceneMultiple.split(',')" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.balance != null">
-                AND a.balance = #{param.balance}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.gradeStart  != null">
-              AND d.grade_id &gt;= #{param.gradeStart}
-            </if>
-            <if test="param.gradeEnd  != null">
-              AND d.grade_id &lt;= #{param.gradeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.Profit">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.Profit">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml
deleted file mode 100644
index 193aa31..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanEquityMapper.xml
+++ /dev/null
@@ -1,75 +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="com.gxwebsoft.love.mapper.UserPlanEquityMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.phone,b.avatar as userAvatar
-        FROM love_user_plan_equity a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.planEquityId != null">
-                AND a.plan_equity_id = #{param.planEquityId}
-            </if>
-            <if test="param.type != null">
-              AND a.type = #{param.type}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.planName != null">
-                AND a.plan_name LIKE CONCAT('%', #{param.planName}, '%')
-            </if>
-            <if test="param.realName != null">
-              AND a.real_name = #{param.realName}
-            </if>
-            <if test="param.province != null">
-              AND a.province = #{param.province}
-            </if>
-            <if test="param.city != null">
-              AND a.city = #{param.city}
-            </if>
-            <if test="param.region != null">
-              AND a.region = #{param.region}
-            </if>
-            <if test="param.area != null">
-              AND a.area = #{param.area}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.expirationTime != null">
-                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.UserPlanEquity">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.UserPlanEquity">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml
deleted file mode 100644
index 3d2b6da..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanIconMapper.xml
+++ /dev/null
@@ -1,50 +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="com.gxwebsoft.love.mapper.UserPlanIconMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM love_user_plan_icon a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.icon != null">
-                AND a.icon LIKE CONCAT('%', #{param.icon}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.UserPlanIcon">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.UserPlanIcon">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml
deleted file mode 100644
index c78889b..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanLogMapper.xml
+++ /dev/null
@@ -1,77 +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="com.gxwebsoft.love.mapper.UserPlanLogMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.role_id,
-              b.name as planName,b.icon as planIcon,
-              c.nickname,c.avatar as userAvatar,
-              d.dealer_id as dealerId,
-              e.dealer_id as dealerId2
-        FROM love_user_plan_log a
-        LEFT JOIN love_user_plan b ON a.plan_id = b.plan_id
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        LEFT JOIN shop_user_referee d ON a.user_id = d.user_id and d.deleted = 0
-        LEFT JOIN shop_user_referee e ON d.dealer_id = e.user_id and e.deleted = 0
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.logNo != null">
-                AND a.log_no LIKE CONCAT('%', #{param.logNo}, '%')
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.UserPlanLog">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.UserPlanLog">
-        <include refid="selectSql"></include>
-    </select>
-
-  <!-- 按OutTradeNo查询 -->
-  <select id="getByOutTradeNo" resultType="com.gxwebsoft.love.entity.UserPlanLog">
-    <include refid="selectSql"></include>
-  </select>
-
-  <!-- 更新订单状态 -->
-  <select id="updateByOutTradeNo" resultType="com.gxwebsoft.love.entity.UserPlanLog">
-    UPDATE love_user_plan_log SET pay_status = #{param.payStatus},pay_time = #{param.payTime},pay_price = #{param.payPrice} WHERE log_no = #{param.logNo}
-  </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml
deleted file mode 100644
index 11aeea9..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanMapper.xml
+++ /dev/null
@@ -1,67 +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="com.gxwebsoft.love.mapper.UserPlanMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.role_name as roleName,c.name as gradeName
-        FROM love_user_plan a
-        LEFT JOIN sys_role b ON a.role_id = b.role_id
-        LEFT JOIN shop_user_grade c ON a.grade_id = c.grade_id
-        <where>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.type != null">
-              AND a.type = #{param.type}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.subName != null">
-                AND a.sub_name LIKE CONCAT('%', #{param.subName}, '%')
-            </if>
-            <if test="param.roleId != null">
-                AND a.role_id = #{param.roleId}
-            </if>
-            <if test="param.gradeId != null">
-              AND a.grade_id = #{param.gradeId}
-            </if>
-            <if test="param.icon != null">
-                AND a.icon LIKE CONCAT('%', #{param.icon}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.UserPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.UserPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml
deleted file mode 100644
index 529379e..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/UserPlanPriceMapper.xml
+++ /dev/null
@@ -1,51 +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="com.gxwebsoft.love.mapper.UserPlanPriceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.name as planName,b.type,b.grade_id
-        FROM love_user_plan_price a
-        LEFT JOIN love_user_plan b ON a.plan_id = b.plan_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.price != null">
-                AND a.price = #{param.price}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.UserPlanPrice">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.UserPlanPrice">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml b/src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml
deleted file mode 100644
index 870f564..0000000
--- a/src/main/java/com/gxwebsoft/love/mapper/xml/UserProfileMapper.xml
+++ /dev/null
@@ -1,190 +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="com.gxwebsoft.love.mapper.UserProfileMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT  a.*,b.nickname,b.age,b.city as userCity
-        FROM love_user_profile a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.interest != null">
-                AND a.interest LIKE CONCAT('%', #{param.interest}, '%')
-            </if>
-            <if test="param.height != null">
-                AND a.height LIKE CONCAT('%', #{param.height}, '%')
-            </if>
-            <if test="param.monthlyPay != null">
-                AND a.monthly_pay LIKE CONCAT('%', #{param.monthlyPay}, '%')
-            </if>
-            <if test="param.yearlyPay != null">
-              AND a.yearly_pay LIKE CONCAT('%', #{param.yearlyPay}, '%')
-            </if>
-            <if test="param.education != null">
-                AND a.education LIKE CONCAT('%', #{param.education}, '%')
-            </if>
-            <if test="param.vocation != null">
-                AND a.vocation LIKE CONCAT('%', #{param.vocation}, '%')
-            </if>
-            <if test="param.maritalStatus != null">
-                AND a.marital_status LIKE CONCAT('%', #{param.maritalStatus}, '%')
-            </if>
-            <if test="param.hasChildren != null">
-                AND a.has_children LIKE CONCAT('%', #{param.hasChildren}, '%')
-            </if>
-            <if test="param.haveChild != null">
-                AND a.have_child LIKE CONCAT('%', #{param.haveChild}, '%')
-            </if>
-            <if test="param.position != null">
-                AND a.position LIKE CONCAT('%', #{param.position}, '%')
-            </if>
-            <if test="param.weight != null">
-                AND a.weight LIKE CONCAT('%', #{param.weight}, '%')
-            </if>
-            <if test="param.hasCar != null">
-                AND a.has_car LIKE CONCAT('%', #{param.hasCar}, '%')
-            </if>
-            <if test="param.whenMarried != null">
-                AND a.when_married LIKE CONCAT('%', #{param.whenMarried}, '%')
-            </if>
-            <if test="param.ageMate != null">
-                AND a.age_mate LIKE CONCAT('%', #{param.ageMate}, '%')
-            </if>
-            <if test="param.heightMate != null">
-                AND a.height_mate LIKE CONCAT('%', #{param.heightMate}, '%')
-            </if>
-            <if test="param.monthlyPayMate != null">
-                AND a.monthly_pay_mate LIKE CONCAT('%', #{param.monthlyPayMate}, '%')
-            </if>
-            <if test="param.yearlyPayMate != null">
-              AND a.yearly_pay_mate LIKE CONCAT('%', #{param.yearlyPayMate}, '%')
-            </if>
-            <if test="param.regionMate != null">
-                AND a.region_mate LIKE CONCAT('%', #{param.regionMate}, '%')
-            </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND b.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.area != null">
-              AND a.area LIKE CONCAT('%', #{param.area}, '%')
-            </if>
-            <if test="param.provinceMate != null">
-              AND a.province_mate LIKE CONCAT('%', #{param.provinceMate}, '%')
-            </if>
-            <if test="param.cityMate != null">
-              AND b.city LIKE CONCAT('%', #{param.cityMate}, '%')
-            </if>
-            <if test="param.regionMate != null">
-              AND a.region_mate LIKE CONCAT('%', #{param.regionMate}, '%')
-            </if>
-            <if test="param.areaMate != null">
-              AND a.area_mate LIKE CONCAT('%', #{param.areaMate}, '%')
-            </if>
-            <if test="param.educationMate != null">
-                AND a.education_mate LIKE CONCAT('%', #{param.educationMate}, '%')
-            </if>
-            <if test="param.maritalStatusMate != null">
-                AND a.marital_status_mate LIKE CONCAT('%', #{param.maritalStatusMate}, '%')
-            </if>
-            <if test="param.hasChildrenMate != null">
-                AND a.has_children_mate LIKE CONCAT('%', #{param.hasChildrenMate}, '%')
-            </if>
-            <if test="param.haveChildMate != null">
-                AND a.have_child_mate LIKE CONCAT('%', #{param.haveChildMate}, '%')
-            </if>
-            <if test="param.vocationMate != null">
-                AND a.vocation_mate LIKE CONCAT('%', #{param.vocationMate}, '%')
-            </if>
-            <if test="param.weightMate != null">
-                AND a.weight_mate LIKE CONCAT('%', #{param.weightMate}, '%')
-            </if>
-            <if test="param.shapeMate != null">
-                AND a.shape_mate LIKE CONCAT('%', #{param.shapeMate}, '%')
-            </if>
-            <if test="param.isSmokingMate != null">
-                AND a.is_smoking_mate LIKE CONCAT('%', #{param.isSmokingMate}, '%')
-            </if>
-            <if test="param.isDrinkMate != null">
-                AND a.is_drink_mate LIKE CONCAT('%', #{param.isDrinkMate}, '%')
-            </if>
-            <if test="param.hasCarMate != null">
-                AND a.has_car_mate LIKE CONCAT('%', #{param.hasCarMate}, '%')
-            </if>
-            <if test="param.hasHouseMate != null">
-                AND a.has_house_mate LIKE CONCAT('%', #{param.hasHouseMate}, '%')
-            </if>
-            <if test="param.whenMarriedMate != null">
-                AND a.when_married_mate LIKE CONCAT('%', #{param.whenMarriedMate}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.recommend != null">
-              AND b.recommend = 1
-            </if>
-            <if test="param.userIds != null and param.userIds.size > 0 ">
-              AND a.user_id IN
-              <foreach collection="param.userIds" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.nUserIds != null and param.nUserIds.size > 0 ">
-                AND a.user_id NOT IN
-                <foreach collection="param.nUserIds" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="param.sex != null">
-              AND b.sex = #{param.sex}
-            </if>
-            <if test="param.albums == true">
-              AND a.images != '[]'
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.age_mate = #{param.keywords}
-              OR a.user_id = #{param.keywords}
-              OR b.phone = #{param.keywords}
-              )
-            </if>
-            AND b.deleted = 0
-        </where>
-        <if test="param.random == true">
-             ORDER BY rand()
-        </if>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.love.entity.UserProfile">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.love.entity.UserProfile">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/love/param/CertificateParam.java b/src/main/java/com/gxwebsoft/love/param/CertificateParam.java
deleted file mode 100644
index e969f54..0000000
--- a/src/main/java/com/gxwebsoft/love/param/CertificateParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 证件管理记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-24 11:18:52
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CertificateParam对象", description = "证件管理记录表查询参数")
-public class CertificateParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "证件id")
-    @QueryField(type = QueryType.EQ)
-    private Integer certificateId;
-
-    @ApiModelProperty(value = "证件名称")
-    private String certificateName;
-
-    @ApiModelProperty(value = "证件全称")
-    private String fullName;
-
-    @ApiModelProperty(value = "证件标识")
-    private String certificateCode;
-
-    @ApiModelProperty(value = "证件类型")
-    private String certificateType;
-
-    @ApiModelProperty(value = "证件照片")
-    private String files;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "证件到期时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "企业法人")
-    private String businessEntity;
-
-    @ApiModelProperty(value = "毕业院校")
-    private String college;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否实名认证")
-    @QueryField(type = QueryType.EQ)
-    private Integer authentication;
-
-    @ApiModelProperty(value = "状态")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java b/src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java
deleted file mode 100644
index e2ebc98..0000000
--- a/src/main/java/com/gxwebsoft/love/param/ChatConversationParam.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 聊天消息表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-15 21:26:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ChatConversationParam对象", description = "聊天消息表查询参数")
-public class ChatConversationParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "好友ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer friendId;
-
-    @ApiModelProperty(value = "消息类型")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "消息内容")
-    private String content;
-
-    @ApiModelProperty(value = "状态, 0未读, 1已读")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "是否只要僵尸, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Boolean onlyFake;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java b/src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java
deleted file mode 100644
index 4802343..0000000
--- a/src/main/java/com/gxwebsoft/love/param/ChatMessageParam.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 聊天消息表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-10 18:27:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ChatMessageParam对象", description = "聊天消息表查询参数")
-public class ChatMessageParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "发送用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer formUserId;
-
-    @ApiModelProperty(value = "接受用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "消息类型")
-    @QueryField(type = QueryType.EQ)
-    private String type;
-
-    @ApiModelProperty(value = "消息内容")
-    private String content;
-
-    @ApiModelProperty(value = "状态, 0在线, 1离线")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/ProfitParam.java b/src/main/java/com/gxwebsoft/love/param/ProfitParam.java
deleted file mode 100644
index 048138e..0000000
--- a/src/main/java/com/gxwebsoft/love/param/ProfitParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 门店收益明细表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-28 20:49:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ProfitParam对象", description = "门店收益明细表查询参数")
-public class ProfitParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer profitId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer scene;
-
-    @ApiModelProperty(value = "变动金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "变动后余额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "余额变动场景筛选")
-    private String sceneMultiple;
-
-    @QueryField(value = "grade_id", type = QueryType.GE)
-    @TableField(exist = false)
-    @ApiModelProperty("会员等级起始值")
-    private String gradeStart;
-
-    @QueryField(value = "grade_id", type = QueryType.LE)
-    @TableField(exist = false)
-    @ApiModelProperty("会员等级结束值")
-    private String gradeEnd;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java
deleted file mode 100644
index 5a82ffb..0000000
--- a/src/main/java/com/gxwebsoft/love/param/UserPlanEquityParam.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐管理表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-23 11:34:03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserPlanEquityParam对象", description = "会员套餐管理表查询参数")
-public class UserPlanEquityParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "权益ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planEquityId;
-
-    @ApiModelProperty(value = "套餐ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String planName;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "手机号码")
-    private String phone;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在区县")
-    private String region;
-
-    @ApiModelProperty(value = "完整地区")
-    private String area;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "到期时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java
deleted file mode 100644
index cd23a9f..0000000
--- a/src/main/java/com/gxwebsoft/love/param/UserPlanIconParam.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐权益表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-25 18:09:34
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserPlanIconParam对象", description = "会员套餐权益表查询参数")
-public class UserPlanIconParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "套餐ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "权益")
-    private String name;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java
deleted file mode 100644
index 21c02eb..0000000
--- a/src/main/java/com/gxwebsoft/love/param/UserPlanLogParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 会员特权购买记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserPlanLogParam对象", description = "会员特权购买记录表查询参数")
-public class UserPlanLogParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "订单号")
-    private String logNo;
-
-    @ApiModelProperty(value = "付款金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "套餐ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "会员等级ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "门店ID")
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanParam.java
deleted file mode 100644
index df8da75..0000000
--- a/src/main/java/com/gxwebsoft/love/param/UserPlanParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员套餐管理表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-21 11:21:01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserPlanParam对象", description = "会员套餐管理表查询参数")
-public class UserPlanParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "套餐ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "类型 0单身 1婚介")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String name;
-
-    @ApiModelProperty(value = "副标题")
-    private String subName;
-
-    @ApiModelProperty(value = "会员身份ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer roleId;
-
-    @ApiModelProperty(value = "会员等级ID")
-    @QueryField(type = QueryType.EQ)
-    private String gradeId;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "当前登录用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer loginUserId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java b/src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java
deleted file mode 100644
index 3988505..0000000
--- a/src/main/java/com/gxwebsoft/love/param/UserPlanPriceParam.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 会员套餐定价表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserPlanPriceParam对象", description = "会员套餐定价表查询参数")
-public class UserPlanPriceParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "套餐ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String name;
-
-    @ApiModelProperty(value = "价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/param/UserProfileParam.java b/src/main/java/com/gxwebsoft/love/param/UserProfileParam.java
deleted file mode 100644
index ac3c868..0000000
--- a/src/main/java/com/gxwebsoft/love/param/UserProfileParam.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.gxwebsoft.love.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * 会员资料表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-09 21:42:26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserProfileParam对象", description = "会员资料表查询参数")
-public class UserProfileParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "兴趣爱好")
-    private String interest;
-
-    @ApiModelProperty(value = "年龄")
-    @TableField(exist = false)
-    private String age;
-
-    @ApiModelProperty(value = "身高")
-    private String height;
-
-    @ApiModelProperty(value = "月收入")
-    private String monthlyPay;
-
-    @ApiModelProperty(value = "年收入")
-    private String yearlyPay;
-
-    @ApiModelProperty(value = "学历")
-    private String education;
-
-    @ApiModelProperty(value = "职业")
-    private String vocation;
-
-    @ApiModelProperty(value = "婚姻状况")
-    private String maritalStatus;
-
-    @ApiModelProperty(value = "有无小孩")
-    private String hasChildren;
-
-    @ApiModelProperty(value = "是否要小孩")
-    private String haveChild;
-
-    @ApiModelProperty(value = "职业")
-    private String position;
-
-    @ApiModelProperty(value = "体重")
-    private String weight;
-
-    @ApiModelProperty(value = "是否有房有车")
-    private String hasCar;
-
-    @ApiModelProperty(value = "何时想结婚")
-    private String whenMarried;
-
-    @ApiModelProperty(value = "择偶条件-年龄")
-    private String ageMate;
-
-    @ApiModelProperty(value = "择偶条件-身高")
-    private String heightMate;
-
-    @ApiModelProperty(value = "择偶条件-月收入")
-    private String monthlyPayMate;
-
-    @ApiModelProperty(value = "择偶条件-年收入")
-    private String yearlyPayMate;
-
-    @ApiModelProperty(value = "所在国家")
-    private String country;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "所在地区")
-    private String area;
-
-    @ApiModelProperty(value = "择偶条件-所在省份")
-    private String provinceMate;
-
-    @ApiModelProperty(value = "择偶条件-所在城市")
-    private String cityMate;
-
-    @ApiModelProperty(value = "择偶条件-所在辖区")
-    private String regionMate;
-
-    @ApiModelProperty(value = "择偶条件-地区")
-    private String areaMate;
-
-    @ApiModelProperty(value = "择偶条件-学历")
-    private String educationMate;
-
-    @ApiModelProperty(value = "择偶条件-婚姻状况")
-    private String maritalStatusMate;
-
-    @ApiModelProperty(value = "择偶条件-有无小孩")
-    private String hasChildrenMate;
-
-    @ApiModelProperty(value = "择偶条件-是否要小孩")
-    private String haveChildMate;
-
-    @ApiModelProperty(value = "择偶条件-职业")
-    private String vocationMate;
-
-    @ApiModelProperty(value = "择偶条件-体重")
-    private String weightMate;
-
-    @ApiModelProperty(value = "择偶条件-体型")
-    private String shapeMate;
-
-    @ApiModelProperty(value = "择偶条件-是否吸烟")
-    private String isSmokingMate;
-
-    @ApiModelProperty(value = "择偶条件-是否喝酒")
-    private String isDrinkMate;
-
-    @ApiModelProperty(value = "择偶条件-是否有车")
-    private String hasCarMate;
-
-    @ApiModelProperty(value = "择偶条件-是否有房")
-    private String hasHouseMate;
-
-    @ApiModelProperty(value = "择偶条件-何时想结婚")
-    private String whenMarriedMate;
-
-    @ApiModelProperty(value = "是否推荐")
-    @QueryField(type = QueryType.EQ)
-    private Boolean recommend;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "场景")
-    @TableField(exist = false)
-    private String scene;
-
-    @ApiModelProperty(value = "是否查询关注状态")
-    @TableField(exist = false)
-    private Boolean showFollow;
-
-    @ApiModelProperty(value = "当前登录用户ID")
-    @TableField(exist = false)
-    private Integer loginUserId;
-
-    @ApiModelProperty("性别, 字典标识")
-    private String sex;
-
-    @ApiModelProperty(value = "用户id集合")
-    @TableField(exist = false)
-    private Collection<Integer> userIds;
-
-    @ApiModelProperty(value = "排除用户id集合")
-    @TableField(exist = false)
-    private Collection<Integer> nUserIds;
-
-    @ApiModelProperty(value = "随机读取")
-    @TableField(exist = false)
-    private boolean random;
-
-    @ApiModelProperty(value = "读取相册")
-    @TableField(exist = false)
-    private boolean albums;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/CertificateService.java b/src/main/java/com/gxwebsoft/love/service/CertificateService.java
deleted file mode 100644
index a1ef22e..0000000
--- a/src/main/java/com/gxwebsoft/love/service/CertificateService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.Certificate;
-import com.gxwebsoft.love.param.CertificateParam;
-import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult;
-import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
-import com.gxwebsoft.love.vo.idcheck.Response;
-
-import java.util.List;
-
-/**
- * 证件管理记录表Service
- *
- * @author 科技小王子
- * @since 2023-06-24 11:18:52
- */
-public interface CertificateService extends IService<Certificate> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Certificate>
-     */
-    PageResult<Certificate> pageRel(CertificateParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Certificate>
-     */
-    List<Certificate> listRel(CertificateParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param certificateId 证件id
-     * @return Certificate
-     */
-    Certificate getByIdRel(Integer certificateId);
-
-    boolean verifyIdcard(Certificate param, List<String> files);
-
-    Response<FrontRecognitionResult> idcardfrontrecongnition(String imageUrl);
-
-    Response<BackRecognitionResult> idcardbackrecongnition(String imageUrl);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/ChatConversationService.java b/src/main/java/com/gxwebsoft/love/service/ChatConversationService.java
deleted file mode 100644
index c357400..0000000
--- a/src/main/java/com/gxwebsoft/love/service/ChatConversationService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.ChatConversation;
-import com.gxwebsoft.love.param.ChatConversationParam;
-import com.gxwebsoft.love.vo.ChatConversationVO;
-
-import java.util.List;
-
-/**
- * 聊天消息表Service
- *
- * @author 科技小王子
- * @since 2023-06-15 21:26:48
- */
-public interface ChatConversationService extends IService<ChatConversation> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<ChatConversation>
-     */
-    PageResult<ChatConversationVO> pageRel(ChatConversationParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<ChatConversation>
-     */
-    List<ChatConversation> listRel(ChatConversationParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return ChatConversation
-     */
-    ChatConversation getByIdRel(Integer id);
-
-    ChatConversation getByBothId(Integer formUserId, Integer toUserId);
-
-    List<ChatConversationVO> getFriendList(ChatConversationParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/ChatMessageService.java b/src/main/java/com/gxwebsoft/love/service/ChatMessageService.java
deleted file mode 100644
index 77cc0ca..0000000
--- a/src/main/java/com/gxwebsoft/love/service/ChatMessageService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.ChatMessage;
-import com.gxwebsoft.love.param.ChatMessageParam;
-
-import java.util.List;
-
-/**
- * 聊天消息表Service
- *
- * @author 科技小王子
- * @since 2023-06-10 18:27:25
- */
-public interface ChatMessageService extends IService<ChatMessage> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<ChatMessage>
-     */
-    PageResult<ChatMessage> pageRel(ChatMessageParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<ChatMessage>
-     */
-    List<ChatMessage> listRel(ChatMessageParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return ChatMessage
-     */
-    ChatMessage getByIdRel(Integer id);
-
-    List<ChatMessage> getUnreadMessage(Integer fromUserId, Integer toUserId);
-
-    boolean sendMessage(ChatMessage message);
-
-    List<ChatMessage> getFriendMessage(Integer userId1, Integer userId2);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/ProfitService.java b/src/main/java/com/gxwebsoft/love/service/ProfitService.java
deleted file mode 100644
index bb071ce..0000000
--- a/src/main/java/com/gxwebsoft/love/service/ProfitService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.Profit;
-import com.gxwebsoft.love.param.ProfitParam;
-
-import java.util.List;
-
-/**
- * 门店收益明细表Service
- *
- * @author 科技小王子
- * @since 2023-06-28 20:49:17
- */
-public interface ProfitService extends IService<Profit> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Profit>
-     */
-    PageResult<Profit> pageRel(ProfitParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Profit>
-     */
-    List<Profit> listRel(ProfitParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param profitId 主键ID
-     * @return Profit
-     */
-    Profit getByIdRel(Integer profitId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java
deleted file mode 100644
index 5df3aa9..0000000
--- a/src/main/java/com/gxwebsoft/love/service/UserPlanEquityService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.param.UserPlanEquityParam;
-
-import java.util.List;
-
-/**
- * 会员套餐管理表Service
- *
- * @author 科技小王子
- * @since 2023-06-23 11:34:03
- */
-public interface UserPlanEquityService extends IService<UserPlanEquity> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserPlanEquity>
-     */
-    PageResult<UserPlanEquity> pageRel(UserPlanEquityParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserPlanEquity>
-     */
-    List<UserPlanEquity> listRel(UserPlanEquityParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param planEquityId 权益ID
-     * @return UserPlanEquity
-     */
-    UserPlanEquity getByIdRel(Integer planEquityId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java
deleted file mode 100644
index 14a5edb..0000000
--- a/src/main/java/com/gxwebsoft/love/service/UserPlanIconService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlanIcon;
-import com.gxwebsoft.love.param.UserPlanIconParam;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Service
- *
- * @author 科技小王子
- * @since 2023-06-25 18:09:34
- */
-public interface UserPlanIconService extends IService<UserPlanIcon> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserPlanIcon>
-     */
-    PageResult<UserPlanIcon> pageRel(UserPlanIconParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserPlanIcon>
-     */
-    List<UserPlanIcon> listRel(UserPlanIconParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id ID
-     * @return UserPlanIcon
-     */
-    UserPlanIcon getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java
deleted file mode 100644
index 7ff8bd6..0000000
--- a/src/main/java/com/gxwebsoft/love/service/UserPlanLogService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlanLog;
-import com.gxwebsoft.love.param.UserPlanLogParam;
-
-import java.util.List;
-
-/**
- * 会员特权购买记录表Service
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-public interface UserPlanLogService extends IService<UserPlanLog> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserPlanLog>
-     */
-    PageResult<UserPlanLog> pageRel(UserPlanLogParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserPlanLog>
-     */
-    List<UserPlanLog> listRel(UserPlanLogParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId ID
-     * @return UserPlanLog
-     */
-    UserPlanLog getByIdRel(Integer logId);
-
-    UserPlanLog getByOutTradeNo(String OutTradeNo);
-
-    void updateByOutTradeNo(UserPlanLog log);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java
deleted file mode 100644
index 93577e8..0000000
--- a/src/main/java/com/gxwebsoft/love/service/UserPlanPriceService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.param.UserPlanPriceParam;
-
-import java.util.List;
-
-/**
- * 会员套餐定价表Service
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-public interface UserPlanPriceService extends IService<UserPlanPrice> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserPlanPrice>
-     */
-    PageResult<UserPlanPrice> pageRel(UserPlanPriceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserPlanPrice>
-     */
-    List<UserPlanPrice> listRel(UserPlanPriceParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id ID
-     * @return UserPlanPrice
-     */
-    UserPlanPrice getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/UserPlanService.java b/src/main/java/com/gxwebsoft/love/service/UserPlanService.java
deleted file mode 100644
index 9e075ac..0000000
--- a/src/main/java/com/gxwebsoft/love/service/UserPlanService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlan;
-import com.gxwebsoft.love.param.UserPlanParam;
-
-import java.util.List;
-
-/**
- * 会员套餐管理表Service
- *
- * @author 科技小王子
- * @since 2023-06-21 11:21:01
- */
-public interface UserPlanService extends IService<UserPlan> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserPlan>
-     */
-    PageResult<UserPlan> pageRel(UserPlanParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserPlan>
-     */
-    List<UserPlan> listRel(UserPlanParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param planId 套餐ID
-     * @return UserPlan
-     */
-    UserPlan getByIdRel(Integer planId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/UserProfileService.java b/src/main/java/com/gxwebsoft/love/service/UserProfileService.java
deleted file mode 100644
index 1554f72..0000000
--- a/src/main/java/com/gxwebsoft/love/service/UserProfileService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.love.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.param.UserProfileParam;
-
-import java.util.List;
-
-/**
- * 会员资料表Service
- *
- * @author 科技小王子
- * @since 2023-06-09 21:42:26
- */
-public interface UserProfileService extends IService<UserProfile> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserProfile>
-     */
-    PageResult<UserProfile> pageRel(UserProfileParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserProfile>
-     */
-    List<UserProfile> listRel(UserProfileParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return UserProfile
-     */
-    UserProfile getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java
deleted file mode 100644
index 2f16e8e..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/CertificateServiceImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import cn.hutool.core.exceptions.ExceptionUtil;
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.TypeReference;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.utils.HttpUtils;
-import com.gxwebsoft.common.core.utils.ImageUtil;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.Certificate;
-import com.gxwebsoft.love.mapper.CertificateMapper;
-import com.gxwebsoft.love.param.CertificateParam;
-import com.gxwebsoft.love.service.CertificateService;
-import com.gxwebsoft.love.vo.idcheck.BackRecognitionResult;
-import com.gxwebsoft.love.vo.idcheck.FrontRecognitionResult;
-import com.gxwebsoft.love.vo.idcheck.Response;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 证件管理记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-24 11:18:52
- */
-@Service
-public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certificate> implements CertificateService {
-
-    @Resource
-    private RestTemplate restTemplate;
-
-    private String appcode = "566b5786c5874464909d8c0b7f64cdc7";
-
-    @Override
-    public PageResult<Certificate> pageRel(CertificateParam param) {
-        PageParam<Certificate, CertificateParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Certificate> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Certificate> listRel(CertificateParam param) {
-        List<Certificate> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Certificate, CertificateParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Certificate getByIdRel(Integer certificateId) {
-        CertificateParam param = new CertificateParam();
-        param.setCertificateId(certificateId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public boolean verifyIdcard(Certificate param, List<String> files) {
-        // 验证正面
-        Response<FrontRecognitionResult> front = idcardfrontrecongnition(files.get(0));
-        if(front.getError_code() != 0){
-            ExceptionUtil.wrapAndThrow(new Exception(front.getReason()));
-            return false;
-        }
-
-
-        // 验证反面
-        Response<BackRecognitionResult> back = idcardbackrecongnition(files.get(1));
-        if(back.getError_code() != 0){
-            ExceptionUtil.wrapAndThrow(new Exception(back.getReason()));
-            return false;
-        }
-
-        // 信息是否一致
-        if(!param.getCertificateCode().equals(front.getResult().getIdcardno())){
-            return false;
-        }
-        if(!param.getRealName().equals(front.getResult().getName())){
-            return false;
-        }
-        boolean b = LocalDateTime.parse(back.getResult().getEndDate()).compareTo(LocalDateTime.now()) > 0;
-        return b;
-    }
-
-    @Override
-    public Response<FrontRecognitionResult> idcardfrontrecongnition(String imageUrl) {
-
-        String host = "https://zidv2.market.alicloudapi.com";
-        String path = "/thirdnode/ImageAI/idcardfrontrecongnition";
-        String method = "POST";
-        Map<String, String> headers = new HashMap<String, String>();
-        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
-        headers.put("Authorization", "APPCODE " + appcode);
-        //根据API的要求，定义相对应的Content-Type
-        headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-        Map<String, String> querys = new HashMap<String, String>();
-        Map<String, String> bodys = new HashMap<String, String>();
-        bodys.put("base64Str", ImageUtil.ImageBase64(imageUrl));
-
-
-        try {
-            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
-            HttpEntity entity = response.getEntity();
-            String string = EntityUtils.toString(entity);
-            Response<FrontRecognitionResult> o = JSONObject.parseObject(string, new TypeReference<Response<FrontRecognitionResult>>() {
-            });
-
-            return o;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    @Override
-    public Response<BackRecognitionResult> idcardbackrecongnition(String imageUrl) {
-
-        String host = "https://zidv2.market.alicloudapi.com";
-        String path = "/thirdnode/ImageAI/idcardbackrecongnition";
-        String method = "POST";
-        Map<String, String> headers = new HashMap<String, String>();
-        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
-        headers.put("Authorization", "APPCODE " + appcode);
-        //根据API的要求，定义相对应的Content-Type
-        headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
-        Map<String, String> querys = new HashMap<String, String>();
-        Map<String, String> bodys = new HashMap<String, String>();
-        bodys.put("base64Str", ImageUtil.ImageBase64(imageUrl));
-
-
-        try {
-            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
-            HttpEntity entity = response.getEntity();
-            String string = EntityUtils.toString(entity);
-            Response<BackRecognitionResult> o = JSONObject.parseObject(string, new TypeReference<Response<BackRecognitionResult>>() {
-            });
-
-            return o;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java
deleted file mode 100644
index 3fa53e3..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/ChatConversationServiceImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.ChatConversation;
-import com.gxwebsoft.love.entity.ChatMessage;
-import com.gxwebsoft.love.mapper.ChatConversationMapper;
-import com.gxwebsoft.love.param.ChatConversationParam;
-import com.gxwebsoft.love.service.ChatConversationService;
-import com.gxwebsoft.love.vo.ChatConversationVO;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 聊天消息表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-15 21:26:48
- */
-@Service
-public class ChatConversationServiceImpl extends ServiceImpl<ChatConversationMapper, ChatConversation> implements ChatConversationService {
-
-    @Resource
-    private UserService userService;
-
-
-    @Override
-    public PageResult<ChatConversationVO> pageRel(ChatConversationParam param) {
-
-        MPJLambdaWrapper<ChatConversation> wrapper = JoinWrappers.lambda("t",ChatConversation.class)
-                .selectAll(ChatConversation.class)
-                // 查询用户
-//                .eq(ObjectUtils.isNotEmpty(param.getUserId()), ChatConversation::getUserId, param.getUserId())
-                .and(ObjectUtils.isNotEmpty(param.getUserId()), w2-> {
-                    w2.eq(ChatConversation::getUserId, param.getUserId()).or(w3->{
-                        w3.eq(ChatConversation::getFriendId, param.getUserId());
-                    });
-                } )
-                // 查询未读
-                .gt(param.getStatus()!= null &&param.getStatus() == 1, ChatConversation::getUnRead, 0)
-                //
-                .selectAssociation("t1",User.class, ChatConversationVO::getFriendInfo)
-                .selectAssociation("t2",User.class, ChatConversationVO::getUserInfo)
-                .innerJoin(User.class,"t1", User::getUserId, ChatConversation::getFriendId)
-                .innerJoin(User.class, "t2",  wrapper1 -> wrapper1.notLike(param.getOnlyFake(),User::getUsername, "%wx_").eq(User::getUserId, ChatConversation::getUserId))
-                // 消息列表 影响分页 暂时无解User::getUserId, ChatConversation::getUserId,
-//                .selectCollection(ChatMessage.class, ChatConversationVO::getMessages)
-//                .leftJoin(ChatMessage.class, on ->
-//                        on.and(w -> {
-//                                    w.eq(ChatMessage::getFormUserId, ChatConversation::getUserId).eq(ChatMessage::getToUserId, ChatConversation::getFriendId);
-//                                })
-//                                .or(w -> {
-//                                    w.eq(ChatMessage::getFormUserId, ChatConversation::getFriendId).eq(ChatMessage::getToUserId, ChatConversation::getUserId);
-//                                })
-//                                .orderByDesc(ChatMessage::getCreateTime)
-//                )
-
-                .orderByAsc(ChatConversation::getUserId)
-                .orderByDesc(ChatConversation::getUpdateTime);
-
-
-        Page<ChatConversationVO> chatConversationVOPage = baseMapper.selectJoinPage(new Page<>(param.getPage(), param.getLimit()), ChatConversationVO.class, wrapper);
-
-        return new PageResult<>(chatConversationVOPage.getRecords(), chatConversationVOPage.getTotal());
-    }
-
-    @Override
-    public List<ChatConversation> listRel(ChatConversationParam param) {
-        List<ChatConversation> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<ChatConversation, ChatConversationParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public ChatConversation getByIdRel(Integer id) {
-        ChatConversationParam param = new ChatConversationParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public ChatConversation getByBothId(Integer formUserId, Integer toUserId) {
-        ChatConversationParam param = new ChatConversationParam();
-        param.setUserId(formUserId);
-        param.setFriendId(toUserId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public List<ChatConversationVO> getFriendList(ChatConversationParam param) {
-        MPJLambdaWrapper<ChatConversation> wrapper = JoinWrappers.lambda(ChatConversation.class)
-                .selectAll(ChatConversation.class)
-                .eq(ChatConversation::getUserId, param.getUserId())
-                .selectAssociation(User.class, ChatConversationVO::getFriendInfo)
-                .leftJoin(User.class, User::getUserId, ChatConversation::getFriendId)
-                .selectCollection(ChatMessage.class, ChatConversationVO::getMessages)
-                .leftJoin(ChatMessage.class, on ->
-                        on.and(w -> {
-                                    w.eq(ChatMessage::getFormUserId, param.getUserId()).eq(ChatMessage::getToUserId, ChatConversation::getFriendId);
-                                })
-                                .or(w -> {
-                                    w.eq(ChatMessage::getFormUserId, ChatConversation::getFriendId).eq(ChatMessage::getToUserId, param.getUserId());
-                                })
-                                .orderByDesc(ChatMessage::getCreateTime)
-                )
-                .orderByDesc(ChatConversation::getUpdateTime);
-
-
-        return baseMapper.selectJoinList(ChatConversationVO.class, wrapper);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java
deleted file mode 100644
index 5f2d5b1..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/ChatMessageServiceImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.ChatConversation;
-import com.gxwebsoft.love.entity.ChatMessage;
-import com.gxwebsoft.love.enums.ChatMessageType;
-import com.gxwebsoft.love.mapper.ChatMessageMapper;
-import com.gxwebsoft.love.param.ChatMessageParam;
-import com.gxwebsoft.love.service.ChatConversationService;
-import com.gxwebsoft.love.service.ChatMessageService;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 聊天消息表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-10 18:27:25
- */
-@Service
-public class ChatMessageServiceImpl extends ServiceImpl<ChatMessageMapper, ChatMessage> implements ChatMessageService {
-
-    @Resource
-    private ChatConversationService conversationService;
-
-    @Resource
-    private ClientCache clientCache;
-
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<ChatMessage> pageRel(ChatMessageParam param) {
-        LambdaQueryWrapper<ChatMessage> wrapper = new LambdaQueryWrapper<>();
-        wrapper.and(w->{ w.eq(ChatMessage::getFormUserId, param.getToUserId()).eq(ChatMessage::getToUserId,param.getFormUserId()); })
-                .or(w->{ w.eq(ChatMessage::getFormUserId, param.getFormUserId()).eq(ChatMessage::getToUserId,param.getToUserId());})
-                .orderByAsc(ChatMessage::getCreateTime);
-
-        Page<ChatMessage> chatMessagePage = new Page<>(param.getPage(), param.getLimit());
-        Page<ChatMessage> result = baseMapper.selectPage(chatMessagePage, wrapper);
-        List<ChatMessage> list = result.getRecords();
-        Set<Integer> userIds = new HashSet<>();
-        if(param.getFormUserId() != null && param.getToUserId() != null){
-            userIds.add(param.getToUserId());
-            userIds.add(param.getFormUserId());
-        }else {
-           list.stream().forEach(d->{
-               userIds.add(d.getToUserId());
-               userIds.add(d.getFormUserId());
-           });
-        }
-        List<User> users = userService.list(Wrappers.lambdaQuery(User.class).in(User::getUserId, userIds));
-        Map<Integer, List<User>> collect = users.stream().collect(Collectors.groupingBy(User::getUserId));
-        list.stream().forEach(d->{
-            d.setFormUserInfo(collect.get(d.getFormUserId()).get(0));
-        });
-        return new PageResult<>(list, result.getTotal());
-    }
-
-    @Override
-    public List<ChatMessage> listRel(ChatMessageParam param) {
-        List<ChatMessage> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<ChatMessage, ChatMessageParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public ChatMessage getByIdRel(Integer id) {
-        ChatMessageParam param = new ChatMessageParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public List<ChatMessage> getUnreadMessage(Integer fromUserId, Integer toUserId) {
-        return null;
-    }
-
-    @Override
-    @Transactional
-    public boolean sendMessage(ChatMessage message) {
-        Integer userId = message.getFormUserId();
-        Integer toUserId = message.getToUserId();
-
-        User toUser = userService.getById(toUserId);
-        message.setToUserInfo(toUser);
-        // 判断双方是否是好友（有消息记录），没有就添加两条记录 后续可以做拉黑什么的处理
-        ChatConversation conversation1 = conversationService.getByBothId(userId, toUserId);
-        ChatConversation conversation2 = conversationService.getByBothId(toUserId, userId);
-        if(conversation1 == null){
-            conversation1 = new ChatConversation();
-            conversation1.setUserId(Integer.valueOf(userId));
-            conversation1.setFriendId(toUserId);
-        }
-        if(conversation2 == null){
-            conversation2 = new ChatConversation();
-            conversation2.setUserId(toUserId);
-            conversation2.setFriendId(Integer.valueOf(userId));
-        }
-        String lastContent;
-        if(ChatMessageType.IMAGE.getName().equals(message.getType())){
-            lastContent = "[图片]";
-        } else if (ChatMessageType.VOICE.getName().equals(message.getType())) {
-            lastContent = "[语音]";
-        }else if (ChatMessageType.CARD.getName().equals(message.getType())) {
-            lastContent = "[卡片]";
-        }else {
-            lastContent = message.getContent();
-        }
-        conversation1.setContent(lastContent);
-        //未读+1
-        conversation2.setUnRead(conversation2.getUnRead() + 1);
-        conversation2.setContent(lastContent);
-
-        // 发送到接收方
-        clientCache.sendUserEvent(message.getToUserId() + "", "message", message);
-        // 发送到管理员
-        clientCache.sendUserEvent("admin", "message", message);
-
-        this.save(message);
-        conversationService.saveOrUpdate(conversation1);
-        conversationService.saveOrUpdate(conversation2);
-        return  true;
-    }
-
-    @Override
-    public List<ChatMessage> getFriendMessage(Integer userId1, Integer userId2) {
-        LambdaQueryWrapper<ChatMessage> wrapper = new LambdaQueryWrapper<>();
-        wrapper.and(w->{ w.eq(ChatMessage::getFormUserId, userId1).eq(ChatMessage::getToUserId,userId2); })
-                .or(w->{ w.eq(ChatMessage::getFormUserId, userId2).eq(ChatMessage::getToUserId,userId1);})
-                .orderByAsc(ChatMessage::getCreateTime);
-
-        return baseMapper.selectList(wrapper);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java
deleted file mode 100644
index 6c82733..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/ProfitServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.love.mapper.ProfitMapper;
-import com.gxwebsoft.love.service.ProfitService;
-import com.gxwebsoft.love.entity.Profit;
-import com.gxwebsoft.love.param.ProfitParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 门店收益明细表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-28 20:49:17
- */
-@Service
-public class ProfitServiceImpl extends ServiceImpl<ProfitMapper, Profit> implements ProfitService {
-
-    @Override
-    public PageResult<Profit> pageRel(ProfitParam param) {
-        PageParam<Profit, ProfitParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Profit> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Profit> listRel(ProfitParam param) {
-        List<Profit> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Profit, ProfitParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Profit getByIdRel(Integer profitId) {
-        ProfitParam param = new ProfitParam();
-        param.setProfitId(profitId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java
deleted file mode 100644
index 776dc1e..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanEquityServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.mapper.UserPlanEquityMapper;
-import com.gxwebsoft.love.param.UserPlanEquityParam;
-import com.gxwebsoft.love.service.UserPlanEquityService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员套餐管理表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-23 11:34:03
- */
-@Service
-public class UserPlanEquityServiceImpl extends ServiceImpl<UserPlanEquityMapper, UserPlanEquity> implements UserPlanEquityService {
-
-    @Override
-    public PageResult<UserPlanEquity> pageRel(UserPlanEquityParam param) {
-        PageParam<UserPlanEquity, UserPlanEquityParam> page = new PageParam<>(param);
-        page.setDefaultOrder("plan_id desc,create_time desc");
-        List<UserPlanEquity> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserPlanEquity> listRel(UserPlanEquityParam param) {
-        List<UserPlanEquity> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserPlanEquity, UserPlanEquityParam> page = new PageParam<>();
-        page.setDefaultOrder("plan_id desc,create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserPlanEquity getByIdRel(Integer planEquityId) {
-        UserPlanEquityParam param = new UserPlanEquityParam();
-        param.setPlanEquityId(planEquityId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java
deleted file mode 100644
index 9d5db34..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanIconServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.love.mapper.UserPlanIconMapper;
-import com.gxwebsoft.love.service.UserPlanIconService;
-import com.gxwebsoft.love.entity.UserPlanIcon;
-import com.gxwebsoft.love.param.UserPlanIconParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员套餐权益表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-25 18:09:34
- */
-@Service
-public class UserPlanIconServiceImpl extends ServiceImpl<UserPlanIconMapper, UserPlanIcon> implements UserPlanIconService {
-
-    @Override
-    public PageResult<UserPlanIcon> pageRel(UserPlanIconParam param) {
-        PageParam<UserPlanIcon, UserPlanIconParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserPlanIcon> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserPlanIcon> listRel(UserPlanIconParam param) {
-        List<UserPlanIcon> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserPlanIcon, UserPlanIconParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserPlanIcon getByIdRel(Integer id) {
-        UserPlanIconParam param = new UserPlanIconParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java
deleted file mode 100644
index 7377d9a..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanLogServiceImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.love.mapper.UserPlanLogMapper;
-import com.gxwebsoft.love.service.UserPlanLogService;
-import com.gxwebsoft.love.entity.UserPlanLog;
-import com.gxwebsoft.love.param.UserPlanLogParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员特权购买记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Service
-public class UserPlanLogServiceImpl extends ServiceImpl<UserPlanLogMapper, UserPlanLog> implements UserPlanLogService {
-
-    @Override
-    public PageResult<UserPlanLog> pageRel(UserPlanLogParam param) {
-        PageParam<UserPlanLog, UserPlanLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserPlanLog> list = baseMapper.selectPageRel(page, param);
-
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserPlanLog> listRel(UserPlanLogParam param) {
-        List<UserPlanLog> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserPlanLog, UserPlanLogParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserPlanLog getByIdRel(Integer logId) {
-        UserPlanLogParam param = new UserPlanLogParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    /**
-     * 按订充值单号查询
-     */
-    @Override
-    public UserPlanLog getByOutTradeNo(String OutTradeNo) {
-      UserPlanLogParam param = new UserPlanLogParam();
-      param.setLogNo(OutTradeNo);
-      return param.getOne(baseMapper.getByOutTradeNo(param));
-    }
-
-    /**
-     * 支付成功 更新充值订单状态
-     */
-    @Override
-    public void updateByOutTradeNo(UserPlanLog OutTradeNo) {
-      baseMapper.updateByOutTradeNo(OutTradeNo);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java
deleted file mode 100644
index 64f32f6..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanPriceServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.love.mapper.UserPlanPriceMapper;
-import com.gxwebsoft.love.service.UserPlanPriceService;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.param.UserPlanPriceParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员套餐定价表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-20 18:07:50
- */
-@Service
-public class UserPlanPriceServiceImpl extends ServiceImpl<UserPlanPriceMapper, UserPlanPrice> implements UserPlanPriceService {
-
-    @Override
-    public PageResult<UserPlanPrice> pageRel(UserPlanPriceParam param) {
-        PageParam<UserPlanPrice, UserPlanPriceParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserPlanPrice> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserPlanPrice> listRel(UserPlanPriceParam param) {
-        List<UserPlanPrice> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserPlanPrice, UserPlanPriceParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserPlanPrice getByIdRel(Integer id) {
-        UserPlanPriceParam param = new UserPlanPriceParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java
deleted file mode 100644
index d5b5822..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/UserPlanServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.love.entity.UserPlan;
-import com.gxwebsoft.love.entity.UserPlanEquity;
-import com.gxwebsoft.love.entity.UserPlanIcon;
-import com.gxwebsoft.love.entity.UserPlanPrice;
-import com.gxwebsoft.love.mapper.UserPlanMapper;
-import com.gxwebsoft.love.param.UserPlanEquityParam;
-import com.gxwebsoft.love.param.UserPlanLogParam;
-import com.gxwebsoft.love.param.UserPlanParam;
-import com.gxwebsoft.love.service.*;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员套餐管理表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-21 11:21:01
- */
-@Service
-public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> implements UserPlanService {
-    @Resource
-    private UserPlanPriceService userPlanPriceService;
-    @Resource
-    private UserPlanLogService userPlanLogService;
-    @Resource
-    private UserPlanEquityService userPlanEquityService;
-    @Resource
-    private UserPlanIconService userPlanIconService;
-
-    @Override
-    public PageResult<UserPlan> pageRel(UserPlanParam param) {
-        PageParam<UserPlan, UserPlanParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserPlan> list = baseMapper.selectPageRel(page, param);
-        list.forEach(d -> {
-          d.setPrice(userPlanPriceService.list(new LambdaQueryWrapper<UserPlanPrice>().eq(UserPlanPrice::getPlanId, d.getPlanId())));
-          final UserPlanLogParam logParam = new UserPlanLogParam();
-          logParam.setPlanId(d.getPlanId());
-          logParam.setUserId(param.getLoginUserId());
-          d.setLog(userPlanLogService.listRel(logParam));
-          d.setIcons(userPlanIconService.list(new LambdaQueryWrapper<UserPlanIcon>().eq(UserPlanIcon::getPlanId,d.getPlanId())));
-        });
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserPlan> listRel(UserPlanParam param) {
-        List<UserPlan> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserPlan, UserPlanParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        list.forEach(d -> {
-          // 套餐价格列表
-          d.setPrice(userPlanPriceService.list(new LambdaQueryWrapper<UserPlanPrice>().eq(UserPlanPrice::getPlanId, d.getPlanId())));
-          // 购买记录
-          final UserPlanLogParam logParam = new UserPlanLogParam();
-          logParam.setPlanId(d.getPlanId());
-          logParam.setUserId(param.getLoginUserId());
-          d.setLog(userPlanLogService.pageRel(logParam).getList());
-          d.setIcons(userPlanIconService.list(new LambdaQueryWrapper<UserPlanIcon>().eq(UserPlanIcon::getPlanId,d.getPlanId())));
-          // 解锁的功能
-          final UserPlanEquityParam userPlanEquityParam = new UserPlanEquityParam();
-          userPlanEquityParam.setUserId(param.getLoginUserId());
-          userPlanEquityParam.setPlanId(d.getPlanId());
-          d.setEquity(userPlanEquityService.listRel(userPlanEquityParam));
-        });
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserPlan getByIdRel(Integer planId) {
-        UserPlanParam param = new UserPlanParam();
-        param.setPlanId(planId);
-        final List<UserPlan> list = baseMapper.selectListRel(param);
-        list.forEach(d -> {
-          // 套餐价格列表
-          d.setPrice(userPlanPriceService.list(new LambdaQueryWrapper<UserPlanPrice>().eq(UserPlanPrice::getPlanId, d.getPlanId())));
-          // 购买记录
-          final UserPlanLogParam logParam = new UserPlanLogParam();
-          logParam.setPlanId(d.getPlanId());
-          logParam.setUserId(param.getLoginUserId());
-          logParam.setLimit(1L);
-          d.setLog(userPlanLogService.pageRel(logParam).getList());
-          d.setIcons(userPlanIconService.list(new LambdaQueryWrapper<UserPlanIcon>().eq(UserPlanIcon::getPlanId,d.getPlanId())));
-          // 解锁的功能
-          final UserPlanEquityParam userPlanEquityParam = new UserPlanEquityParam();
-          userPlanEquityParam.setUserId(param.getLoginUserId());
-          userPlanEquityParam.setPlanId(d.getPlanId());
-          d.setEquity(userPlanEquityService.listRel(userPlanEquityParam));
-        });
-        return param.getOne(list);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java b/src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java
deleted file mode 100644
index 3035205..0000000
--- a/src/main/java/com/gxwebsoft/love/service/impl/UserProfileServiceImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.love.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.UserProfile;
-import com.gxwebsoft.love.mapper.UserProfileMapper;
-import com.gxwebsoft.love.param.UserProfileParam;
-import com.gxwebsoft.love.service.UserProfileService;
-import com.gxwebsoft.shop.entity.UserFollow;
-import com.gxwebsoft.shop.entity.UserLike;
-import com.gxwebsoft.shop.service.UserFollowService;
-import com.gxwebsoft.shop.service.UserLikeService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 会员资料表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-09 21:42:26
- */
-@Service
-public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserProfile> implements UserProfileService {
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserFollowService userFollowService;
-    @Resource
-    private UserLikeService userLikeService;
-
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-
-    @Override
-    public PageResult<UserProfile> pageRel(UserProfileParam param) {
-        PageParam<UserProfile, UserProfileParam> page = new PageParam<>(param);
-
-
-        // 我关注的人
-        final List<UserFollow> myFollows = userFollowService.list(new LambdaQueryWrapper<UserFollow>().eq(UserFollow::getUserId, param.getLoginUserId()).orderByDesc(UserFollow::getCreateTime));
-        List<Integer> followIds = myFollows.stream().map(UserFollow::getShopId).collect(Collectors.toList());
-        // 我点赞的人
-        final List<UserLike> myLikes = userLikeService.list(new LambdaQueryWrapper<UserLike>().eq(UserLike::getUserId, param.getLoginUserId()));
-        Set<Integer> likeUserIds = myLikes.stream().map(UserLike::getToUserId).collect(Collectors.toSet());
-
-        // 搜素条件
-        if (param.getScene() != null) {
-            // 推荐recommend
-            if (param.getScene().equals("recommend")) {
-                param.setRecommend(true);
-                param.setCityMate(null);
-                param.setNUserIds(likeUserIds); // 排除点赞的人
-                page.setDefaultOrder("create_time desc");
-            }
-            // 同城intraCity
-            if (param.getScene().equals("intraCity")) {
-                param.setRecommend(null);
-                param.setNUserIds(likeUserIds); // 排除点赞的人
-                page.setDefaultOrder("create_time desc");
-            }
-            // 关注focus
-            if (param.getLoginUserId() != null && param.getScene().equals("focus")) {
-
-                if (!CollectionUtils.isEmpty(followIds)) {
-                    // 分页处理
-                    param.setUserIds(followIds);
-                    param.setRecommend(null);
-                    param.setCityMate(null);
-                    List<UserProfile> list = baseMapper.selectPageRel(page, param);
-                    final List<User> userList = userService.listByIds(followIds);
-                    final Map<Integer, List<User>> collect = userList.stream().collect(Collectors.groupingBy(User::getUserId));
-                    // 重新排序
-                    List<UserProfile> newList = new ArrayList<>();
-                    for (Integer id : followIds) {
-                        Optional<UserProfile> first = list.stream().filter(p -> p.getUserId().equals(id)).findFirst();
-                        if (first.isPresent()) {
-                            UserProfile userProfile = first.get();
-                            userProfile.setUserInfo(collect.get(id).get(0));
-                            final boolean isLike = likeUserIds.stream().filter(f -> f.equals(id)).findFirst().isPresent();
-                            userProfile.setFollow(true);
-                            userProfile.setLiked(isLike);
-                            newList.add(userProfile);
-                        }else {
-                            logger.error("用户{}不存在", id);
-                        }
-
-                    }
-                    return new PageResult<>(newList, (long) myFollows.size());
-                } else {
-                    return new PageResult<>(new ArrayList<>(), (long) myFollows.size());
-                }
-            }
-            // 相册是否为空
-            param.setAlbums(true);
-        } else {
-            param.setCityMate(null);
-        }
-        List<UserProfile> list = baseMapper.selectPageRel(page, param);
-        if (CollectionUtils.isEmpty(list)) {
-            return new PageResult<>(list, page.getTotal());
-        }
-
-
-        final Set<Integer> userIds = list.stream().map(UserProfile::getUserId).collect(Collectors.toSet());
-        final List<User> userList = userService.listByIds(userIds);
-        final Map<Integer, List<User>> collect = userList.stream().collect(Collectors.groupingBy(User::getUserId));
-        list.forEach(d -> {
-            // 附加用户基本信息
-            d.setUserInfo(collect.get(d.getUserId()).get(0));
-            // 是否关注
-            final boolean isFollows = myFollows.stream().filter(f -> f.getShopId().equals(d.getUserId())).findFirst().isPresent();
-            final boolean isLike = likeUserIds.stream().filter(f -> f.equals(d.getUserId())).findFirst().isPresent();
-            d.setFollow(isFollows);
-            d.setLiked(isLike);
-
-        });
-
-        return new PageResult<>(list, page.getTotal());
-    }
-
-
-    @Override
-    public List<UserProfile> listRel(UserProfileParam param) {
-        List<UserProfile> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserProfile, UserProfileParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserProfile getByIdRel(Integer id) {
-        UserProfileParam param = new UserProfileParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java b/src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java
deleted file mode 100644
index c4fb207..0000000
--- a/src/main/java/com/gxwebsoft/love/socketio/cache/ClientCache.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gxwebsoft.love.socketio.cache;
-
-import com.corundumstudio.socketio.SocketIOClient;
-import com.corundumstudio.socketio.SocketIOServer;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @Author
- * @Description  用户信息缓存
- * @Date 14:00 2022/1/21
- * @Param
- * @return
- **/
-@Component
-public class ClientCache {
-
-    private static Map<String, HashMap<UUID, SocketIOClient>> concurrentHashMap = new ConcurrentHashMap<>();
-
-    private static SocketIOServer socketIOServer;
-
-    public static SocketIOServer getSocketIOServer() {
-        return socketIOServer;
-    }
-
-    public static void setSocketIOServer(SocketIOServer instance) {
-        socketIOServer = instance;
-    }
-    public void saveClient(String userId,UUID sessionId,SocketIOClient socketIOClient){
-        HashMap<UUID, SocketIOClient> sessionIdClientCache = concurrentHashMap.get(userId);
-        if(sessionIdClientCache == null){
-            sessionIdClientCache = new HashMap<>();
-        }
-        sessionIdClientCache.put(sessionId,socketIOClient);
-        concurrentHashMap.put(userId,sessionIdClientCache);
-    }
-
-
-    public HashMap<UUID,SocketIOClient> getUserClient(String userId){
-        return concurrentHashMap.get(userId);
-    }
-
-    public void deleteSessionClientByUserId(String userId,UUID sessionId){
-        concurrentHashMap.get(userId).remove(sessionId);
-    }
-
-
-    public void deleteUserCacheByUserId(String userId){
-        concurrentHashMap.remove(userId);
-    }
-
-    public int getOnLineCount(){
-        return concurrentHashMap.size();
-    }
-
-    public void sendUserEvent(String userId,String event, Object message) {
-        // 发送到接收方
-        HashMap<UUID, SocketIOClient> userClient = concurrentHashMap.get(userId);
-
-        // 查看对方是否在线
-        if(!CollectionUtils.isEmpty(userClient)){
-            for (UUID uuid : userClient.keySet()) {
-                SocketIOClient ioClient = userClient.get(uuid);
-                ioClient.sendEvent(event, message);
-
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java b/src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java
deleted file mode 100644
index 6de3096..0000000
--- a/src/main/java/com/gxwebsoft/love/socketio/config/SocketIOConfig.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gxwebsoft.love.socketio.config;
-
-import com.corundumstudio.socketio.SocketIOServer;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import com.gxwebsoft.love.socketio.handler.SocketIOHandler;
-import io.jsonwebtoken.Claims;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.io.InputStream;
-
-/**
- * socket服务配置
- * @author machenike
- */
-@Configuration
-public class SocketIOConfig implements InitializingBean {
-
-  private final static Logger logger = LoggerFactory.getLogger(SocketIOConfig.class);
-  @Value("${socketio.host}")
-  private String host;
-
-  @Value("${socketio.port}")
-  private Integer port;
-
-  @Resource
-  private SocketIOHandler socketIOHandler;
-
-  @Resource
-  private UserService userService;
-
-  @Resource
-  private ConfigProperties configProperties;
-
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    com.corundumstudio.socketio.Configuration config = new com.corundumstudio.socketio.Configuration();
-    //设置host
-    config.setHostname(host);
-    //设置端口
-    config.setPort(port);
-    config.setBossThreads(1);
-    config.setAuthorizationListener(handshakeData -> {
-      String userId =handshakeData.getSingleUrlParam("userId");
-      String token = handshakeData.getSingleUrlParam("token");
-      logger.info("身份验证 token：{}", token);
-      if(!StringUtils.hasText(token) || !StringUtils.hasText(userId)){
-        return false;
-      }
-      //  身份验证
-      Claims claims = JwtUtil.parseToken(token, configProperties.getTokenKey());
-      JwtSubject jwtSubject = JwtUtil.getJwtSubject(claims);
-      User user = userService.getByUsername(jwtSubject.getUsername(), jwtSubject.getTenantId());
-
-      if (user == null || !user.getUserId().equals(Integer.valueOf(userId))) {
-        return false;
-      }
-      return true;
-    });
-
-        InputStream resourceAsStream = this.getClass().getResourceAsStream("/jks/love.jks");  // 读取证书文件流
-        config.setKeyStore(resourceAsStream);  // 设置证书文件
-        config.setKeyStorePassword("123456");  // 设置证书密码
-
-//    SocketIOServer server = new SocketIOServer(config);
-//    //启动socket服务
-//    server.addListeners(socketIOHandler);
-//    server.start();
-//    ClientCache.setSocketIOServer(server);
-//    logger.debug("Netty SocketIO启动：{}:{}",host,port);
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java b/src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java
deleted file mode 100644
index d939f19..0000000
--- a/src/main/java/com/gxwebsoft/love/socketio/handler/SocketIOHandler.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.gxwebsoft.love.socketio.handler;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.corundumstudio.socketio.AckRequest;
-import com.corundumstudio.socketio.SocketIOClient;
-import com.corundumstudio.socketio.annotation.OnConnect;
-import com.corundumstudio.socketio.annotation.OnDisconnect;
-import com.corundumstudio.socketio.annotation.OnEvent;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.system.entity.Role;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.entity.ChatMessage;
-import com.gxwebsoft.love.service.ChatConversationService;
-import com.gxwebsoft.love.service.ChatMessageService;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.UUID;
-
-
-
-/**
- * socket处理拦截器
- * @author machenike
- */
-
-@Component
-public class SocketIOHandler {
-
-
-    @Resource
-    private ChatMessageService messageService;
-
-    @Resource
-    private ChatConversationService conversationService;
-
-    @Resource
-    private ClientCache clientCache;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private ConfigProperties configProperties;
-    /**
-     * 日志
-     */
-    private final static Logger logger = LoggerFactory.getLogger(SocketIOHandler.class);
-
-
-
-
-    /**
-     * 客户端连上socket服务器时执行此事件
-     * @param client
-     */
-    @OnConnect
-    public void onConnect(SocketIOClient client) {
-        String userId = client.getHandshakeData().getSingleUrlParam("userId");
-        logger.debug("socket client auth success [userId="+userId+"]");
-        UUID sessionId = client.getSessionId();
-
-
-        // 管理员
-        String isAdmin = client.getHandshakeData().getSingleUrlParam("isAdmin");
-        if(StringUtils.isNotBlank(isAdmin)){
-           // todo 权限验证
-            clientCache.saveClient("admin",sessionId, client);
-        }else {
-            clientCache.saveClient(userId,sessionId, client);
-        }
-
-        System.out.println("userId: "+userId+"连接建立成功 - "+sessionId);
-        logger.info("当前在线人数:{}",clientCache.getOnLineCount());
-
-    }
-
-
-    /**
-     * 客户端断开socket服务器时执行此事件
-     * @param client
-     */
-    @OnDisconnect
-    public void onDisconnect(SocketIOClient client) {
-        String userId = client.getHandshakeData().getSingleUrlParam("userId");
-        UUID sessionId = client.getSessionId();
-        clientCache.deleteSessionClientByUserId(userId,sessionId);
-        System.out.println("userId: "+userId+"连接关闭成功 - "+sessionId);
-
-    }
-
-    /**
-     *
-     * @param client
-     */
-    @OnEvent( value = "message")
-    @Transactional
-    public void onMessage(SocketIOClient client, AckRequest request, ChatMessage message) {
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java b/src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java
deleted file mode 100644
index b835d43..0000000
--- a/src/main/java/com/gxwebsoft/love/vo/ChatConversationVO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.gxwebsoft.love.vo;
-
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.love.entity.ChatConversation;
-import com.gxwebsoft.love.entity.ChatMessage;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class ChatConversationVO extends ChatConversation {
-    private User friendInfo;
-    private User userInfo;
-    private List<ChatMessage> messages = new ArrayList<>();
-    private Integer messageCount;
-
-}
diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java
deleted file mode 100644
index 8839a0a..0000000
--- a/src/main/java/com/gxwebsoft/love/vo/idcheck/BackRecognitionResult.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gxwebsoft.love.vo.idcheck;
-
-import lombok.Data;
-
-@Data
-public class BackRecognitionResult {
-
-    private String startDate;
-    private String endDate;
-    private String issue;
-}
diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java
deleted file mode 100644
index 5bf421d..0000000
--- a/src/main/java/com/gxwebsoft/love/vo/idcheck/FrontRecognitionResult.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gxwebsoft.love.vo.idcheck;
-
-import lombok.Data;
-
-@Data
-public class FrontRecognitionResult {
-    private String idcardno;
-    private String name;
-    private String nationality;
-    private String sex;
-    private String birth;
-    private String address;
-    private String imageStats;
-    private String direction;
-}
diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java
deleted file mode 100644
index 64d8412..0000000
--- a/src/main/java/com/gxwebsoft/love/vo/idcheck/IdCardInfor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.gxwebsoft.love.vo.idcheck;
-
-import lombok.Data;
-
-@Data
-public class IdCardInfor {
-    private String province;
-    private String city;
-    private String district;
-    private String area;
-    private String sex;
-    private String birthday;
-}
-
diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java
deleted file mode 100644
index a44f347..0000000
--- a/src/main/java/com/gxwebsoft/love/vo/idcheck/Response.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gxwebsoft.love.vo.idcheck;
-
-import lombok.Data;
-
-@Data
-public class Response<T> {
-    private Integer error_code;
-    private String reason;
-    private T result;
-}
diff --git a/src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java b/src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java
deleted file mode 100644
index 9cde12e..0000000
--- a/src/main/java/com/gxwebsoft/love/vo/idcheck/VerifyResult.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.gxwebsoft.love.vo.idcheck;
-
-import lombok.Data;
-
-@Data
-public class VerifyResult {
-    private String realname;
-    private String idcard;
-
-    private boolean isOk;
-
-    private IdCardInfor idCardInfor;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java b/src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java
deleted file mode 100644
index adaa556..0000000
--- a/src/main/java/com/gxwebsoft/oa/constants/NoticeConstants.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gxwebsoft.oa.constants;
-
-public class NoticeConstants {
-  // 通知类型
-  public static final String NOTICE = "notice";     // 提醒
-  public static final String LETTER = "letter";     // 私信
-  public static final String TODO = "todo";         // 待办
-  public static final String CHAT_GPT = "chatGPT";   // AI机器人
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java b/src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java
deleted file mode 100644
index 2299d33..0000000
--- a/src/main/java/com/gxwebsoft/oa/constants/TaskConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gxwebsoft.oa.constants;
-
-public class TaskConstants {
-  // 进度管理
-  public static final Integer PROGRESS0 = 0; // 待分派
-  public static final Integer PROGRESS1 = 1; // 待处理
-  public static final Integer PROGRESS2 = 2; // 处理中
-  public static final Integer PROGRESS3 = 3; // 待确认
-  public static final Integer PROGRESS4 = 4; // 待反馈
-  public static final Integer PROGRESS5 = 5; // 已完结
-  public static final Integer PROGRESS6 = 6; // 已关闭
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/AppController.java b/src/main/java/com/gxwebsoft/oa/controller/AppController.java
deleted file mode 100644
index cb6f9fb..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/AppController.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppParam;
-import com.gxwebsoft.oa.service.AppService;
-import com.gxwebsoft.oa.service.AppUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 应用管理记录表控制器
- *
- * @author 科技小王子
- * @since 2023-03-28 10:45:39
- */
-@Api(tags = "应用管理记录表管理")
-@RestController
-@RequestMapping("/api/oa/app")
-public class AppController extends BaseController {
-    @Resource
-    private AppService appService;
-    @Resource
-    private CacheClient cacheClient;
-    @Resource
-    private AppUserService appUserService;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    @PreAuthorize("hasAuthority('oa:app:list')")
-    @ApiOperation("分页查询应用管理记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<App>> page(AppParam param) {
-      final User loginUser = getLoginUser();
-      final Integer userId = loginUser.getUserId();
-      loginUser.getRoles().forEach(d -> {
-        if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){
-          // 非管理员按项目成员权限显示
-          final List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserId, userId));
-          final Set<Integer> collect = list.stream().map(AppUser::getAppId).collect(Collectors.toSet());
-          param.setAppIds(collect);
-        }
-      });
-      // 使用关联查询
-      return success(appService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:list')")
-    @ApiOperation("查询全部应用管理记录表")
-    @GetMapping()
-    public ApiResult<List<App>> list(AppParam param) {
-        // 使用关联查询
-        return success(appService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:list')")
-    @ApiOperation("根据id查询应用管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<App> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(appService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:save')")
-    @ApiOperation("添加应用管理记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody App app) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          app.setUserId(loginUser.getUserId());
-          app.setTenantId(loginUser.getTenantId());
-        }
-        if (appService.count(new LambdaQueryWrapper<App>()
-          .eq(App::getAppCode, app.getAppCode())) > 0) {
-          return fail("应用标识已存在");
-        }
-        if (appService.save(app)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:update')")
-    @ApiOperation("修改应用管理记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody App app) {
-        if (appService.updateById(app)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:remove')")
-    @ApiOperation("删除应用管理记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (appService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:save')")
-    @ApiOperation("批量添加应用管理记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<App> list) {
-        if (appService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:update')")
-    @ApiOperation("批量修改应用管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<App> batchParam) {
-        if (batchParam.update(appService, "app_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:remove')")
-    @ApiOperation("批量删除应用管理记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (appService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:app:update')")
-    @ApiOperation("重置秘钥")
-    @PostMapping("/updateAppSecret")
-    public ApiResult<?> updateAppSecret(@RequestBody App app) {
-      if (app.getAppId() == null) {
-        return fail("请勿重复操作");
-      }
-      App result = appService.getByIdRel(app.getAppId());
-      String key = cacheClient.key("AppSecret", app.getAppId());
-      String appSecret = IdUtil.fastSimpleUUID();
-      cacheClient.set(key,appSecret);
-      result.setAppSecret(appSecret);
-      return success("重置成功",result);
-    }
-
-    @ApiOperation("APP应用授权身份效验")
-    @GetMapping("/authentication/{appid}")
-    public ApiResult<?> authentication(@PathVariable("appid") String appid) {
-      final App appInfo = appService.getById(appid);
-      if(appInfo == null){
-        return fail("应用不存在:".concat(appid));
-      }
-      return success("应用信息",appInfo);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/AppUserController.java b/src/main/java/com/gxwebsoft/oa/controller/AppUserController.java
deleted file mode 100644
index 8b7cd56..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/AppUserController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppUserParam;
-import com.gxwebsoft.oa.service.AppUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 应用成员控制器
- *
- * @author 科技小王子
- * @since 2023-05-31 13:18:55
- */
-@Api(tags = "应用成员管理")
-@RestController
-@RequestMapping("/api/oa/app-user")
-public class AppUserController extends BaseController {
-    @Resource
-    private AppUserService appUserService;
-
-    @PreAuthorize("hasAuthority('oa:appUser:list')")
-    @ApiOperation("分页查询应用成员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<AppUser>> page(AppUserParam param) {
-        // 使用关联查询
-        return success(appUserService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:list')")
-    @ApiOperation("查询全部应用成员")
-    @GetMapping()
-    public ApiResult<List<AppUser>> list(AppUserParam param) {
-        // 使用关联查询
-        if (param.getAppId() == null) {
-          return fail("AppId不存在",null);
-        }
-        return success(appUserService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:list')")
-    @ApiOperation("根据id查询应用成员")
-    @GetMapping("/{id}")
-    public ApiResult<AppUser> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(appUserService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:save')")
-    @ApiOperation("添加应用成员")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody AppUser appUser) {
-        if (appUserService.count(new LambdaQueryWrapper<AppUser>()
-          .eq(AppUser::getUserId, appUser.getUserId()).eq(AppUser::getAppId,appUser.getAppId())) > 0) {
-          return fail("该成员已存在");
-        }
-        if (appUserService.save(appUser)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:update')")
-    @ApiOperation("修改应用成员")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody AppUser appUser) {
-        if (appUserService.updateById(appUser)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:remove')")
-    @ApiOperation("删除应用成员")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (appUserService.removeById(id)) {
-            return success("移除成功");
-        }
-        return fail("移除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:save')")
-    @ApiOperation("批量添加应用成员")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<AppUser> list) {
-        if (appUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:update')")
-    @ApiOperation("批量修改应用成员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppUser> batchParam) {
-        if (batchParam.update(appUserService, "app_user_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:appUser:remove')")
-    @ApiOperation("批量删除应用成员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (appUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java b/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java
deleted file mode 100644
index e444c75..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.BtUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.entity.Assets;
-import com.gxwebsoft.oa.entity.AssetsUser;
-import com.gxwebsoft.oa.param.AssetsParam;
-import com.gxwebsoft.oa.service.AssetsService;
-import com.gxwebsoft.oa.service.AssetsUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 服务器资产记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-@Api(tags = "服务器资产记录表管理")
-@RestController
-@RequestMapping("/api/oa/assets")
-public class AssetsController extends BaseController {
-    @Resource
-    private AssetsService assetsService;
-    @Resource
-    private AssetsUserService assetsUserService;
-    @Resource
-    private BtUtil btUtil;
-
-    @PreAuthorize("hasAuthority('oa:assets:list')")
-    @ApiOperation("分页查询服务器资产记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Assets>> page(AssetsParam param) {
-        final User loginUser = getLoginUser();
-        final Integer userId = loginUser.getUserId();
-        loginUser.getRoles().forEach(d -> {
-          if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){
-            // 非管理员按项目成员权限显示
-            param.setSceneType("NotAdministrator");
-            final List<AssetsUser> list = assetsUserService.list(new LambdaQueryWrapper<AssetsUser>().eq(AssetsUser::getUserId, userId));
-            final Set<Integer> collect = list.stream().map(AssetsUser::getAssetsId).collect(Collectors.toSet());
-            if(!CollectionUtils.isEmpty(collect)){
-              param.setAssetsIds(collect);
-            }
-          }
-        });
-        // 非管理员并且无分配资源
-        if(param.getSceneType() != null && param.getSceneType().equals("NotAdministrator") && CollectionUtils.isEmpty(param.getAssetsIds())){
-          final PageResult<Assets> result = new PageResult<>();
-          result.setList(new ArrayList<>());
-          result.setCount(0L);
-          return success(result);
-        }
-        // 返回查询结果
-        return success(assetsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:list')")
-    @ApiOperation("查询全部服务器资产记录表")
-    @GetMapping()
-    public ApiResult<List<Assets>> list(AssetsParam param) {
-        // 使用关联查询
-        return success(assetsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:list')")
-    @ApiOperation("根据id查询服务器资产记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Assets> get(@PathVariable("id") Integer id) {
-        final Assets assets = assetsService.getByIdRel(id);
-        final BtUtil client = btUtil.client(id);
-        final String systemTotal = client.getSystemTotal();
-        final String diskInfo = client.getDiskInfo();
-        assets.setSystemTotal(systemTotal);
-        assets.setDiskInfo(diskInfo);
-        // 使用关联查询
-        return success(assets);
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:save')")
-    @ApiOperation("添加服务器资产记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Assets assets) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          assets.setUserId(loginUser.getUserId());
-        }
-        if (assetsService.count(new LambdaQueryWrapper<Assets>().eq(Assets::getCode,assets.getCode())) > 0) {
-          return fail("该IP地址已存在");
-        }
-        if (assetsService.save(assets)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:update')")
-    @ApiOperation("修改服务器资产记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Assets assets) {
-        if (assetsService.updateById(assets)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:remove')")
-    @ApiOperation("删除服务器资产记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (assetsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:save')")
-    @ApiOperation("批量添加服务器资产记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Assets> list) {
-        if (assetsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:update')")
-    @ApiOperation("批量修改服务器资产记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Assets> batchParam) {
-        if (batchParam.update(assetsService, "assets_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assets:remove')")
-    @ApiOperation("批量删除服务器资产记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (assetsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java b/src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java
deleted file mode 100644
index 8c86a0c..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/AssetsUserController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.service.AssetsUserService;
-import com.gxwebsoft.oa.entity.AssetsUser;
-import com.gxwebsoft.oa.param.AssetsUserParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 服务器成员管理控制器
- *
- * @author 科技小王子
- * @since 2023-07-18 14:35:51
- */
-@Api(tags = "服务器成员管理管理")
-@RestController
-@RequestMapping("/api/oa/assets-user")
-public class AssetsUserController extends BaseController {
-    @Resource
-    private AssetsUserService assetsUserService;
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:list')")
-    @ApiOperation("分页查询服务器成员管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<AssetsUser>> page(AssetsUserParam param) {
-        // 使用关联查询
-        return success(assetsUserService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:list')")
-    @ApiOperation("查询全部服务器成员管理")
-    @GetMapping()
-    public ApiResult<List<AssetsUser>> list(AssetsUserParam param) {
-        // 使用关联查询
-        return success(assetsUserService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:list')")
-    @ApiOperation("根据id查询服务器成员管理")
-    @GetMapping("/{id}")
-    public ApiResult<AssetsUser> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(assetsUserService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:save')")
-    @ApiOperation("添加服务器成员管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody AssetsUser assetsUser) {
-        if (assetsUserService.count(new LambdaQueryWrapper<AssetsUser>()
-          .eq(AssetsUser::getUserId, assetsUser.getUserId()).eq(AssetsUser::getAssetsId,assetsUser.getAssetsId())) > 0) {
-          return fail("该成员已存在");
-        }
-        if (assetsUserService.save(assetsUser)) {
-          return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:update')")
-    @ApiOperation("修改服务器成员管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody AssetsUser assetsUser) {
-        if (assetsUserService.updateById(assetsUser)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:remove')")
-    @ApiOperation("删除服务器成员管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (assetsUserService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:save')")
-    @ApiOperation("批量添加服务器成员管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<AssetsUser> list) {
-        if (assetsUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:update')")
-    @ApiOperation("批量修改服务器成员管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<AssetsUser> batchParam) {
-        if (batchParam.update(assetsUserService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:assetsUser:remove')")
-    @ApiOperation("批量删除服务器成员管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (assetsUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/CustomerController.java b/src/main/java/com/gxwebsoft/oa/controller/CustomerController.java
deleted file mode 100644
index 88bedcc..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/CustomerController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Customer;
-import com.gxwebsoft.oa.param.CustomerParam;
-import com.gxwebsoft.oa.service.CustomerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 客户管理记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:16:14
- */
-@Api(tags = "客户管理记录表管理")
-@RestController
-@RequestMapping("/api/oa/customer")
-public class CustomerController extends BaseController {
-    @Resource
-    private CustomerService customerService;
-
-    @PreAuthorize("hasAuthority('oa:customer:list')")
-    @ApiOperation("分页查询客户管理记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Customer>> page(CustomerParam param) {
-        // 使用关联查询
-        return success(customerService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:list')")
-    @ApiOperation("查询全部客户管理记录表")
-    @GetMapping()
-    public ApiResult<List<Customer>> list(CustomerParam param) {
-        // 使用关联查询
-        return success(customerService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:list')")
-    @ApiOperation("根据id查询客户管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Customer> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(customerService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:save')")
-    @ApiOperation("添加客户管理记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Customer customer) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          customer.setUserId(loginUser.getUserId());
-        }
-        if (customerService.save(customer)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:update')")
-    @ApiOperation("修改客户管理记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Customer customer) {
-        if (customerService.updateById(customer)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:remove')")
-    @ApiOperation("删除客户管理记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (customerService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:save')")
-    @ApiOperation("批量添加客户管理记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Customer> list) {
-        if (customerService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:update')")
-    @ApiOperation("批量修改客户管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Customer> batchParam) {
-        if (batchParam.update(customerService, "customer_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:customer:remove')")
-    @ApiOperation("批量删除客户管理记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (customerService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/NoticeController.java b/src/main/java/com/gxwebsoft/oa/controller/NoticeController.java
deleted file mode 100644
index bc21767..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/NoticeController.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Notice;
-import com.gxwebsoft.oa.param.NoticeParam;
-import com.gxwebsoft.oa.service.NoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 消息记录表控制器
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-@Api(tags = "消息记录表管理")
-@RestController
-@RequestMapping("/api/oa/notice")
-public class NoticeController extends BaseController {
-    @Resource
-    private NoticeService noticeService;
-
-    @PreAuthorize("hasAuthority('oa:notice:list')")
-    @ApiOperation("分页查询消息记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Notice>> page(NoticeParam param) {
-        // 使用关联查询
-        param.setUserId(getLoginUserId());
-        return success(noticeService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:list')")
-    @ApiOperation("查询全部消息记录表")
-    @GetMapping()
-    public ApiResult<List<Notice>> list(NoticeParam param) {
-        // 使用关联查询
-        param.setUserId(getLoginUserId());
-        return success(noticeService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:list')")
-    @ApiOperation("根据id查询消息记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Notice> get(@PathVariable("id") Integer id) {
-        return success(noticeService.getById(id));
-        // 使用关联查询
-        //return success(noticeService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:save')")
-    @ApiOperation("添加消息记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Notice notice) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          notice.setUserId(loginUser.getUserId());
-        }
-        if (noticeService.save(notice)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:update')")
-    @ApiOperation("修改消息记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Notice notice) {
-        if (noticeService.updateById(notice)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:remove')")
-    @ApiOperation("删除消息记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (noticeService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:save')")
-    @ApiOperation("批量添加消息记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Notice> list) {
-        if (noticeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:update')")
-    @ApiOperation("批量修改消息记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> updateBatch(@RequestBody List<Notice> list) {
-        if (noticeService.updateBatchById(list)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:notice:remove')")
-    @ApiOperation("批量删除消息记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (noticeService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-  @PreAuthorize("hasAuthority('oa:notice:list')")
-  @ApiOperation("统计信息")
-  @GetMapping("/getUnReadNum")
-  public ApiResult<?> getUnReadNum(){
-    JSONObject json = new JSONObject();
-    json.put("notice",noticeService.count(new LambdaQueryWrapper<Notice>()
-      .eq(Notice::getUserId, getLoginUserId())
-      .eq(Notice::getType,"notice")
-      .eq(Notice::getStatus,0)));
-    json.put("letter",noticeService.count(new LambdaQueryWrapper<Notice>()
-      .eq(Notice::getUserId, getLoginUserId())
-      .eq(Notice::getType,"letter")
-      .eq(Notice::getStatus,0)));
-    json.put("todo",noticeService.count(new LambdaQueryWrapper<Notice>()
-      .eq(Notice::getUserId, getLoginUserId())
-      .eq(Notice::getType,"todo")
-      .eq(Notice::getStatus,0)));
-    return success("操作成功",json);
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/ProjectController.java b/src/main/java/com/gxwebsoft/oa/controller/ProjectController.java
deleted file mode 100644
index 36c7d8b..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/ProjectController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.service.ProjectService;
-import com.gxwebsoft.oa.entity.Project;
-import com.gxwebsoft.oa.param.ProjectParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 项目管理表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:00:43
- */
-@Api(tags = "项目管理表管理")
-@RestController
-@RequestMapping("/api/oa/project")
-public class ProjectController extends BaseController {
-    @Resource
-    private ProjectService projectService;
-
-    @PreAuthorize("hasAuthority('oa:project:list')")
-    @ApiOperation("分页查询项目管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Project>> page(ProjectParam param) {
-        PageParam<Project, ProjectParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(projectService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(projectService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:list')")
-    @ApiOperation("查询全部项目管理表")
-    @GetMapping()
-    public ApiResult<List<Project>> list(ProjectParam param) {
-        PageParam<Project, ProjectParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(projectService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(projectService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:list')")
-    @ApiOperation("根据id查询项目管理表")
-    @GetMapping("/{id}")
-    public ApiResult<Project> get(@PathVariable("id") Integer id) {
-        return success(projectService.getById(id));
-        // 使用关联查询
-        //return success(projectService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:save')")
-    @ApiOperation("添加项目管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Project project) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          project.setUserId(loginUser.getUserId());
-        }
-        if (projectService.save(project)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:update')")
-    @ApiOperation("修改项目管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Project project) {
-        if (projectService.updateById(project)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:remove')")
-    @ApiOperation("删除项目管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (projectService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:save')")
-    @ApiOperation("批量添加项目管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Project> list) {
-        if (projectService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:update')")
-    @ApiOperation("批量修改项目管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Project> batchParam) {
-        if (batchParam.update(projectService, "project_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:project:remove')")
-    @ApiOperation("批量删除项目管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (projectService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskController.java
deleted file mode 100644
index 7e1339c..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/TaskController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.entity.TaskUser;
-import com.gxwebsoft.oa.param.TaskParam;
-import com.gxwebsoft.oa.service.NoticeService;
-import com.gxwebsoft.oa.service.TaskRecordService;
-import com.gxwebsoft.oa.service.TaskService;
-import com.gxwebsoft.oa.service.TaskUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 工单记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:43
- */
-@Api(tags = "工单记录表管理")
-@RestController
-@RequestMapping("/api/oa/task")
-public class TaskController extends BaseController {
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private TaskRecordService taskRecordService;
-    @Resource
-    private TaskUserService taskUserService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private NoticeService noticeService;
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("分页查询工单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Task>> page(TaskParam param) {
-        // 使用关联查询
-        final User loginUser = getLoginUser();
-        final Integer type = loginUser.getType();
-        loginUser.getRoles().forEach(d -> {
-          if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){
-            // 如果是开发者账号则按受理人查询
-            if (type.equals(6)) {
-              param.setCommander(loginUser.getUserId());
-            }else{
-              param.setPromoter(getLoginUserId());
-            }
-          }
-        });
-        return success(taskService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("查询全部工单记录表")
-    @GetMapping()
-    public ApiResult<List<Task>> list(TaskParam param) {
-        PageParam<Task, TaskParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(taskService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(taskService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("根据id查询工单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Task> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-      return success(taskService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:save')")
-    @ApiOperation("添加工单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Task task) {
-        // 记录用户id
-        final Integer loginUserId = getLoginUserId();
-        Integer promoter = task.getPromoter();
-        task.setUserId(loginUserId);
-        task.setComments(StrUtil.sub(task.getContent(),0,200));
-        task.setPromoter(promoter != null ? promoter : loginUserId);
-        task.setLastReadUser(loginUserId);
-        if (taskService.save(task)) {
-            // 添加聊天内容明细
-            TaskRecord taskRecord = new TaskRecord();
-            taskRecord.setUserId(loginUserId);
-            taskRecord.setContent(task.getContent());
-            taskRecord.setTaskId(task.getTaskId());
-            taskRecord.setFiles(task.getFiles());
-            taskRecordService.save(taskRecord);
-            // 添加工单成员
-            TaskUser taskUser = new TaskUser();
-            taskUser.setUserId(loginUserId);
-            taskUser.setTaskId(task.getTaskId());
-            taskUserService.save(taskUser);
-            // 发待办提醒
-            if(task.getCommander() != null){
-              noticeService.addTodo(task);
-            }
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:update')")
-    @ApiOperation("修改工单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Task task) {
-        if(task.getCommander() != null && userService.getById(task.getCommander()) == null){
-            return fail("受理人不存在");
-          }
-        if (taskService.updateById(task)) {
-              // 发待办提醒
-              noticeService.addTodo(task);
-              return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:remove')")
-    @ApiOperation("删除工单记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (taskService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:save')")
-    @ApiOperation("批量添加工单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Task> list) {
-        if (taskService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:update')")
-    @ApiOperation("批量修改工单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Task> batchParam) {
-        if (batchParam.update(taskService, "task_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:remove')")
-    @ApiOperation("批量删除工单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (taskService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("统计信息")
-    @GetMapping("/count")
-    public ApiResult<?> count(TaskParam param){
-      // 验证签名
-      isCheckSign();
-      User loginUser = getLoginUser();
-      ArrayList<Object> countNum = taskService.getCountNum(loginUser,param);
-      return success("操作成功",countNum);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java
deleted file mode 100644
index 6b5b227..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.service.*;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.param.TaskRecordParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.oa.constants.NoticeConstants.LETTER;
-import static com.gxwebsoft.oa.constants.TaskConstants.*;
-
-/**
- * 工单回复记录表控制器
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-@Api(tags = "工单回复记录表管理")
-@RestController
-@RequestMapping("/api/oa/task-record")
-public class TaskRecordController extends BaseController {
-    @Resource
-    private TaskRecordService taskRecordService;
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private NoticeService noticeService;
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("分页查询工单回复记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TaskRecord>> page(TaskRecordParam param) {
-        // 使用关联查询
-        return success(taskRecordService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("查询全部工单回复记录表")
-    @GetMapping()
-    public ApiResult<List<TaskRecord>> list(TaskRecordParam param) {
-        // 更新查阅状态
-        Task task = taskService.getById(param.getTaskId());
-        if(!getLoginUserId().equals(task.getLastReadUser())){
-          task.setIsRead(1);
-        }
-        taskService.updateById(task);
-      // 使用关联查询
-        return success(taskRecordService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("根据id查询工单回复记录表")
-    @GetMapping("/{id}")
-    public ApiResult<TaskRecord> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(taskRecordService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:save')")
-    @ApiOperation("添加工单回复记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TaskRecord taskRecord) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          taskRecord.setUserId(loginUser.getUserId());
-        }
-        if (taskRecordService.save(taskRecord)) {
-          Task task = new Task();
-          task.setTaskId(taskRecord.getTaskId());
-          task.setProgress(PROGRESS2);
-          task.setIsRead(0);
-          task.setLastReadUser(getLoginUserId());
-          taskService.updateById(task);
-          // 发送私信
-          noticeService.addLetter(taskRecord);
-          return success("提交成功");
-        }
-        return fail("提交失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:update')")
-    @ApiOperation("修改工单回复记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TaskRecord taskRecord) {
-        if (taskRecordService.updateById(taskRecord)) {
-          Task task = taskService.getById(taskRecord.getTaskId());
-          task.setIsRead(0);
-          task.setLastReadUser(getLoginUserId());
-          return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:remove')")
-    @ApiOperation("删除工单回复记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (taskRecordService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:save')")
-    @ApiOperation("批量添加工单回复记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TaskRecord> list) {
-        if (taskRecordService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:update')")
-    @ApiOperation("批量修改工单回复记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TaskRecord> batchParam) {
-        if (batchParam.update(taskRecordService, "task_record_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:remove')")
-    @ApiOperation("批量删除工单回复记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (taskRecordService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java
deleted file mode 100644
index 168704e..0000000
--- a/src/main/java/com/gxwebsoft/oa/controller/TaskUserController.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.gxwebsoft.oa.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.entity.TaskUser;
-import com.gxwebsoft.oa.param.TaskUserParam;
-import com.gxwebsoft.oa.service.TaskService;
-import com.gxwebsoft.oa.service.TaskUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.oa.constants.TaskConstants.PROGRESS1;
-
-/**
- * 工单成员控制器
- *
- * @author 科技小王子
- * @since 2023-03-06 12:00:41
- */
-@Api(tags = "工单成员管理")
-@RestController
-@RequestMapping("/api/oa/task-user")
-public class TaskUserController extends BaseController {
-    @Resource
-    private UserService userService;
-    @Resource
-    private TaskUserService taskUserService;
-    @Resource
-    private TaskService taskService;
-
-    @PreAuthorize("hasAuthority('oa:taskUser:list')")
-    @ApiOperation("分页查询工单成员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TaskUser>> page(TaskUserParam param) {
-        // 使用关联查询
-        return success(taskUserService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:list')")
-    @ApiOperation("查询全部工单成员")
-    @GetMapping()
-    public ApiResult<List<TaskUser>> list(TaskUserParam param) {
-        // 使用关联查询
-        return success(taskUserService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:list')")
-    @ApiOperation("根据id查询工单成员")
-    @GetMapping("/{id}")
-    public ApiResult<TaskUser> get(@PathVariable("id") Integer id) {
-//        return success(taskUserService.getById(id));
-        // 使用关联查询
-        return success(taskUserService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:save')")
-    @ApiOperation("添加工单成员")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TaskUser taskUser) {
-        User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getUsername, taskUser.getName()));
-        if(user == null){
-          throw new BusinessException("找不到该用户");
-        }
-        int count = taskUserService.count(new LambdaQueryWrapper<TaskUser>().eq(TaskUser::getUserId, user.getUserId()).eq(TaskUser::getTaskId,taskUser.getTaskId()));
-        if( count > 0) {
-          return fail("请勿重复指派");
-        }
-        taskUser.setUserId(user.getUserId());
-        if (taskUserService.save(taskUser)) {
-          Task task = new Task();
-          task.setTaskId(taskUser.getTaskId());
-          task.setProgress(PROGRESS1);
-          task.setIsRead(0);
-          task.setLastReadUser(getLoginUserId());
-          taskService.updateById(task);
-          return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:update')")
-    @ApiOperation("修改工单成员")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TaskUser taskUser) {
-        if (taskUserService.updateById(taskUser)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:remove')")
-    @ApiOperation("删除工单成员")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (taskUserService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:save')")
-    @ApiOperation("批量添加工单成员")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TaskUser> list) {
-        if (taskUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:update')")
-    @ApiOperation("批量修改工单成员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TaskUser> batchParam) {
-        if (batchParam.update(taskUserService, "task_user_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('oa:taskUser:remove')")
-    @ApiOperation("批量删除工单成员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (taskUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/App.java b/src/main/java/com/gxwebsoft/oa/entity/App.java
deleted file mode 100644
index 73fe981..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/App.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 应用管理记录表
- *
- * @author 科技小王子
- * @since 2023-03-28 10:45:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "App对象", description = "应用管理记录表")
-@TableName("oa_app")
-public class App implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "应用ID")
-    @TableId(value = "app_id", type = IdType.AUTO)
-    private Integer appId;
-
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-
-    @ApiModelProperty(value = "上级id, 0是顶级")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "应用标识")
-    private String appCode;
-
-    @ApiModelProperty(value = "类型, 0菜单, 1按钮")
-    private String appType;
-
-    @ApiModelProperty(value = "应用类型多选")
-    private String appTypeMultiple;
-
-    @ApiModelProperty(value = "类型, 0菜单, 1按钮")
-    private Integer menuType;
-
-    @ApiModelProperty(value = "企业ID")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "应用图标")
-    private String appIcon;
-
-    @ApiModelProperty(value = "二维码")
-    private String appQrcode;
-
-    @ApiModelProperty(value = "链接地址")
-    private String appUrl;
-
-    @ApiModelProperty(value = "后台管理地址")
-    private String adminUrl;
-
-    @ApiModelProperty(value = "下载地址")
-    private String downUrl;
-
-    @ApiModelProperty(value = "服务器地址")
-    private String serverUrl;
-
-    @ApiModelProperty(value = "回调地址")
-    private String callbackUrl;
-
-    @ApiModelProperty(value = "腾讯文档地址")
-    private String docsUrl;
-
-    @ApiModelProperty(value = "仓库地址")
-    private String gitUrl;
-
-    @ApiModelProperty(value = "文件服务器")
-    private String fileUrl;
-
-    @ApiModelProperty(value = "原型图地址")
-    private String prototypeUrl;
-
-    @ApiModelProperty(value = "IP白名单")
-    private String ipAddress;
-
-    @ApiModelProperty(value = "应用截图")
-    private String images;
-
-    @ApiModelProperty(value = "应用包名")
-    private String packageName;
-
-    @ApiModelProperty(value = "下载次数")
-    private Integer clicks;
-
-    @ApiModelProperty(value = "安装次数")
-    private Integer installs;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "应用介绍")
-    private String content;
-
-    @ApiModelProperty(value = "项目需求")
-    private String requirement;
-
-    @ApiModelProperty(value = "开发者(个人或公司)")
-    private String developer;
-
-    @ApiModelProperty(value = "项目负责人")
-    private String director;
-
-    @ApiModelProperty(value = "项目经理")
-    private String projectDirector;
-
-    @ApiModelProperty(value = "业务经理")
-    private String salesman;
-
-    @ApiModelProperty(value = "软件定价")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "划线价格")
-    private BigDecimal linePrice;
-
-    @ApiModelProperty(value = "评分")
-    private String score;
-
-    @ApiModelProperty(value = "星级")
-    private String star;
-
-    @ApiModelProperty(value = "菜单路由地址")
-    private String path;
-
-    @ApiModelProperty(value = "菜单组件地址, 目录可为空")
-    private String component;
-
-    @ApiModelProperty(value = "权限标识")
-    private String authority;
-
-    @ApiModelProperty(value = "打开位置")
-    private String target;
-
-    @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
-    private Integer hide;
-
-    @ApiModelProperty(value = "禁止搜索，1禁止 0 允许")
-    private Integer search;
-
-    @ApiModelProperty(value = "菜单侧栏选中的path")
-    private String active;
-
-    @ApiModelProperty(value = "其它路由元信息")
-    private String meta;
-
-    @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版")
-    private String edition;
-
-    @ApiModelProperty(value = "版本号")
-    private String version;
-
-    @ApiModelProperty(value = "是否已安装")
-    private Integer isUse;
-
-    @ApiModelProperty(value = "应用状态")
-    private String appStatus;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "应用秘钥")
-    @TableField(exist = false)
-    private String appSecret;
-
-    @ApiModelProperty(value = "租户编号")
-    private String tenantCode;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "附件1")
-    private String file1;
-
-    @ApiModelProperty(value = "附件2")
-    private String file2;
-
-    @ApiModelProperty(value = "附件3")
-    private String file3;
-
-    @ApiModelProperty(value = "成员管理")
-    @TableField(exist = false)
-    private List<AppUser> users;
-
-    @ApiModelProperty(value = "主体名称")
-    @TableField(exist = false)
-    private String tenantName;
-
-    @ApiModelProperty(value = "主体ID")
-    @TableField(exist = false)
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "开发者名称")
-    @TableField(exist = false)
-    private String realName;
-
-    @ApiModelProperty(value = "开发者名称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "开发者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "公司名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "公司简称")
-    @TableField(exist = false)
-    private String shortName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/AppUser.java b/src/main/java/com/gxwebsoft/oa/entity/AppUser.java
deleted file mode 100644
index 1f47710..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/AppUser.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 应用成员
- *
- * @author 科技小王子
- * @since 2023-05-31 13:18:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "AppUser对象", description = "应用成员")
-@TableName("oa_app_user")
-public class AppUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "app_user_id", type = IdType.AUTO)
-    private Integer appUserId;
-
-    @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ")
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "应用ID")
-    private Integer appId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/Assets.java b/src/main/java/com/gxwebsoft/oa/entity/Assets.java
deleted file mode 100644
index 248d60a..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/Assets.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 服务器资产记录表
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Assets对象", description = "服务器资产记录表")
-@TableName("oa_assets")
-public class Assets implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "资产ID")
-    @TableId(value = "assets_id", type = IdType.AUTO)
-    private Integer assetsId;
-
-    @ApiModelProperty(value = "资产名称")
-    private String name;
-
-    @ApiModelProperty(value = "资产标识")
-    private String code;
-
-    @ApiModelProperty(value = "资产类型")
-    private String type;
-
-    @ApiModelProperty(value = "服务器厂商")
-    private String brand;
-
-    @ApiModelProperty(value = "服务器配置")
-    private String configuration;
-
-    @ApiModelProperty(value = "初始账号")
-    private String account;
-
-    @ApiModelProperty(value = "初始密码")
-    private String password;
-
-    @ApiModelProperty(value = "(阿里云/腾讯云)登录账号")
-    private String brandAccount;
-
-    @ApiModelProperty(value = "(阿里云/腾讯云)登录密码")
-    private String brandPassword;
-
-    @ApiModelProperty(value = "宝塔面板")
-    private String panel;
-
-    @ApiModelProperty(value = "宝塔面板账号")
-    private String panelAccount;
-
-    @ApiModelProperty(value = "宝塔面板密码")
-    private String panelPassword;
-
-    @ApiModelProperty(value = "财务信息-合同金额")
-    private BigDecimal financeAmount;
-
-    @ApiModelProperty(value = "购买年限")
-    private Integer financeYears;
-
-    @ApiModelProperty(value = "续费金额")
-    private BigDecimal financeRenew;
-
-    @ApiModelProperty(value = "客户名称")
-    private String financeCustomerName;
-
-    @ApiModelProperty(value = "客户联系人")
-    private String financeCustomerContact;
-
-    @ApiModelProperty(value = "客户联系电话")
-    private String financeCustomerPhone;
-
-    @ApiModelProperty(value = "客户ID")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "开放端口")
-    private String openPort;
-
-    @ApiModelProperty(value = "详情内容")
-    private String content;
-
-    @ApiModelProperty(value = "购买时间")
-    private Date startTime;
-
-    @ApiModelProperty(value = "到期时间")
-    private Date endTime;
-
-    @ApiModelProperty(value = "置顶状态")
-    private String isTop;
-
-    @ApiModelProperty(value = "可见性(public,private,protected)")
-    private String visibility;
-
-    @ApiModelProperty(value = "宝塔接口秘钥")
-    private String btSign;
-
-    @ApiModelProperty(value = "文章排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "描述")
-    private String comments;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private String status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "开发者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "企业ID")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "企业名称")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "系统基础统计")
-    @TableField(exist = false)
-    private Object systemTotal;
-
-    @ApiModelProperty(value = "磁盘分区信息")
-    @TableField(exist = false)
-    private Object diskInfo;
-
-    @ApiModelProperty(value = "实时状态信息(CPU、内存、网络、负载)")
-    @TableField(exist = false)
-    private Object netWork;
-
-    @ApiModelProperty(value = "网站列表")
-    @TableField(exist = false)
-    private Object sites;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java b/src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java
deleted file mode 100644
index 8f78287..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/AssetsUser.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 服务器成员管理
- *
- * @author 科技小王子
- * @since 2023-07-18 14:35:51
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "AssetsUser对象", description = "服务器成员管理")
-@TableName("oa_assets_user")
-public class AssetsUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ")
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "应用ID")
-    private Integer assetsId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/Customer.java b/src/main/java/com/gxwebsoft/oa/entity/Customer.java
deleted file mode 100644
index 2b34480..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/Customer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 客户管理记录表
- *
- * @author WebSoft
- * @since 2022-11-16 11:16:14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Customer对象", description = "客户管理记录表")
-@TableName("oa_customer")
-public class Customer implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "客户ID")
-    @TableId(value = "customer_id", type = IdType.AUTO)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "客户标识")
-    private String customerCode;
-
-    @ApiModelProperty(value = "客户全称")
-    private String customerFullName;
-
-    @ApiModelProperty(value = "头像")
-    private String customerAvatar;
-
-    @ApiModelProperty(value = "客户类型")
-    private String customerType;
-
-    @ApiModelProperty(value = "客户来源")
-    private String customerSource;
-
-    @ApiModelProperty(value = "公司座机")
-    private String customerPhone;
-
-    @ApiModelProperty(value = "手机号码")
-    private String customerMobile;
-
-    @ApiModelProperty(value = "联系人")
-    private String customerContacts;
-
-    @ApiModelProperty(value = "所在省份")
-    private String customerProvince;
-
-    @ApiModelProperty(value = "所在城市")
-    private String customerCity;
-
-    @ApiModelProperty(value = "所在地区")
-    private String customerRegion;
-
-    @ApiModelProperty(value = "所在地址")
-    private String customerAddress;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "跟进状态")
-    private String progress;
-
-    @ApiModelProperty(value = "是否含税")
-    private Boolean isTax;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "可见性(public,private,protected)")
-    private String visibility;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/Notice.java b/src/main/java/com/gxwebsoft/oa/entity/Notice.java
deleted file mode 100644
index 2de269b..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/Notice.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 消息记录表
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Notice对象", description = "消息记录表")
-@TableName("oa_notice")
-public class Notice implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "notice_id", type = IdType.AUTO)
-    private Integer noticeId;
-
-    @ApiModelProperty(value = "消息类型")
-    private String type;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "颜色")
-    private String color;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "消息来源")
-    private String source;
-
-    @ApiModelProperty(value = "来源记录ID")
-    private Integer sourceId;
-
-    @ApiModelProperty(value = "路由地址")
-    private String path;
-
-    @ApiModelProperty(value = "代币")
-    private Long tokens;
-
-    @ApiModelProperty(value = "是否已查阅")
-    private Integer isRead;
-
-    @ApiModelProperty(value = "渠道, 0发送 1回复")
-    private Integer channel;
-
-    @ApiModelProperty(value = "任务状态")
-    private Integer progress;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "开发者名称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "开发者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/Project.java b/src/main/java/com/gxwebsoft/oa/entity/Project.java
deleted file mode 100644
index 33ffb57..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/Project.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 项目管理表
- *
- * @author WebSoft
- * @since 2022-11-16 11:00:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Project对象", description = "项目管理表")
-@TableName("oa_project")
-public class Project implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "项目ID")
-    @TableId(value = "project_id", type = IdType.AUTO)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目标识")
-    private String projectCode;
-
-    @ApiModelProperty(value = "商品分类")
-    private String projectCategory;
-
-    @ApiModelProperty(value = "项目商标")
-    private String projectAvatar;
-
-    @ApiModelProperty(value = "项目域名")
-    private String url;
-
-    @ApiModelProperty(value = "开发版域名")
-    private String urlDev;
-
-    @ApiModelProperty(value = "后台管理地址")
-    private String urlAdmin;
-
-    @ApiModelProperty(value = "默认账号密码")
-    private String account;
-
-    @ApiModelProperty(value = "项目金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "实际金额")
-    private BigDecimal realMoney;
-
-    @ApiModelProperty(value = "年费")
-    private BigDecimal annualFee;
-
-    @ApiModelProperty(value = "项目详情")
-    private String content;
-
-    @ApiModelProperty(value = "开发参数(json)")
-    private String param;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "项目进度（10待安排 20策划设计 30功能开发 40待验收 50完成）")
-    private Integer progress;
-
-    @ApiModelProperty(value = "初始浏览数")
-    private Integer views;
-
-    @ApiModelProperty(value = "状态(10上架 20下架)")
-    private Integer status;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "是否精选客户案例")
-    private Boolean isCase;
-
-    @ApiModelProperty(value = "负责人")
-    private Integer commander;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "可见性(public,private,protected)")
-    private String visibility;
-
-    @ApiModelProperty(value = "项目归属者")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "项目描述")
-    private String comments;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/Task.java b/src/main/java/com/gxwebsoft/oa/entity/Task.java
deleted file mode 100644
index ffa6942..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/Task.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 文章记录表
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:42
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Task对象", description = "文章记录表")
-@TableName("oa_task")
-public class Task implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "任务ID")
-    @TableId(value = "task_id", type = IdType.AUTO)
-    private Integer taskId;
-
-    @ApiModelProperty(value = "任务名称")
-    private String name;
-
-    @ApiModelProperty(value = "任务类型")
-    private String taskType;
-
-    @ApiModelProperty(value = "工单附件")
-    private String files;
-
-    @ApiModelProperty(value = "开始时间")
-    private Date startTime;
-
-    @ApiModelProperty(value = "结束时间")
-    private Date endTime;
-
-    @ApiModelProperty(value = "任务内容")
-    @TableField(exist = false)
-    private String content;
-
-    @ApiModelProperty(value = "任务状态")
-    private Integer progress;
-
-    @ApiModelProperty(value = "优先级")
-    private String priority;
-
-    @ApiModelProperty(value = "品质要求")
-    private String quality;
-
-    @ApiModelProperty(value = "时限(天)")
-    private Integer day;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "应用ID")
-    private Integer appId;
-
-    @ApiModelProperty(value = "机构id")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "客户ID")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "资产ID")
-    private Integer assetsId;
-
-    @ApiModelProperty(value = "是否已查阅")
-    private Integer isRead;
-
-    @ApiModelProperty(value = "最后回复人ID")
-    private Integer lastReadUser;
-
-    @ApiModelProperty(value = "最后回复人头像")
-    @TableField(exist = false)
-    private String lastAvatar;
-
-    @ApiModelProperty(value = "最后回复人昵称")
-    @TableField(exist = false)
-    private String lastNickname;
-
-    @ApiModelProperty(value = "最后回复人姓名")
-    @TableField(exist = false)
-    private String lastRealName;
-
-    @ApiModelProperty(value = "最后回复人公司名称")
-    @TableField(exist = false)
-    private String lastCompanyName;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "任务发起人ID")
-    private Integer promoter;
-
-    @ApiModelProperty(value = "发起人昵称")
-    @TableField(exist = false)
-    private String promoterName;
-
-    @ApiModelProperty(value = "发起人别名")
-    @TableField(exist = false)
-    private String promoterAlias;
-
-    @ApiModelProperty(value = "发起人头像")
-    @TableField(exist = false)
-    private String promoterAvatar;
-
-    @ApiModelProperty(value = "发起人单位名称")
-    @TableField(exist = false)
-    private String promoterCompanyName;
-
-    @ApiModelProperty(value = "受理人")
-    private Integer commander;
-
-    @ApiModelProperty(value = "受理人昵称")
-    @TableField(exist = false)
-    private String commanderName;
-
-    @ApiModelProperty(value = "受理人别名")
-    @TableField(exist = false)
-    private String commanderAlias;
-
-    @ApiModelProperty(value = "受理人真实姓名")
-    @TableField(exist = false)
-    private String commanderRealName;
-
-    @ApiModelProperty(value = "受理人头像")
-    @TableField(exist = false)
-    private String commanderAvatar;
-
-    @ApiModelProperty(value = "受理人单位名称")
-    @TableField(exist = false)
-    private String commanderCompanyName;
-
-    @ApiModelProperty(value = "成员管理")
-    @TableField(exist = false)
-    private List<TaskUser> users;
-
-    @ApiModelProperty(value = "应用名称")
-    @TableField(exist = false)
-    private String appName;
-
-    @ApiModelProperty(value = "应用信息")
-    @TableField(exist = false)
-    private App appInfo;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java b/src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java
deleted file mode 100644
index 73e8e80..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/TaskRecord.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 工单回复记录表
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TaskRecord对象", description = "工单回复记录表")
-@TableName("oa_task_record")
-public class TaskRecord implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "回复ID")
-    @TableId(value = "task_record_id", type = IdType.AUTO)
-    private Integer taskRecordId;
-
-    @ApiModelProperty(value = "工单ID")
-    private Integer taskId;
-
-    @ApiModelProperty(value = "上级id")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "任务内容")
-    private String content;
-
-    @ApiModelProperty(value = "工单附件")
-    private String files;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-}
diff --git a/src/main/java/com/gxwebsoft/oa/entity/TaskUser.java b/src/main/java/com/gxwebsoft/oa/entity/TaskUser.java
deleted file mode 100644
index 2d4f2ff..0000000
--- a/src/main/java/com/gxwebsoft/oa/entity/TaskUser.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.gxwebsoft.oa.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 工单成员
- *
- * @author 科技小王子
- * @since 2023-03-06 12:00:41
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TaskUser对象", description = "工单成员")
-@TableName("oa_task_user")
-public class TaskUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "task_user_id", type = IdType.AUTO)
-    private Integer taskUserId;
-
-    @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ")
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "工单ID")
-    private Integer taskId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "加入时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String name;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String email;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java
deleted file mode 100644
index 4415af7..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/AppMapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.param.AppParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 应用管理记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-03-28 10:45:39
- */
-public interface AppMapper extends BaseMapper<App> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<App>
-     */
-    List<App> selectPageRel(@Param("page") IPage<App> page,
-                             @Param("param") AppParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<App> selectListRel(@Param("param") AppParam param);
-
-    List<App> pageRel(@Param("param") AppParam param);
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java
deleted file mode 100644
index 68736b1..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/AppUserMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppUserParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 应用成员Mapper
- *
- * @author 科技小王子
- * @since 2023-05-31 13:18:55
- */
-public interface AppUserMapper extends BaseMapper<AppUser> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<AppUser>
-     */
-    List<AppUser> selectPageRel(@Param("page") IPage<AppUser> page,
-                             @Param("param") AppUserParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<AppUser> selectListRel(@Param("param") AppUserParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java
deleted file mode 100644
index ebc8e58..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/AssetsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.Assets;
-import com.gxwebsoft.oa.param.AssetsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 服务器资产记录表Mapper
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-public interface AssetsMapper extends BaseMapper<Assets> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Assets>
-     */
-    List<Assets> selectPageRel(@Param("page") IPage<Assets> page,
-                             @Param("param") AssetsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Assets> selectListRel(@Param("param") AssetsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java
deleted file mode 100644
index 3ff2804..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/AssetsUserMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.AssetsUser;
-import com.gxwebsoft.oa.param.AssetsUserParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 服务器成员管理Mapper
- *
- * @author 科技小王子
- * @since 2023-07-18 14:35:51
- */
-public interface AssetsUserMapper extends BaseMapper<AssetsUser> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<AssetsUser>
-     */
-    List<AssetsUser> selectPageRel(@Param("page") IPage<AssetsUser> page,
-                             @Param("param") AssetsUserParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<AssetsUser> selectListRel(@Param("param") AssetsUserParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java
deleted file mode 100644
index b77a4ae..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/CustomerMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.Customer;
-import com.gxwebsoft.oa.param.CustomerParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 客户管理记录表Mapper
- *
- * @author WebSoft
- * @since 2022-11-16 11:16:14
- */
-public interface CustomerMapper extends BaseMapper<Customer> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Customer>
-     */
-    List<Customer> selectPageRel(@Param("page") IPage<Customer> page,
-                             @Param("param") CustomerParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Customer> selectListRel(@Param("param") CustomerParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java
deleted file mode 100644
index 478d1f7..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/NoticeMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.Notice;
-import com.gxwebsoft.oa.param.NoticeParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 消息记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-public interface NoticeMapper extends BaseMapper<Notice> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Notice>
-     */
-    List<Notice> selectPageRel(@Param("page") IPage<Notice> page,
-                             @Param("param") NoticeParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Notice> selectListRel(@Param("param") NoticeParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java
deleted file mode 100644
index ff5cb98..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/ProjectMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.Project;
-import com.gxwebsoft.oa.param.ProjectParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目管理表Mapper
- *
- * @author WebSoft
- * @since 2022-11-16 11:00:43
- */
-public interface ProjectMapper extends BaseMapper<Project> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Project>
-     */
-    List<Project> selectPageRel(@Param("page") IPage<Project> page,
-                             @Param("param") ProjectParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Project> selectListRel(@Param("param") ProjectParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java
deleted file mode 100644
index 17fa0e0..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/TaskMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.param.TaskParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 文章记录表Mapper
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:43
- */
-public interface TaskMapper extends BaseMapper<Task> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Task>
-     */
-    List<Task> selectPageRel(@Param("page") IPage<Task> page,
-                             @Param("param") TaskParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Task> selectListRel(@Param("param") TaskParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java
deleted file mode 100644
index 9d1666a..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/TaskRecordMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.param.TaskRecordParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 工单回复记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-public interface TaskRecordMapper extends BaseMapper<TaskRecord> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TaskRecord>
-     */
-    List<TaskRecord> selectPageRel(@Param("page") IPage<TaskRecord> page,
-                             @Param("param") TaskRecordParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TaskRecord> selectListRel(@Param("param") TaskRecordParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java b/src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java
deleted file mode 100644
index 9b1ecf8..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/TaskUserMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.oa.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.oa.entity.TaskUser;
-import com.gxwebsoft.oa.param.TaskUserParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 工单成员Mapper
- *
- * @author 科技小王子
- * @since 2023-03-06 12:00:41
- */
-public interface TaskUserMapper extends BaseMapper<TaskUser> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TaskUser>
-     */
-    List<TaskUser> selectPageRel(@Param("page") IPage<TaskUser> page,
-                             @Param("param") TaskUserParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TaskUser> selectListRel(@Param("param") TaskUserParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml
deleted file mode 100644
index c81507e..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml
+++ /dev/null
@@ -1,195 +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="com.gxwebsoft.oa.mapper.AppMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.company_id,
-        b.short_name,
-        b.company_name,
-        c.nickname,
-        c.real_name,
-        c.user_id,
-        c.avatar
-        FROM oa_app a
-        LEFT JOIN sys_company b ON a.company_id = b.company_id
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        <where>
-            <if test="param.appId != null">
-                AND a.app_id = #{param.appId}
-            </if>
-            <if test="param.appName != null">
-                AND a.app_name LIKE CONCAT('%', #{param.appName}, '%')
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.appCode != null">
-                AND a.app_code LIKE CONCAT('%', #{param.appCode}, '%')
-            </if>
-            <if test="param.appType != null">
-                AND a.app_type LIKE CONCAT('%', #{param.appType}, '%')
-            </if>
-            <if test="param.menuType != null">
-                AND a.menu_type = #{param.menuType}
-            </if>
-            <if test="param.companyId != null">
-              AND a.company_id = #{param.companyId}
-            </if>
-            <if test="param.appIcon != null">
-                AND a.app_icon LIKE CONCAT('%', #{param.appIcon}, '%')
-            </if>
-            <if test="param.appQrcode != null">
-                AND a.app_qrcode LIKE CONCAT('%', #{param.appQrcode}, '%')
-            </if>
-            <if test="param.appUrl != null">
-                AND a.app_url LIKE CONCAT('%', #{param.appUrl}, '%')
-            </if>
-            <if test="param.adminUrl != null">
-                AND a.admin_url LIKE CONCAT('%', #{param.adminUrl}, '%')
-            </if>
-            <if test="param.downUrl != null">
-                AND a.down_url LIKE CONCAT('%', #{param.downUrl}, '%')
-            </if>
-            <if test="param.ipAddress != null">
-                AND a.ip_address LIKE CONCAT('%', #{param.ipAddress}, '%')
-            </if>
-            <if test="param.images != null">
-                AND a.images LIKE CONCAT('%', #{param.images}, '%')
-            </if>
-            <if test="param.packageName != null">
-                AND a.package_name LIKE CONCAT('%', #{param.packageName}, '%')
-            </if>
-            <if test="param.clicks != null">
-                AND a.clicks = #{param.clicks}
-            </if>
-            <if test="param.installs != null">
-                AND a.installs = #{param.installs}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.requirement != null">
-                AND a.requirement LIKE CONCAT('%', #{param.requirement}, '%')
-            </if>
-            <if test="param.developer != null">
-                AND a.developer LIKE CONCAT('%', #{param.developer}, '%')
-            </if>
-            <if test="param.price != null">
-                AND a.price = #{param.price}
-            </if>
-            <if test="param.linePrice != null">
-                AND a.line_price = #{param.linePrice}
-            </if>
-            <if test="param.score != null">
-                AND a.score LIKE CONCAT('%', #{param.score}, '%')
-            </if>
-            <if test="param.star != null">
-                AND a.star LIKE CONCAT('%', #{param.star}, '%')
-            </if>
-            <if test="param.path != null">
-                AND a.path LIKE CONCAT('%', #{param.path}, '%')
-            </if>
-            <if test="param.component != null">
-                AND a.component LIKE CONCAT('%', #{param.component}, '%')
-            </if>
-            <if test="param.authority != null">
-                AND a.authority LIKE CONCAT('%', #{param.authority}, '%')
-            </if>
-            <if test="param.target != null">
-                AND a.target LIKE CONCAT('%', #{param.target}, '%')
-            </if>
-            <if test="param.hide != null">
-                AND a.hide = #{param.hide}
-            </if>
-            <if test="param.search != null">
-                AND a.search = #{param.search}
-            </if>
-            <if test="param.active != null">
-                AND a.active LIKE CONCAT('%', #{param.active}, '%')
-            </if>
-            <if test="param.meta != null">
-                AND a.meta LIKE CONCAT('%', #{param.meta}, '%')
-            </if>
-            <if test="param.edition != null">
-                AND a.edition LIKE CONCAT('%', #{param.edition}, '%')
-            </if>
-            <if test="param.version != null">
-                AND a.version LIKE CONCAT('%', #{param.version}, '%')
-            </if>
-            <if test="param.isUse != null">
-                AND a.is_use = #{param.isUse}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.userId != null">
-              AND a.app_id IN (SELECT app_id FROM oa_app_user WHERE user_id=#{param.userId})
-            </if>
-            <if test="param.appIds != null">
-              AND a.app_id IN
-              <foreach collection="param.appIds" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.tenantId != null">
-              AND a.tenant_id = #{param.tenantId}
-            </if>
-            <if test="param.tenantCode != null">
-                AND a.tenant_code LIKE CONCAT('%', #{param.tenantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.appStatus != null">
-              AND a.app_status = #{param.appStatus}
-            </if>
-            <if test="param.companyName != null">
-              AND a.company_id = #{param.companyId}
-            </if>
-
-            <if test="param.keywords != null">
-              AND (a.app_name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.short_name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.company_id = #{param.keywords}
-              OR b.company_name LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.App">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 分页查询 -->
-    <select id="pageRel" resultType="com.gxwebsoft.oa.entity.App">
-      <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.App">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml
deleted file mode 100644
index 967f400..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppUserMapper.xml
+++ /dev/null
@@ -1,52 +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="com.gxwebsoft.oa.mapper.AppUserMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*, b.nickname,b.email,b.phone,b.avatar
-        FROM oa_app_user a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.appUserId != null">
-                AND a.app_user_id = #{param.appUserId}
-            </if>
-            <if test="param.role != null">
-                AND a.role = #{param.role}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.appId != null">
-                AND a.app_id = #{param.appId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.email LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.username LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.AppUser">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.AppUser">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml
deleted file mode 100644
index d204f35..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsMapper.xml
+++ /dev/null
@@ -1,149 +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="com.gxwebsoft.oa.mapper.AssetsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.user_id,b.avatar,b.nickname,
-               c.company_name
-        FROM oa_assets a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN sys_company c ON a.company_id = c.company_id
-        <where>
-            <if test="param.assetsId != null">
-                AND a.assets_id = #{param.assetsId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.code != null">
-                AND a.code LIKE CONCAT('%', #{param.code}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.brand != null">
-                AND a.brand LIKE CONCAT('%', #{param.brand}, '%')
-            </if>
-            <if test="param.configuration != null">
-                AND a.configuration LIKE CONCAT('%', #{param.configuration}, '%')
-            </if>
-            <if test="param.account != null">
-                AND a.account LIKE CONCAT('%', #{param.account}, '%')
-            </if>
-            <if test="param.password != null">
-                AND a.password LIKE CONCAT('%', #{param.password}, '%')
-            </if>
-            <if test="param.brandAccount != null">
-                AND a.brand_account LIKE CONCAT('%', #{param.brandAccount}, '%')
-            </if>
-            <if test="param.brandPassword != null">
-                AND a.brand_password LIKE CONCAT('%', #{param.brandPassword}, '%')
-            </if>
-            <if test="param.panel != null">
-                AND a.panel LIKE CONCAT('%', #{param.panel}, '%')
-            </if>
-            <if test="param.panelAccount != null">
-                AND a.panel_account LIKE CONCAT('%', #{param.panelAccount}, '%')
-            </if>
-            <if test="param.panelPassword != null">
-                AND a.panel_password LIKE CONCAT('%', #{param.panelPassword}, '%')
-            </if>
-            <if test="param.financeAmount != null">
-                AND a.finance_amount = #{param.financeAmount}
-            </if>
-            <if test="param.financeYears != null">
-                AND a.finance_years = #{param.financeYears}
-            </if>
-            <if test="param.financeRenew != null">
-                AND a.finance_renew = #{param.financeRenew}
-            </if>
-            <if test="param.financeCustomerName != null">
-                AND a.finance_customer_name LIKE CONCAT('%', #{param.financeCustomerName}, '%')
-            </if>
-            <if test="param.financeCustomerContact != null">
-                AND a.finance_customer_contact LIKE CONCAT('%', #{param.financeCustomerContact}, '%')
-            </if>
-            <if test="param.financeCustomerPhone != null">
-                AND a.finance_customer_phone LIKE CONCAT('%', #{param.financeCustomerPhone}, '%')
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.openPort != null">
-                AND a.open_port LIKE CONCAT('%', #{param.openPort}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%')
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%')
-            </if>
-            <if test="param.isTop != null">
-                AND a.is_top LIKE CONCAT('%', #{param.isTop}, '%')
-            </if>
-            <if test="param.visibility != null">
-                AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.companyId != null">
-              AND a.company_id = #{param.companyId}
-            </if>
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.status != null">
-                AND a.status LIKE CONCAT('%', #{param.status}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.assetsIds != null">
-              AND a.assets_id IN
-              <foreach collection="param.assetsIds" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.keywords != null">
-              AND (a.code LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.name LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.Assets">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.Assets">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml
deleted file mode 100644
index 660a834..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/AssetsUserMapper.xml
+++ /dev/null
@@ -1,52 +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="com.gxwebsoft.oa.mapper.AssetsUserMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*, b.nickname,b.email,b.phone,b.avatar
-        FROM oa_assets_user a
-      LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.role != null">
-                AND a.role = #{param.role}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.assetsId != null">
-                AND a.assets_id = #{param.assetsId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.email LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.username LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.AssetsUser">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.AssetsUser">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml
deleted file mode 100644
index 913b5f8..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/CustomerMapper.xml
+++ /dev/null
@@ -1,107 +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="com.gxwebsoft.oa.mapper.CustomerMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM oa_customer a
-        <where>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.customerCode != null">
-                AND a.customer_code LIKE CONCAT('%', #{param.customerCode}, '%')
-            </if>
-            <if test="param.customerFullName != null">
-                AND a.customer_full_name LIKE CONCAT('%', #{param.customerFullName}, '%')
-            </if>
-            <if test="param.customerAvatar != null">
-                AND a.customer_avatar LIKE CONCAT('%', #{param.customerAvatar}, '%')
-            </if>
-            <if test="param.customerType != null">
-                AND a.customer_type LIKE CONCAT('%', #{param.customerType}, '%')
-            </if>
-            <if test="param.emptyType != null">
-              AND a.customer_type = ''
-            </if>
-            <if test="param.customerSource != null">
-                AND a.customer_source LIKE CONCAT('%', #{param.customerSource}, '%')
-            </if>
-            <if test="param.customerPhone != null">
-                AND a.customer_phone LIKE CONCAT('%', #{param.customerPhone}, '%')
-            </if>
-            <if test="param.customerMobile != null">
-                AND a.customer_mobile LIKE CONCAT('%', #{param.customerMobile}, '%')
-            </if>
-            <if test="param.customerContacts != null">
-                AND a.customer_contacts LIKE CONCAT('%', #{param.customerContacts}, '%')
-            </if>
-            <if test="param.customerProvince != null">
-                AND a.customer_province LIKE CONCAT('%', #{param.customerProvince}, '%')
-            </if>
-            <if test="param.customerCity != null">
-                AND a.customer_city LIKE CONCAT('%', #{param.customerCity}, '%')
-            </if>
-            <if test="param.customerRegion != null">
-                AND a.customer_region LIKE CONCAT('%', #{param.customerRegion}, '%')
-            </if>
-            <if test="param.customerAddress != null">
-                AND a.customer_address LIKE CONCAT('%', #{param.customerAddress}, '%')
-            </if>
-            <if test="param.progress != null">
-                AND a.progress LIKE CONCAT('%', #{param.progress}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.visibility != null">
-                AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (a.customer_name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.customer_contacts LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.customer_mobile LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.Customer">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.Customer">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml
deleted file mode 100644
index a5ab6d5..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/NoticeMapper.xml
+++ /dev/null
@@ -1,69 +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="com.gxwebsoft.oa.mapper.NoticeMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.nickname,
-        b.user_id,
-        b.avatar
-        FROM oa_notice a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.noticeId != null">
-                AND a.notice_id = #{param.noticeId}
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.title != null">
-                AND a.title LIKE CONCAT('%', #{param.title}, '%')
-            </if>
-            <if test="param.icon != null">
-                AND a.icon LIKE CONCAT('%', #{param.icon}, '%')
-            </if>
-            <if test="param.color != null">
-                AND a.color LIKE CONCAT('%', #{param.color}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.nickname != null">
-              AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%')
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.Notice">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.Notice">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml
deleted file mode 100644
index 5e419a7..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/ProjectMapper.xml
+++ /dev/null
@@ -1,116 +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="com.gxwebsoft.oa.mapper.ProjectMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM oa_project a
-        <where>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.projectName != null">
-                AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%')
-            </if>
-            <if test="param.projectCode != null">
-                AND a.project_code LIKE CONCAT('%', #{param.projectCode}, '%')
-            </if>
-            <if test="param.projectCategory != null">
-                AND a.project_category LIKE CONCAT('%', #{param.projectCategory}, '%')
-            </if>
-            <if test="param.projectAvatar != null">
-                AND a.project_avatar LIKE CONCAT('%', #{param.projectAvatar}, '%')
-            </if>
-            <if test="param.url != null">
-                AND a.url LIKE CONCAT('%', #{param.url}, '%')
-            </if>
-            <if test="param.urlDev != null">
-                AND a.url_dev LIKE CONCAT('%', #{param.urlDev}, '%')
-            </if>
-            <if test="param.urlAdmin != null">
-                AND a.url_admin LIKE CONCAT('%', #{param.urlAdmin}, '%')
-            </if>
-            <if test="param.account != null">
-                AND a.account LIKE CONCAT('%', #{param.account}, '%')
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.realMoney != null">
-                AND a.real_money = #{param.realMoney}
-            </if>
-            <if test="param.annualFee != null">
-                AND a.annual_fee = #{param.annualFee}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.param != null">
-                AND a.param LIKE CONCAT('%', #{param.param}, '%')
-            </if>
-            <if test="param.qrcode != null">
-                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.progress != null">
-                AND a.progress = #{param.progress}
-            </if>
-            <if test="param.views != null">
-                AND a.views = #{param.views}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.isCase != null">
-                AND a.is_case = #{param.isCase}
-            </if>
-            <if test="param.commander != null">
-                AND a.commander = #{param.commander}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.visibility != null">
-                AND a.visibility LIKE CONCAT('%', #{param.visibility}, '%')
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.Project">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.Project">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml
deleted file mode 100644
index a6e8871..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskMapper.xml
+++ /dev/null
@@ -1,132 +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="com.gxwebsoft.oa.mapper.TaskMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.nickname as promoterName,b.avatar as promoterAvatar,b.alias as promoterAlias,b.company_name as promoterCompanyName,
-        c.nickname as commanderName,c.avatar as commanderAvatar,c.alias as commanderAlias,c.company_name as commanderCompanyName,
-        d.nickname as lastNickname ,d.avatar as lastAvatar,d.real_name as lastRealName,d.company_name as lastCompanyName,
-        e.app_id,e.app_name
-        FROM oa_task a
-        LEFT JOIN sys_user b ON a.promoter = b.user_id
-        LEFT JOIN sys_user c ON a.commander = c.user_id
-        LEFT JOIN sys_user d ON a.last_read_user = d.user_id
-        LEFT JOIN oa_app e ON a.app_id = e.app_id
-        <where>
-            <if test="param.taskId != null">
-                AND a.task_id = #{param.taskId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.taskType != null">
-              AND a.task_type IN
-              <foreach collection="param.taskType.split(',')" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.appId != null">
-              AND a.app_id = #{param.appId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.assetsId != null">
-                AND a.assets_id = #{param.assetsId}
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%')
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.promoter != null">
-                AND a.promoter = #{param.promoter}
-            </if>
-            <if test="param.commander != null">
-                AND (a.commander = #{param.commander} OR a.promoter = #{param.commander})
-            </if>
-            <if test="param.progress != null">
-              AND a.progress IN
-              <foreach collection="param.progress.split(',')" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.priority != null">
-                AND a.priority LIKE CONCAT('%', #{param.priority}, '%')
-            </if>
-            <if test="param.quality != null">
-                AND a.quality LIKE CONCAT('%', #{param.quality}, '%')
-            </if>
-            <if test="param.day != null">
-                AND a.day = #{param.day}
-            </if>
-            <if test="param.userId != null">
-              AND a.user_id = #{param.userId}
-            </if>
-<!--            <if test="param.userId != null">-->
-<!--              AND a.task_id IN (SELECT task_id FROM oa_task_user WHERE user_id=#{param.userId})-->
-<!--            </if>-->
-            <if test="param.organizationId != null">
-                AND a.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR a.task_id LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR b.company_name LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR c.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR c.real_name LIKE CONCAT('%', #{param.keywords}, '%')
-                       OR e.app_name LIKE CONCAT('%', #{param.keywords}, '%')
-                  )
-            </if>
-            <if test="param.appName != null">
-              AND b.app_name LIKE CONCAT('%', #{param.appName}, '%')
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.Task">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.Task">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml
deleted file mode 100644
index 3978d19..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskRecordMapper.xml
+++ /dev/null
@@ -1,69 +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="com.gxwebsoft.oa.mapper.TaskRecordMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.nickname,
-        b.user_id,
-        b.avatar
-        FROM oa_task_record a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.taskRecordId != null">
-                AND a.task_record_id = #{param.taskRecordId}
-            </if>
-            <if test="param.taskId != null">
-                AND a.task_id = #{param.taskId}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.developerId != null">
-                AND a.developer_id = #{param.developerId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.nickname != null">
-            AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%')
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.TaskRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.TaskRecord">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml
deleted file mode 100644
index dc3819c..0000000
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/TaskUserMapper.xml
+++ /dev/null
@@ -1,50 +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="com.gxwebsoft.oa.mapper.TaskUserMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.nickname as name,
-        b.phone,
-        b.user_id,
-        b.avatar,
-        b.email
-        FROM oa_task_user a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.taskUserId != null">
-                AND a.task_user_id = #{param.taskUserId}
-            </if>
-            <if test="param.role != null">
-                AND a.role = #{param.role}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.taskId != null">
-                AND a.task_id = #{param.taskId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.oa.entity.TaskUser">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.oa.entity.TaskUser">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/oa/param/AppParam.java b/src/main/java/com/gxwebsoft/oa/param/AppParam.java
deleted file mode 100644
index ca7eceb..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/AppParam.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Set;
-
-/**
- * 应用管理记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-03-28 10:45:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "AppParam对象", description = "应用管理记录表查询参数")
-public class AppParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "应用ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer appId;
-
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-
-    @ApiModelProperty(value = "上级id, 0是顶级")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "应用标识")
-    private String appCode;
-
-    @ApiModelProperty(value = "应用类型")
-    private String appType;
-
-    @ApiModelProperty(value = "类型, 0菜单, 1按钮")
-    @QueryField(type = QueryType.EQ)
-    private Integer menuType;
-
-    @ApiModelProperty(value = "企业ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer companyId;
-
-    @ApiModelProperty(value = "应用图标")
-    private String appIcon;
-
-    @ApiModelProperty(value = "二维码")
-    private String appQrcode;
-
-    @ApiModelProperty(value = "链接地址")
-    private String appUrl;
-
-    @ApiModelProperty(value = "后台管理地址")
-    private String adminUrl;
-
-    @ApiModelProperty(value = "下载地址")
-    private String downUrl;
-
-    @ApiModelProperty(value = "仓库地址")
-    private String gitUrl;
-
-    @ApiModelProperty(value = "IP白名单")
-    private String ipAddress;
-
-    @ApiModelProperty(value = "应用截图")
-    private String images;
-
-    @ApiModelProperty(value = "应用包名")
-    private String packageName;
-
-    @ApiModelProperty(value = "下载次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer clicks;
-
-    @ApiModelProperty(value = "安装次数")
-    @QueryField(type = QueryType.EQ)
-    private Integer installs;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "应用介绍")
-    private String content;
-
-    @ApiModelProperty(value = "项目需求")
-    private String requirement;
-
-    @ApiModelProperty(value = "开发者(个人或公司)")
-    private String developer;
-
-    @ApiModelProperty(value = "软件定价")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "划线价格")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal linePrice;
-
-    @ApiModelProperty(value = "评分")
-    private String score;
-
-    @ApiModelProperty(value = "星级")
-    private String star;
-
-    @ApiModelProperty(value = "菜单路由地址")
-    private String path;
-
-    @ApiModelProperty(value = "菜单组件地址, 目录可为空")
-    private String component;
-
-    @ApiModelProperty(value = "权限标识")
-    private String authority;
-
-    @ApiModelProperty(value = "打开位置")
-    private String target;
-
-    @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
-    @QueryField(type = QueryType.EQ)
-    private Integer hide;
-
-    @ApiModelProperty(value = "禁止搜索，1禁止 0 允许")
-    @QueryField(type = QueryType.EQ)
-    private Integer search;
-
-    @ApiModelProperty(value = "菜单侧栏选中的path")
-    private String active;
-
-    @ApiModelProperty(value = "其它路由元信息")
-    private String meta;
-
-    @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版")
-    private String edition;
-
-    @ApiModelProperty(value = "版本号")
-    private String version;
-
-    @ApiModelProperty(value = "是否已安装")
-    @QueryField(type = QueryType.EQ)
-    private Integer isUse;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "应用状态")
-    private String appStatus;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "租户ID")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "机构id")
-    @QueryField(type = QueryType.EQ)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "企业名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "租户编号")
-    private String tenantCode;
-
-    @ApiModelProperty(value = "按APPID集搜索")
-    @TableField(exist = false)
-    private Set<Integer> appIds;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/AppUserParam.java b/src/main/java/com/gxwebsoft/oa/param/AppUserParam.java
deleted file mode 100644
index 136f2ad..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/AppUserParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 应用成员查询参数
- *
- * @author 科技小王子
- * @since 2023-05-31 13:18:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "AppUserParam对象", description = "应用成员查询参数")
-public class AppUserParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer appUserId;
-
-    @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ")
-    @QueryField(type = QueryType.EQ)
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "应用ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer appId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java b/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java
deleted file mode 100644
index 5d85734..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Set;
-
-/**
- * 服务器资产记录表查询参数
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "AssetsParam对象", description = "服务器资产记录表查询参数")
-public class AssetsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "资产ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer assetsId;
-
-    @ApiModelProperty(value = "资产名称")
-    private String name;
-
-    @ApiModelProperty(value = "资产标识")
-    private String code;
-
-    @ApiModelProperty(value = "资产类型")
-    private String type;
-
-    @ApiModelProperty(value = "服务器厂商")
-    private String brand;
-
-    @ApiModelProperty(value = "服务器配置")
-    private String configuration;
-
-    @ApiModelProperty(value = "初始账号")
-    private String account;
-
-    @ApiModelProperty(value = "初始密码")
-    private String password;
-
-    @ApiModelProperty(value = "(阿里云/腾讯云)登录账号")
-    private String brandAccount;
-
-    @ApiModelProperty(value = "(阿里云/腾讯云)登录密码")
-    private String brandPassword;
-
-    @ApiModelProperty(value = "宝塔面板")
-    private String panel;
-
-    @ApiModelProperty(value = "宝塔面板账号")
-    private String panelAccount;
-
-    @ApiModelProperty(value = "宝塔面板密码")
-    private String panelPassword;
-
-    @ApiModelProperty(value = "财务信息-合同金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal financeAmount;
-
-    @ApiModelProperty(value = "购买年限")
-    @QueryField(type = QueryType.EQ)
-    private Integer financeYears;
-
-    @ApiModelProperty(value = "续费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal financeRenew;
-
-    @ApiModelProperty(value = "客户名称")
-    private String financeCustomerName;
-
-    @ApiModelProperty(value = "客户联系人")
-    private String financeCustomerContact;
-
-    @ApiModelProperty(value = "客户联系电话")
-    private String financeCustomerPhone;
-
-    @ApiModelProperty(value = "客户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "开放端口")
-    private String openPort;
-
-    @ApiModelProperty(value = "详情内容")
-    private String content;
-
-    @ApiModelProperty(value = "购买时间")
-    private String startTime;
-
-    @ApiModelProperty(value = "到期时间")
-    private String endTime;
-
-    @ApiModelProperty(value = "置顶状态")
-    private String isTop;
-
-    @ApiModelProperty(value = "可见性(public,private,protected)")
-    private String visibility;
-
-    @ApiModelProperty(value = "文章排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "描述")
-    private String comments;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    @QueryField(type = QueryType.EQ)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private String status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "企业ID")
-    private Integer companyId;
-
-    @ApiModelProperty(value = "企业名称")
-    @TableField(exist = false)
-    private String companyName;
-
-    @ApiModelProperty(value = "按ID集搜索")
-    @TableField(exist = false)
-    private Set<Integer> assetsIds;
-
-
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java b/src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java
deleted file mode 100644
index e707856..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/AssetsUserParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 服务器成员管理查询参数
- *
- * @author 科技小王子
- * @since 2023-07-18 14:35:51
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "AssetsUserParam对象", description = "服务器成员管理查询参数")
-public class AssetsUserParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ")
-    @QueryField(type = QueryType.EQ)
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "应用ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer assetsId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/CustomerParam.java b/src/main/java/com/gxwebsoft/oa/param/CustomerParam.java
deleted file mode 100644
index 84a9223..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/CustomerParam.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 客户管理记录表查询参数
- *
- * @author WebSoft
- * @since 2022-11-16 11:16:14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CustomerParam对象", description = "客户管理记录表查询参数")
-public class CustomerParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "客户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "客户标识")
-    private String customerCode;
-
-    @ApiModelProperty(value = "客户全称")
-    private String customerFullName;
-
-    @ApiModelProperty(value = "头像")
-    private String customerAvatar;
-
-    @ApiModelProperty(value = "客户类型")
-    private String customerType;
-
-    @ApiModelProperty(value = "客户来源")
-    private String customerSource;
-
-    @ApiModelProperty(value = "公司座机")
-    private String customerPhone;
-
-    @ApiModelProperty(value = "手机号码")
-    private String customerMobile;
-
-    @ApiModelProperty(value = "联系人")
-    private String customerContacts;
-
-    @ApiModelProperty(value = "所在省份")
-    private String customerProvince;
-
-    @ApiModelProperty(value = "所在城市")
-    private String customerCity;
-
-    @ApiModelProperty(value = "所在地区")
-    private String customerRegion;
-
-    @ApiModelProperty(value = "所在地址")
-    private String customerAddress;
-
-    @ApiModelProperty(value = "跟进状态")
-    private String progress;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    @QueryField(type = QueryType.EQ)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "可见性(public,private,protected)")
-    private String visibility;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "按无企业类型查询")
-    @QueryField(type = QueryType.EQ)
-    private Boolean emptyType;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/NoticeParam.java b/src/main/java/com/gxwebsoft/oa/param/NoticeParam.java
deleted file mode 100644
index df369ae..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/NoticeParam.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 消息记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "NoticeParam对象", description = "消息记录表查询参数")
-public class NoticeParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer noticeId;
-
-    @ApiModelProperty(value = "消息类型")
-    private String type;
-
-    @ApiModelProperty(value = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "图标")
-    private String icon;
-
-    @ApiModelProperty(value = "颜色")
-    private String color;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "消息来源")
-    private String source;
-
-    @ApiModelProperty(value = "来源记录ID")
-    private Integer sourceId;
-
-    @ApiModelProperty(value = "路由地址")
-    private String path;
-
-    @ApiModelProperty(value = "渠道, 0发送 1回复")
-    private Integer channel;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "租户id")
-    @QueryField(type = QueryType.EQ)
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/ProjectParam.java b/src/main/java/com/gxwebsoft/oa/param/ProjectParam.java
deleted file mode 100644
index a35020d..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/ProjectParam.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 项目管理表查询参数
- *
- * @author WebSoft
- * @since 2022-11-16 11:00:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ProjectParam对象", description = "项目管理表查询参数")
-public class ProjectParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目标识")
-    private String projectCode;
-
-    @ApiModelProperty(value = "商品分类")
-    private String projectCategory;
-
-    @ApiModelProperty(value = "项目商标")
-    private String projectAvatar;
-
-    @ApiModelProperty(value = "项目域名")
-    private String url;
-
-    @ApiModelProperty(value = "开发版域名")
-    private String urlDev;
-
-    @ApiModelProperty(value = "后台管理地址")
-    private String urlAdmin;
-
-    @ApiModelProperty(value = "默认账号密码")
-    private String account;
-
-    @ApiModelProperty(value = "项目金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "实际金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal realMoney;
-
-    @ApiModelProperty(value = "年费")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal annualFee;
-
-    @ApiModelProperty(value = "项目详情")
-    private String content;
-
-    @ApiModelProperty(value = "开发参数(json)")
-    private String param;
-
-    @ApiModelProperty(value = "二维码")
-    private String qrcode;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "项目进度（10待安排 20策划设计 30功能开发 40待验收 50完成）")
-    @QueryField(type = QueryType.EQ)
-    private Integer progress;
-
-    @ApiModelProperty(value = "初始浏览数")
-    @QueryField(type = QueryType.EQ)
-    private Integer views;
-
-    @ApiModelProperty(value = "状态(10上架 20下架)")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "是否精选客户案例")
-    @QueryField(type = QueryType.EQ)
-    private Boolean isCase;
-
-    @ApiModelProperty(value = "负责人")
-    @QueryField(type = QueryType.EQ)
-    private Integer commander;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    @QueryField(type = QueryType.EQ)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "可见性(public,private,protected)")
-    private String visibility;
-
-    @ApiModelProperty(value = "项目归属者")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "项目描述")
-    private String comments;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/TaskParam.java b/src/main/java/com/gxwebsoft/oa/param/TaskParam.java
deleted file mode 100644
index c736e96..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/TaskParam.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 文章记录表查询参数
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:42
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TaskParam对象", description = "文章记录表查询参数")
-public class TaskParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "任务ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer taskId;
-
-    @ApiModelProperty(value = "任务名称")
-    private String name;
-
-    @ApiModelProperty(value = "任务类型")
-    private String taskType;
-
-    @ApiModelProperty(value = "关联应用")
-    private Integer appId;
-
-    @ApiModelProperty(value = "客户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "资产ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer assetsId;
-
-    @ApiModelProperty(value = "是否已查阅")
-    private Integer isRead;
-
-    @ApiModelProperty(value = "最后回复人ID")
-    private Integer lastReadUser;
-
-    @ApiModelProperty(value = "最后回复人头像")
-    @TableField(exist = false)
-    private String lastAvatar;
-
-    @ApiModelProperty(value = "最后回复人昵称")
-    @TableField(exist = false)
-    private String lastNickname;
-
-    @ApiModelProperty(value = "最后回复人姓名")
-    @TableField(exist = false)
-    private String lastRealName;
-
-    @ApiModelProperty(value = "最后回复人公司名称")
-    @TableField(exist = false)
-    private String lastCompanyName;
-
-    @ApiModelProperty(value = "开始时间")
-    private String startTime;
-
-    @ApiModelProperty(value = "结束时间")
-    private String endTime;
-
-    @ApiModelProperty(value = "任务内容")
-    private String content;
-
-    @ApiModelProperty(value = "任务发起人")
-    @QueryField(type = QueryType.EQ)
-    private Integer promoter;
-
-    @ApiModelProperty(value = "负责人")
-    private Integer commander;
-
-    @ApiModelProperty(value = "任务状态")
-    private String progress;
-
-    @ApiModelProperty(value = "优先级")
-    private String priority;
-
-    @ApiModelProperty(value = "品质要求")
-    private String quality;
-
-    @ApiModelProperty(value = "时限(天)")
-    @QueryField(type = QueryType.EQ)
-    private Integer day;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "机构id")
-    @QueryField(type = QueryType.EQ)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "用户昵称")
-    @QueryField(type = QueryType.EQ)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @QueryField(type = QueryType.EQ)
-    private String avatar;
-
-    @ApiModelProperty(value = "应用名称")
-    @TableField(exist = false)
-    private String appName;
-
-    @ApiModelProperty(value = "关键词搜索")
-    @TableField(exist = false)
-    private String keywords;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java b/src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java
deleted file mode 100644
index 822697f..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/TaskRecordParam.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.oa.entity.App;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 工单回复记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TaskRecordParam对象", description = "工单回复记录表查询参数")
-public class TaskRecordParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "回复ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer taskRecordId;
-
-    @ApiModelProperty(value = "工单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer taskId;
-
-    @ApiModelProperty(value = "上级ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "任务内容")
-    private String content;
-
-    @ApiModelProperty(value = "工单附件")
-    private String files;
-
-    @ApiModelProperty(value = "开发者ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer developerId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0待处理, 1已完成")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "用户昵称")
-    @QueryField(type = QueryType.EQ)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @QueryField(type = QueryType.EQ)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java b/src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java
deleted file mode 100644
index 577aa4c..0000000
--- a/src/main/java/com/gxwebsoft/oa/param/TaskUserParam.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.oa.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 工单成员查询参数
- *
- * @author 科技小王子
- * @since 2023-03-06 12:00:41
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TaskUserParam对象", description = "工单成员查询参数")
-public class TaskUserParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer taskUserId;
-
-    @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ")
-    @QueryField(type = QueryType.EQ)
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "工单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer taskId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/AppService.java b/src/main/java/com/gxwebsoft/oa/service/AppService.java
deleted file mode 100644
index bf03d2d..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/AppService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.param.AppParam;
-
-import java.util.List;
-
-/**
- * 应用管理记录表Service
- *
- * @author 科技小王子
- * @since 2023-03-28 10:45:39
- */
-public interface AppService extends IService<App> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<App>
-     */
-    @InterceptorIgnore(tenantLine = "true")
-    PageResult<App> pageRel(AppParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<App>
-     */
-    List<App> listRel(AppParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param appId 应用ID
-     * @return App
-     */
-    @InterceptorIgnore(tenantLine = "true")
-    App getByIdRel(Integer appId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/AppUserService.java b/src/main/java/com/gxwebsoft/oa/service/AppUserService.java
deleted file mode 100644
index 0a152f9..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/AppUserService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppUserParam;
-
-import java.util.List;
-
-/**
- * 应用成员Service
- *
- * @author 科技小王子
- * @since 2023-05-31 13:18:55
- */
-public interface AppUserService extends IService<AppUser> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<AppUser>
-     */
-    PageResult<AppUser> pageRel(AppUserParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<AppUser>
-     */
-    List<AppUser> listRel(AppUserParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param appUserId 自增ID
-     * @return AppUser
-     */
-    AppUser getByIdRel(Integer appUserId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/AssetsService.java b/src/main/java/com/gxwebsoft/oa/service/AssetsService.java
deleted file mode 100644
index 275d3f7..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/AssetsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.Assets;
-import com.gxwebsoft.oa.param.AssetsParam;
-
-import java.util.List;
-
-/**
- * 服务器资产记录表Service
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-public interface AssetsService extends IService<Assets> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Assets>
-     */
-    PageResult<Assets> pageRel(AssetsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Assets>
-     */
-    List<Assets> listRel(AssetsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param assetsId 资产ID
-     * @return Assets
-     */
-    Assets getByIdRel(Integer assetsId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java b/src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java
deleted file mode 100644
index 45a50bb..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/AssetsUserService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.AssetsUser;
-import com.gxwebsoft.oa.param.AssetsUserParam;
-
-import java.util.List;
-
-/**
- * 服务器成员管理Service
- *
- * @author 科技小王子
- * @since 2023-07-18 14:35:51
- */
-public interface AssetsUserService extends IService<AssetsUser> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<AssetsUser>
-     */
-    PageResult<AssetsUser> pageRel(AssetsUserParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<AssetsUser>
-     */
-    List<AssetsUser> listRel(AssetsUserParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return AssetsUser
-     */
-    AssetsUser getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/CustomerService.java b/src/main/java/com/gxwebsoft/oa/service/CustomerService.java
deleted file mode 100644
index 393265f..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/CustomerService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.Customer;
-import com.gxwebsoft.oa.param.CustomerParam;
-
-import java.util.List;
-
-/**
- * 客户管理记录表Service
- *
- * @author WebSoft
- * @since 2022-11-16 11:16:14
- */
-public interface CustomerService extends IService<Customer> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Customer>
-     */
-    PageResult<Customer> pageRel(CustomerParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Customer>
-     */
-    List<Customer> listRel(CustomerParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param customerId 客户ID
-     * @return Customer
-     */
-    Customer getByIdRel(Integer customerId);
-
-    Customer getByCustomerName(String customerName);
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/NoticeService.java b/src/main/java/com/gxwebsoft/oa/service/NoticeService.java
deleted file mode 100644
index b14c659..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/NoticeService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.Notice;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.param.NoticeParam;
-
-import java.util.List;
-
-/**
- * 消息记录表Service
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-public interface NoticeService extends IService<Notice> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Notice>
-     */
-    PageResult<Notice> pageRel(NoticeParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Notice>
-     */
-    List<Notice> listRel(NoticeParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param noticeId ID
-     * @return Notice
-     */
-    Notice getByIdRel(Integer noticeId);
-
-    void add();
-
-    void addNotice(Task task);
-
-    void addLetter(TaskRecord taskRecord);
-
-    void addTodo(Task task);
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/ProjectService.java b/src/main/java/com/gxwebsoft/oa/service/ProjectService.java
deleted file mode 100644
index ffd1934..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/ProjectService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.Project;
-import com.gxwebsoft.oa.param.ProjectParam;
-
-import java.util.List;
-
-/**
- * 项目管理表Service
- *
- * @author WebSoft
- * @since 2022-11-16 11:00:43
- */
-public interface ProjectService extends IService<Project> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Project>
-     */
-    PageResult<Project> pageRel(ProjectParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Project>
-     */
-    List<Project> listRel(ProjectParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param projectId 项目ID
-     * @return Project
-     */
-    Project getByIdRel(Integer projectId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java b/src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java
deleted file mode 100644
index 130883c..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/TaskRecordService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.param.TaskRecordParam;
-
-import java.util.List;
-
-/**
- * 工单回复记录表Service
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-public interface TaskRecordService extends IService<TaskRecord> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TaskRecord>
-     */
-    PageResult<TaskRecord> pageRel(TaskRecordParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TaskRecord>
-     */
-    List<TaskRecord> listRel(TaskRecordParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param taskRecordId 回复ID
-     * @return TaskRecord
-     */
-    TaskRecord getByIdRel(Integer taskRecordId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/TaskService.java b/src/main/java/com/gxwebsoft/oa/service/TaskService.java
deleted file mode 100644
index 30e7c80..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/TaskService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.param.TaskParam;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 文章记录表Service
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:43
- */
-public interface TaskService extends IService<Task> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Task>
-     */
-    PageResult<Task> pageRel(TaskParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Task>
-     */
-    List<Task> listRel(TaskParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param taskId 任务ID
-     * @return Task
-     */
-    Task getByIdRel(Integer taskId);
-
-    ArrayList<Object> getCountNum(User loginUser);
-
-    ArrayList<Object> getCountNum(User loginUser, TaskParam param);
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/TaskUserService.java b/src/main/java/com/gxwebsoft/oa/service/TaskUserService.java
deleted file mode 100644
index 15b9927..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/TaskUserService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.oa.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.TaskUser;
-import com.gxwebsoft.oa.param.TaskUserParam;
-
-import java.util.List;
-
-/**
- * 工单成员Service
- *
- * @author 科技小王子
- * @since 2023-03-06 12:00:41
- */
-public interface TaskUserService extends IService<TaskUser> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TaskUser>
-     */
-    PageResult<TaskUser> pageRel(TaskUserParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TaskUser>
-     */
-    List<TaskUser> listRel(TaskUserParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param taskUserId 自增ID
-     * @return TaskUser
-     */
-    TaskUser getByIdRel(Integer taskUserId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java
deleted file mode 100644
index b2bbf2f..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.mapper.AppMapper;
-import com.gxwebsoft.oa.param.AppParam;
-import com.gxwebsoft.oa.service.AppService;
-import com.gxwebsoft.oa.service.AppUserService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 应用管理记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-03-28 10:45:39
- */
-@Service
-public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements AppService {
-    @Resource
-    private AppUserService appUserService;
-
-    @Override
-    public PageResult<App> pageRel(AppParam param) {
-      PageParam<App, AppParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-
-      List<App> list = baseMapper.selectPageRel(page, param);
-      return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<App> listRel(AppParam param) {
-        List<App> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<App, AppParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public App getByIdRel(Integer appId) {
-        AppParam param = new AppParam();
-        param.setAppId(appId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java
deleted file mode 100644
index b31f04d..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/AppUserServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.AppUserMapper;
-import com.gxwebsoft.oa.service.AppUserService;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppUserParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 应用成员Service实现
- *
- * @author 科技小王子
- * @since 2023-05-31 13:18:55
- */
-@Service
-public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AppUserService {
-
-    @Override
-    public PageResult<AppUser> pageRel(AppUserParam param) {
-        PageParam<AppUser, AppUserParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<AppUser> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<AppUser> listRel(AppUserParam param) {
-        List<AppUser> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<AppUser, AppUserParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public AppUser getByIdRel(Integer appUserId) {
-        AppUserParam param = new AppUserParam();
-        param.setAppUserId(appUserId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java
deleted file mode 100644
index 3cba77d..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/AssetsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.AssetsMapper;
-import com.gxwebsoft.oa.service.AssetsService;
-import com.gxwebsoft.oa.entity.Assets;
-import com.gxwebsoft.oa.param.AssetsParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 服务器资产记录表Service实现
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-@Service
-public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> implements AssetsService {
-
-    @Override
-    public PageResult<Assets> pageRel(AssetsParam param) {
-        PageParam<Assets, AssetsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Assets> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Assets> listRel(AssetsParam param) {
-        List<Assets> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Assets, AssetsParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Assets getByIdRel(Integer assetsId) {
-        AssetsParam param = new AssetsParam();
-        param.setAssetsId(assetsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java
deleted file mode 100644
index 917c503..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/AssetsUserServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.AssetsUserMapper;
-import com.gxwebsoft.oa.service.AssetsUserService;
-import com.gxwebsoft.oa.entity.AssetsUser;
-import com.gxwebsoft.oa.param.AssetsUserParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 服务器成员管理Service实现
- *
- * @author 科技小王子
- * @since 2023-07-18 14:35:51
- */
-@Service
-public class AssetsUserServiceImpl extends ServiceImpl<AssetsUserMapper, AssetsUser> implements AssetsUserService {
-
-    @Override
-    public PageResult<AssetsUser> pageRel(AssetsUserParam param) {
-        PageParam<AssetsUser, AssetsUserParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<AssetsUser> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<AssetsUser> listRel(AssetsUserParam param) {
-        List<AssetsUser> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<AssetsUser, AssetsUserParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public AssetsUser getByIdRel(Integer id) {
-        AssetsUserParam param = new AssetsUserParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java
deleted file mode 100644
index cea7a3c..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/CustomerServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.CustomerMapper;
-import com.gxwebsoft.oa.service.CustomerService;
-import com.gxwebsoft.oa.entity.Customer;
-import com.gxwebsoft.oa.param.CustomerParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 客户管理记录表Service实现
- *
- * @author WebSoft
- * @since 2022-11-16 11:16:14
- */
-@Service
-public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
-
-    @Override
-    public PageResult<Customer> pageRel(CustomerParam param) {
-        PageParam<Customer, CustomerParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Customer> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Customer> listRel(CustomerParam param) {
-        List<Customer> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Customer, CustomerParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Customer getByIdRel(Integer customerId) {
-        CustomerParam param = new CustomerParam();
-        param.setCustomerId(customerId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public Customer getByCustomerName(String customerName) {
-        return query().eq("customer_name", customerName).one();
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java
deleted file mode 100644
index 6f97606..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/NoticeServiceImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.mapper.NoticeMapper;
-import com.gxwebsoft.oa.service.NoticeService;
-import com.gxwebsoft.oa.entity.Notice;
-import com.gxwebsoft.oa.param.NoticeParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.service.TaskService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.oa.constants.NoticeConstants.*;
-
-/**
- * 消息记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-@Service
-public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements NoticeService {
-    @Resource
-    private UserService userService;
-    @Resource
-    private TaskService taskService;
-
-    @Override
-    public PageResult<Notice> pageRel(NoticeParam param) {
-        PageParam<Notice, NoticeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Notice> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Notice> listRel(NoticeParam param) {
-        List<Notice> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Notice, NoticeParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Notice getByIdRel(Integer noticeId) {
-        NoticeParam param = new NoticeParam();
-        param.setNoticeId(noticeId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public void add() {
-    }
-
-    @Override
-    public void addNotice(Task task) {
-      Notice notice = new Notice();
-      notice.setType(NOTICE);
-      notice.setIcon("NotificationFilled");
-      notice.setSourceId(task.getTaskId());
-      notice.setUserId(task.getPromoter());
-      notice.setTitle(task.getName());
-      notice.setContent("您有一个新指派的工单(" + task.getTaskId() + ")需要处理！");
-      save(notice);
-    }
-
-    @Override
-    public void addLetter(TaskRecord taskRecord) {
-      // 通知发起人
-      User user = userService.getById(taskRecord.getUserId());
-      Task task = taskService.getById(taskRecord.getTaskId());
-      Notice notice = new Notice();
-      notice.setType(LETTER);
-      notice.setIcon(user.getAvatar());
-      notice.setSourceId(task.getTaskId());
-      notice.setUserId(task.getPromoter());
-      notice.setTitle(user.getNickname() + " 回复了你的工单(" + taskRecord.getTaskId() + ")");
-      notice.setContent(taskRecord.getContent());
-      save(notice);
-      // 通知代发人
-      notice.setUserId(task.getUserId());
-      save(notice);
-    }
-
-    @Override
-    public void addTodo(Task task) {
-      Task record = taskService.getById(task.getTaskId());
-      if (task.getCommander() != null) {
-        Notice notice = new Notice();
-        notice.setType(TODO);
-        notice.setIcon("HistoryOutlined");
-        notice.setSourceId(task.getTaskId());
-        notice.setUserId(task.getCommander());
-        notice.setTitle("您有一个新的工单需要处理！");
-        notice.setContent(record.getName().concat("("+ task.getTaskId() +")"));
-        notice.setProgress(record.getProgress());
-        save(notice);
-      }
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java
deleted file mode 100644
index f456fce..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/ProjectServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.ProjectMapper;
-import com.gxwebsoft.oa.service.ProjectService;
-import com.gxwebsoft.oa.entity.Project;
-import com.gxwebsoft.oa.param.ProjectParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目管理表Service实现
- *
- * @author WebSoft
- * @since 2022-11-16 11:00:43
- */
-@Service
-public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
-
-    @Override
-    public PageResult<Project> pageRel(ProjectParam param) {
-        PageParam<Project, ProjectParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Project> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Project> listRel(ProjectParam param) {
-        List<Project> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Project, ProjectParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Project getByIdRel(Integer projectId) {
-        ProjectParam param = new ProjectParam();
-        param.setProjectId(projectId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java
deleted file mode 100644
index da1f170..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/TaskRecordServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.TaskRecordMapper;
-import com.gxwebsoft.oa.service.TaskRecordService;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.param.TaskRecordParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.service.TaskService;
-import org.springframework.security.core.parameters.P;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 工单回复记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-@Service
-public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRecord> implements TaskRecordService {
-    @Override
-    public PageResult<TaskRecord> pageRel(TaskRecordParam param) {
-        PageParam<TaskRecord, TaskRecordParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time asc");
-        List<TaskRecord> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-  @Override
-    public List<TaskRecord> listRel(TaskRecordParam param) {
-        List<TaskRecord> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TaskRecord, TaskRecordParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time asc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TaskRecord getByIdRel(Integer taskRecordId) {
-        TaskRecordParam param = new TaskRecordParam();
-        param.setTaskRecordId(taskRecordId);
-      return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java
deleted file mode 100644
index 32675e6..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/TaskServiceImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.mapper.TaskMapper;
-import com.gxwebsoft.oa.param.TaskParam;
-import com.gxwebsoft.oa.service.TaskService;
-import com.gxwebsoft.oa.service.TaskUserService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * 文章记录表Service实现
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:43
- */
-@Service
-public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
-  private Integer userId;
-  @Resource
-  private UserService userService;
-  @Resource
-  private TaskUserService taskUserService;
-
-    @Override
-    public PageResult<Task> pageRel(TaskParam param) {
-        PageParam<Task, TaskParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Task> list = baseMapper.selectPageRel(page, param);
-//        list.forEach(d -> {
-//          int count = taskUserService.count(new LambdaQueryWrapper<TaskUser>().eq(TaskUser::getTaskId, d.getTaskId()));
-//          if(count>0){
-//            TaskUserParam taskUserParam = new TaskUserParam();
-//            taskUserParam.setTaskId(d.getTaskId());
-//            List<TaskUser> users = taskUserService.listRel(taskUserParam);
-//            d.setUsers(users);
-//          }
-//        });
-        return new PageResult<>(list, page.getTotal());
-    }
-
-  @Override
-    public List<Task> listRel(TaskParam param) {
-        List<Task> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Task, TaskParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Task getByIdRel(Integer taskId) {
-        TaskParam param = new TaskParam();
-        param.setTaskId(taskId);
-      return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public ArrayList<Object> getCountNum(User loginUser) {
-      Integer type = loginUser.getType();
-      Integer userId = loginUser.getUserId();
-      AtomicInteger count1 = new AtomicInteger(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 0)));
-      AtomicInteger count2 = new AtomicInteger(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 1)));
-      // 非管理员仅可浏览和自己相关的工单
-      loginUser.getRoles().forEach(d -> {
-        if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){
-          if(type.equals(6)){
-            count1.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 0).eq(Task::getCommander, userId)));
-            count2.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 1).eq(Task::getCommander, userId)));
-          }
-          if(type.equals(10)){
-            count1.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 0).eq(Task::getPromoter, userId)));
-            count2.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 1).eq(Task::getPromoter, userId)));
-          }
-        }
-      });
-      JSONObject json1 = new JSONObject();
-      json1.put("tab","待处理");
-      json1.put("key","0");
-      json1.put("count",count1);
-      JSONObject json2 = new JSONObject();
-      json2.put("tab","已完成");
-      json2.put("key","1");
-      json2.put("count",count2);
-      ArrayList<Object> objects = new ArrayList<>();
-      objects.add(json1);
-      objects.add(json2);
-      return objects;
-    }
-
-  @Override
-  public ArrayList<Object> getCountNum(User loginUser, TaskParam param) {
-    Integer type = loginUser.getType();
-    final Integer userId = param.getUserId();
-//    if (param.getUserId() != null) {
-//      this.userId = param.getUserId();
-//    }else {
-//      this.userId = loginUser.getUserId();
-//    }
-
-    AtomicInteger count1 = new AtomicInteger(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 0)));
-    AtomicInteger count2 = new AtomicInteger(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 1)));
-    // 非管理员仅可浏览和自己相关的工单
-    loginUser.getRoles().forEach(d -> {
-
-      if(type.equals(6)){
-        count1.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 0).eq(Task::getCommander, userId)));
-        count2.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 1).eq(Task::getCommander, userId)));
-      }
-      if(type.equals(10)){
-        count1.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 0).eq(Task::getPromoter, userId)));
-        count2.set(count(new LambdaQueryWrapper<Task>().eq(Task::getStatus, 1).eq(Task::getPromoter, userId)));
-      }
-    });
-    JSONObject json1 = new JSONObject();
-    json1.put("tab","待处理");
-    json1.put("key","0");
-    json1.put("count",count1);
-    JSONObject json2 = new JSONObject();
-    json2.put("tab","已完成");
-    json2.put("key","1");
-    json2.put("count",count2);
-    ArrayList<Object> objects = new ArrayList<>();
-    objects.add(json1);
-    objects.add(json2);
-    return objects;
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java
deleted file mode 100644
index d3ee7b5..0000000
--- a/src/main/java/com/gxwebsoft/oa/service/impl/TaskUserServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.oa.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.oa.mapper.TaskUserMapper;
-import com.gxwebsoft.oa.service.TaskUserService;
-import com.gxwebsoft.oa.entity.TaskUser;
-import com.gxwebsoft.oa.param.TaskUserParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 工单成员Service实现
- *
- * @author 科技小王子
- * @since 2023-03-06 12:00:41
- */
-@Service
-public class TaskUserServiceImpl extends ServiceImpl<TaskUserMapper, TaskUser> implements TaskUserService {
-
-    @Override
-    public PageResult<TaskUser> pageRel(TaskUserParam param) {
-        PageParam<TaskUser, TaskUserParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TaskUser> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TaskUser> listRel(TaskUserParam param) {
-        List<TaskUser> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TaskUser, TaskUserParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TaskUser getByIdRel(Integer taskUserId) {
-        TaskUserParam param = new TaskUserParam();
-        param.setTaskUserId(taskUserId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
deleted file mode 100644
index 5399dd1..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.request.AlipaySystemOauthTokenRequest;
-import com.alipay.api.request.AlipayUserInfoShareRequest;
-import com.alipay.api.response.AlipaySystemOauthTokenResponse;
-import com.alipay.api.response.AlipayUserInfoShareResponse;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.AlipayConfigUtil;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.LoginRecord;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.entity.UserRole;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.result.LoginResult;
-import com.gxwebsoft.common.system.service.LoginRecordService;
-import com.gxwebsoft.common.system.service.UserRoleService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.mapper.UserOauthMapper;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import com.gxwebsoft.shop.service.UserOauthService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import static com.gxwebsoft.common.core.utils.CommonUtil.randomUsername;
-
-/**
- * 登录认证控制器
- *
- * @author WebSoft
- * @since 2018-12-24 16:10:11
- */
-@Api(tags = "登录认证")
-@RestController
-@RequestMapping("/api/open/login-alipay")
-public class OpenAlipayController extends BaseController {
-    @Resource
-    private ConfigProperties configProperties;
-    @Resource
-    private UserService userService;
-    @Resource
-    private LoginRecordService loginRecordService;
-    @Resource
-    private UserRoleService userRoleService;
-    @Resource
-    private UserOauthService userOauthService;
-    @Resource
-    private AlipayConfigUtil alipayConfig;
-    @Resource
-    private UserOauthMapper userOauthMapper;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    @ApiOperation("支付宝授权码")
-    @PostMapping("/getAuthCode")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> getAuthCode(@RequestBody UserParam param, HttpServletRequest req) throws AlipayApiException {
-      // 验证签名
-      isCheckSign();
-      // 读取缓存信息
-      String setting = stringRedisTemplate.opsForValue().get("cache"+param.getTenantId()+":setting:register");
-      if(setting == null){
-        throw new BusinessException("请先配置注册设置");
-      }
-      JSONObject jsonObject = JSONObject.parseObject(setting);
-      String roleId = jsonObject.getString("roleId");
-      // 实例化客户端
-      DefaultAlipayClient alipayClient = alipayConfig.alipayClient(param.getTenantId());
-      try {
-        AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
-        request.setGrantType("authorization_code");
-        request.setCode(param.getAuthCode());
-        AlipaySystemOauthTokenResponse response = alipayClient.certificateExecute(request);
-        if (response.isSuccess()) {
-          final String accessToken = response.getAccessToken();
-          AlipayUserInfoShareRequest request2 = new AlipayUserInfoShareRequest();
-          AlipayUserInfoShareResponse userInfo = alipayClient.certificateExecute(request2, accessToken);
-          String nickName = "支付宝用户";
-          String avatar = "";
-          if(StrUtil.isNotBlank(userInfo.getAvatar())){
-            avatar = userInfo.getAvatar();
-          }
-          if (StrUtil.isNotBlank(userInfo.getNickName())) {
-            nickName = userInfo.getNickName();
-          }
-          if(userInfo.isSuccess()){
-            // 查询是否已注册
-            UserOauthParam userOauthParam = new UserOauthParam();
-            userOauthParam.setOauthId(userInfo.getUserId());
-            userOauthParam.setTenantId(param.getTenantId());
-            UserOauth userOauth = userOauthParam.getOne(userOauthMapper.getByOauthId(userOauthParam));
-            if(userOauth != null){
-              UserParam userParam = new UserParam();
-              userParam.setUserId(userOauth.getUserId());
-              userParam.setTenantId(userOauth.getTenantId());
-              User user = userService.getByOauthId(userParam);
-              if(user != null){
-                // 签发token
-                String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
-                  configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-                return success("登录成功", new LoginResult(access_token, user));
-              }
-              userOauthService.removeById(userOauth.getId());
-            }
-            // 新注册用户
-            User user = new User();
-            user.setStatus(0);
-            user.setUsername(randomUsername("Ali_"));
-            user.setNickname(nickName);
-            user.setAvatar(avatar);
-            user.setCity(userInfo.getCity());
-            user.setProvince(userInfo.getProvince());
-            user.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-            user.setTenantId(param.getTenantId());
-            boolean isSuccess = userService.saveUser(user);
-            if(isSuccess){
-              // 添加用户角色
-              UserRole userRole = new UserRole();
-              userRole.setUserId(user.getUserId());
-              userRole.setTenantId(param.getTenantId());
-              userRole.setRoleId(Integer.valueOf(roleId));
-              userRoleService.save(userRole);
-              // 添加第三方用户信息
-              UserOauth userOauth2 = new UserOauth();
-              userOauth2.setUserId(user.getUserId());
-              userOauth2.setTenantId(param.getTenantId());
-              userOauth2.setOauthType("MP-ALIPAY");
-              userOauth2.setOauthId(userInfo.getUserId());
-              userOauthService.save(userOauth2);
-
-              UserParam userParam = new UserParam();
-              userParam.setUserId(user.getUserId());
-              userParam.setTenantId(user.getTenantId());
-              User result = userService.getByOauthId(userParam);
-              loginRecordService.saveAsync(result.getUsername(), LoginRecord.TYPE_REGISTER, null, result.getTenantId(), req);
-              // 签发token
-              String access_token = JwtUtil.buildToken(new JwtSubject(result.getUsername(), result.getTenantId()),
-                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-              return success("登录成功", new LoginResult(access_token, result));
-            }
-          }
-        }
-      } catch (AlipayApiException e) {
-        e.printStackTrace();
-      }
-      return fail("支付宝授权失败");
-    }
-
-    @ApiOperation("授权手机号码")
-    @PostMapping("/update")
-    public ApiResult<User> updateInfo(@RequestBody User user) {
-      user.setUserId(getLoginUserId());
-      // 不能修改的字段
-      user.setUsername(null);
-      user.setPassword(null);
-      user.setEmailVerified(null);
-      user.setOrganizationId(null);
-      user.setStatus(null);
-      if (userService.updateById(user)) {
-        return success(userService.getByIdRel(user.getUserId()));
-      }
-      return fail("保存失败", null);
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAppController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAppController.java
deleted file mode 100644
index 59fdb87..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenAppController.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppParam;
-import com.gxwebsoft.oa.param.AppUserParam;
-import com.gxwebsoft.oa.service.AppService;
-import com.gxwebsoft.oa.service.AppUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.USER_RANKING_BY_APPS;
-
-/**
- * 应用控制器
- *
- * @author WebSoft
- * @since 2022-11-18 13:55:29
- */
-@Api(tags = "应用管理")
-@RestController
-@RequestMapping("/api/open/app")
-public class OpenAppController extends BaseController {
-    @Resource
-    private AppService appService;
-    @Resource
-    private AppUserService appUserService;
-    @Resource
-    private CacheClient cacheClient;
-
-    @ApiOperation("分页查询应用")
-    @GetMapping("/page")
-    public ApiResult<PageResult<App>> page(AppParam param) {
-        // 验证签名
-        isCheckSign();
-        // 非管理员仅显示已加入成员管理的应用列表
-        User loginUser = getLoginUser();
-        if(!loginUser.getUsername().equals("admin")){
-          param.setUserId(getLoginUserId());
-        }
-        param.setTenantId(getTenantId());
-        // 使用关联查询
-        return success(appService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部应用")
-    @GetMapping()
-    public ApiResult<List<App>> list(AppParam param) {
-        // 验证签名
-        isCheckSign();
-        param.setUserId(getLoginUserId());
-        param.setTenantId(getTenantId());
-        // 使用关联查询
-        return success(appService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询应用")
-    @GetMapping("/{id}")
-    public ApiResult<App> get(@PathVariable("id") Integer id) {
-//        return success(appService.getById(id));
-      // 验证签名
-      isCheckSign();
-      App app = appService.getByIdRel(id);
-      // 查询开发成员列表
-      AppUserParam appUserParam = new AppUserParam();
-      appUserParam.setAppId(app.getAppId());
-      List<AppUser> appUsers = appUserService.listRel(appUserParam);
-//      List<User> list = userService.list(new LambdaQueryWrapper<User>().in(User::getUserId, appUsers.stream().map(AppUser::getUserId).collect(Collectors.toList())));
-      app.setUsers(appUsers);
-      return success(app);
-    }
-
-    @ApiOperation("创建应用")
-    @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE)
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody App app) {
-        // 验证签名
-        isCheckSign();
-        if (app.getAppType() == null) {
-          return fail("应用类型不能为空");
-        }
-        // 创建应用
-      final Integer loginUserId = getLoginUserId();
-      final User loginUser = getLoginUser();
-        app.setUserId(loginUserId);
-        app.setStatus(0);  // 需要审核1 不需要审核0
-        app.setAppSecret(IdUtil.fastSimpleUUID());
-        app.setTenantId(loginUser.getTenantId());
-      System.out.println("app = " + app);
-        if (appService.save(app)) {
-          // 添加应用成员
-          AppUser appUser = new AppUser();
-          appUser.setAppId(app.getAppId());
-          appUser.setRole(30);
-          appUser.setUserId(loginUserId);
-          appUser.setStatus(0);
-          appUserService.save(appUser);
-          // 更新缓存
-          String key = "AppSecret:".concat(app.getAppId().toString());
-          cacheClient.set(key,app.getAppSecret());
-          // 更新用户的插件数量到排行榜
-          int count = appService.count(new LambdaQueryWrapper<App>()
-            .eq(App::getUserId, loginUserId));
-          cacheClient.zAdd(USER_RANKING_BY_APPS, loginUserId,(double) count);
-          return success("创建成功");
-        }
-        return fail("创建失败");
-    }
-
-    @ApiOperation("修改应用")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody App app) {
-        // 验证签名
-        isCheckSign();
-        if (appService.updateById(app)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除应用")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        if (appService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("查看秘钥")
-    @PostMapping("/getAppSecret")
-    public ApiResult<?> getAppSecret(@RequestBody App app) {
-      App result = appService.getByIdRel(app.getAppId());
-      String key = "AppSecret:".concat(app.getAppId().toString());
-      result.setAppSecret(cacheClient.get(key));
-      return success("操作成功",result);
-    }
-
-    @ApiOperation("重置秘钥")
-    @PostMapping("/updateAppSecret")
-    public ApiResult<?> updateAppSecret(@RequestBody App app) {
-      // 验证签名
-      isCheckSign();
-      if (app.getAppId() == null) {
-        return fail("请勿重复操作");
-      }
-      App result = appService.getByIdRel(app.getAppId());
-      String key = cacheClient.key("AppSecret", app.getAppId());
-      String appSecret = IdUtil.fastSimpleUUID();
-      cacheClient.set(key,appSecret);
-      result.setAppSecret(appSecret);
-      return success("重置成功",result);
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java
deleted file mode 100644
index 2b10b4a..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenAppUserController.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.oa.entity.AppUser;
-import com.gxwebsoft.oa.param.AppUserParam;
-import com.gxwebsoft.oa.service.AppUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 应用成员控制器
- *
- * @author 科技小王子
- * @since 2023-02-17 13:22:20
- */
-@Api(tags = "应用成员管理")
-@RestController
-@RequestMapping("/api/open/app-user")
-public class OpenAppUserController extends BaseController {
-    @Resource
-    private AppUserService appUserService;
-
-    @ApiOperation("分页查询应用成员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<AppUser>> page(AppUserParam param) {
-        // 验证签名
-        isCheckSign();
-        PageParam<AppUser, AppUserParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(appUserService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(appUserService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部应用成员")
-    @GetMapping()
-    public ApiResult<List<AppUser>> list(AppUserParam param) {
-      // 验证签名
-      isCheckSign();
-        PageParam<AppUser, AppUserParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(appUserService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(appUserService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询应用成员")
-    @GetMapping("/{id}")
-    public ApiResult<AppUser> get(@PathVariable("id") Integer id) {
-      // 验证签名
-      isCheckSign();
-        return success(appUserService.getById(id));
-        // 使用关联查询
-        //return success(appUserService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加应用成员")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody AppUser appUser) {
-        // 验证签名
-        isCheckSign();
-        String username = appUser.getUsername();
-        Integer appId = appUser.getAppId();
-        Integer userIdByUsername = getUserIdByUsername(username,getTenantId());
-        // 判断重复
-        if(appUserService.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserId,userIdByUsername).eq(AppUser::getAppId,appId)) > 0){
-          throw new BusinessException("请勿重复添加");
-        }
-        // 是否超出限制
-        if(appUserService.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getAppId,appUser.getAppId())) > 50){
-          throw new BusinessException("最多只能添加50个");
-        }
-        appUser.setUserId(userIdByUsername);
-        appUser.setStatus(0);
-        if (appUserService.save(appUser)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("修改应用成员")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody AppUser appUser) {
-      // 验证签名
-      isCheckSign();
-        if (appUserService.updateById(appUser)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除应用成员")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-      // 验证签名
-      isCheckSign();
-      AppUser appUser = appUserService.getById(id);
-      if(appUser.getRole().equals(30)){
-        return fail("管理员不能删除");
-      }
-      if (appUserService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("批量添加应用成员")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<AppUser> list) {
-      // 验证签名
-      isCheckSign();
-        if (appUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("批量修改应用成员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<AppUser> batchParam) {
-      // 验证签名
-      isCheckSign();
-        if (batchParam.update(appUserService, "app_user_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("批量删除应用成员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-      // 验证签名
-      isCheckSign();
-        if (appUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java b/src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java
deleted file mode 100644
index 6c5f33f..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenAppstoreController.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.Tenant;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.param.TenantParam;
-import com.gxwebsoft.common.system.service.TenantService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 应用管理
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "应用管理(已废弃)")
-@RestController
-@RequestMapping("/api/open/appstore")
-public class OpenAppstoreController extends BaseController {
-    @Resource
-    private TenantService tenantService;
-
-    @ApiOperation("分页查询应用")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Tenant>> page(TenantParam param) {
-        PageParam<Tenant, TenantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        // 记录当前登录用户id、应用id
-        User user = getLoginUser();
-        if (user != null) {
-          param.setUserId(user.getUserId());
-        }
-        // 使用关联查询
-        return success(tenantService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部应用")
-    @GetMapping()
-    public ApiResult<List<Tenant>> list(TenantParam param) {
-        PageParam<Tenant, TenantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        // 记录当前登录用户id、应用id
-        User user = getLoginUser();
-        if (user != null) {
-          param.setUserId(user.getUserId());
-        }
-        // 使用关联查询
-        return success(tenantService.listRel(param));
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java
deleted file mode 100644
index 7479109..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenBcAgentController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.apps.entity.BcAgent;
-import com.gxwebsoft.apps.param.BcAgentParam;
-import com.gxwebsoft.apps.service.BcAgentService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 代报餐管理控制器
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-@Api(tags = "代报餐管理管理")
-@RestController
-@RequestMapping("/api/open/bc-agent")
-public class OpenBcAgentController extends BaseController {
-    @Resource
-    private BcAgentService bcAgentService;
-
-    @ApiOperation("分页查询代报餐管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcAgent>> page(BcAgentParam param) {
-      // 验证签名
-      isCheckSign();
-        // 使用关联查询
-      param.setParentId(getLoginUserId());
-      return success(bcAgentService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部代报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcAgent>> list(BcAgentParam param) {
-      // 验证签名
-      isCheckSign();
-        // 使用关联查询
-        param.setParentId(getLoginUserId());
-        return success(bcAgentService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询代报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcAgent> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(bcAgentService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加代报餐管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcAgent bcAgent) {
-        if (bcAgentService.save(bcAgent)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
-    @ApiOperation("修改代报餐管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcAgent bcAgent) {
-        if (bcAgentService.updateById(bcAgent)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
-    @ApiOperation("删除代报餐管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcAgentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:save')")
-    @ApiOperation("批量添加代报餐管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcAgent> list) {
-        if (bcAgentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:update')")
-    @ApiOperation("批量修改代报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcAgent> batchParam) {
-        if (batchParam.update(bcAgentService, "agent_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcAgent:remove')")
-    @ApiOperation("批量删除代报餐管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcAgentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java
deleted file mode 100644
index 07c9093..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenBcController.java
+++ /dev/null
@@ -1,481 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcEquipment;
-import com.gxwebsoft.apps.param.BcEquipmentParam;
-import com.gxwebsoft.apps.service.BcEquipmentService;
-import com.gxwebsoft.apps.utils.BcUtil;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.param.UserRefereeParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.UserRefereeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-import static com.gxwebsoft.shop.constants.OrderConstants.ORDER_GOODS_DELIVERY_STATUS20;
-
-/**
- * 云报餐机器接口
- *
- * @author 科技小王子
- * @since 2023-04-24 19:25:59
- */
-@Api(tags = "云报餐机器接口")
-@RestController
-@RequestMapping("/hxz/v1")
-public class OpenBcController extends BaseController {
-    @Resource
-    private BcUtil bcUtil;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private OrderGoodsService orderGoodsService;
-    @Resource
-    private UserRefereeService userRefereeService;
-    @Resource
-    private BcEquipmentService bcEquipmentService;
-
-    @ApiOperation("获取服务器时间接口")
-    @PostMapping("/ServerTime")
-    public HashMap<String, Object> ServerTime(HttpServletRequest request) {
-      final String deviceId = request.getHeader("Device-ID");     // 设备ID
-      final String now = DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss") + (DateUtil.thisDayOfWeek() - 1);   // 服务器时间
-      System.out.println(deviceId + "获取服务器时间接口 = " + now);
-      HashMap<String, Object> map = new HashMap<>();
-      map.put("Status",1);
-      map.put("Msg","服务器时间");
-      map.put("Time", now);
-      return map;
-    }
-
-    @ApiOperation("付款码（二维码）支付接口")
-    @PostMapping("/QRCodeTransaction")
-    public HashMap<String, Object> QRCodeTransaction(@RequestBody String QR, HttpServletRequest request) {
-      // 1.提取订单号ID
-      final String deviceId = request.getHeader("Device-ID");     // 设备ID
-      final JSONObject jsonObject = JSONObject.parseObject(QR);
-      final String orderNo = jsonObject.getString("QR");
-
-      System.out.println("deviceId = " + deviceId);
-      System.out.println("QR = " + QR);
-
-      // 2.查询订单数据
-
-      // 3.查询该餐段的菜品
-
-      // 4.核销菜品
-
-      // 5.通知设备
-      HashMap<String, Object> map = new HashMap<>();
-      map.put("Status",1);
-      map.put("Msg","支付成功");
-      map.put("Qrorder", orderNo);
-
-      return map;
-    }
-
-    @ApiOperation("二维码支付结果查询接口")
-    @PostMapping("/TransactionInquiry")
-    @Transactional(rollbackFor = {Exception.class})
-    public HashMap<String, Object> TransactionInquiry(@RequestBody String QROrder, HttpServletRequest request) {
-      // 1. 提取订单号
-      final JSONObject jsonObject = JSONObject.parseObject(QROrder);
-      final String orderNo = jsonObject.getString("QROrder");
-      StringBuilder foods = new StringBuilder(); // 消费机回显信息
-      String DeviceID = request.getHeader("Device-ID"); // 设备ID
-
-      final BcEquipmentParam bcEquipmentParam = new BcEquipmentParam();
-      bcEquipmentParam.setEquipmentCode(DeviceID);
-      final List<BcEquipment> bcEquipments = bcEquipmentService.listRel(bcEquipmentParam);
-      final BcEquipment bcEquipment = bcEquipments.get(0);
-      final Integer gear = bcEquipment.getGear(); // 设备所属档口
-      final Integer categoryId = bcUtil.getCurrentPeriod(bcEquipment.getTenantId()); // 餐段
-//      int categoryId = 26;
-      // 是否有取餐数据
-      boolean isSuccess = true;
-
-      // 打印测试
-      System.out.println("查询支付结果（订单号：）******** = " + orderNo);
-      System.out.println("bcEquipment = " + bcEquipment);
-      System.out.println("gear = " + gear);
-      System.out.println("StrUtil.isNumeric(orderNo) = " + StrUtil.isNumeric(orderNo));
-
-      // 2.非代取餐模式
-      if (!orderNo.startsWith("dqc:")) {
-        System.out.println("非代取餐模式 = ");
-        // 4.排除其他情况
-        if(!StrUtil.isNumeric(orderNo)){
-          foods.append("非取餐码");
-          isSuccess = false;
-        }else{
-          OrderParam orderParam = new OrderParam();
-          orderParam.setOrderNo(orderNo);
-          List<Order> list = orderService.listRel(orderParam);
-          Order order = list.get(0);
-//          System.out.println("order-one = " + order);
-          OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-          // 2.1查询订单商品
-          List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-            .eq(OrderGoods::getOrderId, order.getOrderId())
-            .eq(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_NO)
-            .eq(OrderGoods::getCategoryId,categoryId)
-            .eq(OrderGoods::getGear,gear)
-          );
-//          System.out.println("2.1查询订单商品 = " + orderGoods);
-          // 2.2查询用户信息
-          User user = userService.getById(order.getUserId());
-          // 2.收集菜品信息
-          foods.append("姓名:").append(order.getNickname()).append("\r\n");
-//          foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n");
-          for (OrderGoods item : orderGoods) {
-            // 过滤份数totalNum=0的菜品
-            if (!item.getTotalNum().equals(0)) {
-              foods.append(item.getGoodsName()).append(" ").append(item.getTotalNum()).append("份").append(" ￥").append(item.getTotalPrice()).append("\r\n");
-              OrderGoods food = new OrderGoods();
-              food.setOrderGoodsId(item.getOrderGoodsId());
-              food.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20);
-              orderGoodsService.updateById(food);
-              // 更新订单部分发布状态
-              final Order order1 = new Order();
-              order1.setOrderId(item.getOrderId());
-              if(categoryId == 27){
-                order1.setDeliveryStatus(DELIVERY_STATUS_YES);
-              }else{
-                order1.setDeliveryStatus(DELIVERY_STATUS_30);
-              }
-              orderService.updateById(order1);
-            }
-          }
-          if(orderGoods.size() == 0){
-            foods.append("没有取餐数据");
-            isSuccess = false;
-          }
-        }
-      }
-
-      // 3.代取餐模式
-      ArrayList<OrderGoods> saveOrderGoods = new ArrayList<>();
-      ArrayList<Order> saveOrder = new ArrayList<>();
-      if(orderNo.startsWith("dqc:")){
-        System.out.println("代取餐模式 = ");
-        final String dealerId = StrUtil.removePrefix(orderNo, "dqc:");
-        System.out.println("dealerId = " + dealerId);
-        UserRefereeParam userRefereeParam = new UserRefereeParam();
-        userRefereeParam.setDealerId(Integer.valueOf(dealerId));
-        userRefereeParam.setDeleted(0);
-        List<UserReferee> userRefereeList = userRefereeService.listRel(userRefereeParam);
-        // 查询帮代餐的成员ID集
-        List<Integer> userIds = userRefereeList.stream().map(UserReferee::getUserId).collect(Collectors.toList());
-        userIds.add(Integer.valueOf(dealerId));
-        System.out.println("userIds = " + userIds);
-        // 查询成员的订单
-        List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
-          .in(Order::getUserId, userIds)
-          .eq(Order::getDeliveryTime, DateUtil.parse(DateUtil.today()))
-          .eq(Order::getPayStatus, PAY_STATUS_SUCCESS)
-          .ne(Order::getDeliveryStatus, RECEIPT_STATUS_YES)
-          .eq(Order::getDeleted, 0)
-        );
-
-        if(list.size() > 0){
-          // 收集订单ID集
-          List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-          System.out.println("orderIds = " + orderIds);
-          // 查询商品
-          if(orderIds.size() > 0){
-            List<OrderGoods> orderGoodsList = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-              .in(OrderGoods::getOrderId, orderIds)
-              .ne(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_YES)
-              .gt(OrderGoods::getTotalNum,0)
-              .eq(OrderGoods::getCategoryId,categoryId)
-              .eq(OrderGoods::getGear,gear)
-            );
-            if (orderGoodsList.size() == 0) {
-              foods.append("没有取餐数据");
-              isSuccess = false;
-            }
-            System.out.println("orderGoodsList = " + orderGoodsList.size());
-            // 查询用户信息
-            User dealer = userService.getById(dealerId);
-            foods.append("代取:").append(dealer.getNickname()).append("\r\n");
-            foods.append("共" + orderGoodsList.size() + "份").append("\r\n");
-//          foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n");
-            // 批量核销操作
-            for (OrderGoods og : orderGoodsList) {
-              System.out.println("og = " + og);
-              foods.append(og.getGoodsName()).append("\r\n");
-              final OrderGoods orderGoods = new OrderGoods();
-              orderGoods.setOrderGoodsId(og.getOrderGoodsId());
-              orderGoods.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20);
-              saveOrderGoods.add(orderGoods);
-              // 更新订单部分发货状态
-              Order order2 = new Order();
-              order2.setOrderId(og.getOrderId());
-              if(categoryId == 27){
-                order2.setDeliveryStatus(DELIVERY_STATUS_YES);
-              }else{
-                order2.setDeliveryStatus(DELIVERY_STATUS_30);
-              }
-              saveOrder.add(order2);
-            }
-          }else{
-            foods.append("没有取餐数据");
-            isSuccess = false;
-          }
-        }else{
-          foods.append("没有取餐数据");
-          isSuccess = false;
-        }
-      }
-      // 4.更新状态
-      orderGoodsService.updateBatchById(saveOrderGoods);
-      orderService.updateBatchById(saveOrder);
-
-      // 5.通知设备
-      HashMap<String, Object> map = new HashMap<>();
-      map.put("Status", 1);
-      map.put("Msg","");
-      map.put("Name", "");
-      map.put("CardNo", "");
-      map.put("Money", "");
-      map.put("Subsidy", "");
-      map.put("Times", "");
-      map.put("Integral", "");
-      map.put("InTime", "");
-      map.put("OutTime", "");
-      map.put("CumulativeTime ", "");
-      map.put("Amount","0.00");
-      map.put("VoiceID",null);
-      map.put("Text", foods);
-
-      // 5.1无取餐数据
-      if(!isSuccess){
-        map.put("Status", 0);
-        map.put("Msg","没有取餐数据");
-        map.put("Text",null);
-        System.out.println("5.1无取餐数据 = " + map);
-        return map;
-      }
-      System.out.println("5.通知设备 = " + map);
-      return map;
-    }
-
-    @ApiOperation("终端查询日统计接口")
-    @PostMapping("/Counts")
-    public HashMap<String, Object> Counts(HttpServletRequest request) {
-
-      final String deviceId = request.getHeader("Device-ID");
-      System.out.println("deviceId = " + deviceId);
-      final Integer categoryId = bcUtil.getCurrentPeriod(10048);
-      System.out.println("categoryId = " + categoryId);
-
-      HashMap<String, Object> map = new HashMap<>();
-      map.put("Status",1);
-      map.put("Msg","终端查询日统计接口");
-      map.put("Text", "" +
-        "日统计\n" +
-        "日总金额：0.00\n" +
-        "日总次数：0\n" +
-        "时段统计\n" +
-        "一时段金额：0.00\n" +
-        "一时段次数：0" +
-        "");
-
-      // 发送消息测试
-      bcUtil.send("您的申请已通过");
-      return map;
-    }
-
-
-//  @ApiOperation("二维码支付结果查询接口")
-//  @PostMapping("/demo")
-//  @Transactional(rollbackFor = {Exception.class})
-//  public HashMap<String, Object> demo(@RequestBody String QROrder, HttpServletRequest request) {
-//    System.out.println("二维码支付结果查询接口 = " + QROrder);
-//    // 1. 提取订单号
-//    final JSONObject jsonObject = JSONObject.parseObject(QROrder);
-//    final String orderNo = jsonObject.getString("QROrder");
-//    StringBuilder foods = new StringBuilder(); // 消费机回显信息
-////    String DeviceID = request.getHeader("Device-ID"); // 设备ID
-////
-////    final BcEquipmentParam bcEquipmentParam = new BcEquipmentParam();
-////    bcEquipmentParam.setEquipmentCode(DeviceID);
-////    final List<BcEquipment> bcEquipments = bcEquipmentService.listRel(bcEquipmentParam);
-////    final BcEquipment bcEquipment = bcEquipments.get(0);
-//    final Integer gear = 20; // 设备所属档口
-////    final Integer categoryId = bcUtil.getCurrentPeriod(bcEquipment.getTenantId()); // 餐段
-//      int categoryId = 26;
-//
-//    // 打印测试
-//    System.out.println("查询支付结果（订单号：）******** = " + orderNo);
-//    System.out.println("gear = " + gear);
-//    System.out.println("StrUtil.isNumeric(orderNo) = " + StrUtil.isNumeric(orderNo));
-//
-//    // 2.非代取餐模式
-//    if (!orderNo.startsWith("dqc:")) {
-//      System.out.println("非代取餐模式 = ");
-//      // 4.排除其他情况
-//      if(!StrUtil.isNumeric(orderNo)){
-//        foods.append("非取餐码");
-//      }else{
-//        OrderParam orderParam = new OrderParam();
-//        orderParam.setOrderNo(orderNo);
-//        List<Order> list = orderService.listRel(orderParam);
-//        Order order = list.get(0);
-//        System.out.println("order-one = " + order);
-//        OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-//        // 2.1查询订单商品
-//        List<OrderGoods> orderGoods = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-//          .eq(OrderGoods::getOrderId, order.getOrderId())
-//          .eq(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_NO)
-//          .eq(OrderGoods::getCategoryId,categoryId)
-//          .eq(OrderGoods::getGear,gear)
-//        );
-//        // 2.2查询用户信息
-//        User user = userService.getById(order.getUserId());
-//        // 2.收集菜品信息
-//        foods.append("姓名:").append(order.getNickname()).append("\r\n");
-//        foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n");
-//        for (OrderGoods item : orderGoods) {
-//          // 过滤份数totalNum=0的菜品
-//          if (!item.getTotalNum().equals(0)) {
-//            foods.append(item.getGoodsName()).append(" ").append(item.getTotalNum()).append("份").append(" ￥").append(item.getTotalPrice()).append("\r\n");
-//            OrderGoods food = new OrderGoods();
-//            food.setOrderGoodsId(item.getOrderGoodsId());
-//            food.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20);
-//            orderGoodsService.updateById(food);
-//            // 更新订单部分发布状态
-//            final Order order1 = new Order();
-//            order1.setOrderId(item.getOrderId());
-//            if(categoryId == 27){
-//              order1.setDeliveryStatus(DELIVERY_STATUS_YES);
-//            }else{
-//              order1.setDeliveryStatus(DELIVERY_STATUS_30);
-//            }
-//            orderService.updateById(order1);
-//          }
-//        }
-//        if(orderGoods.size() == 0){
-//          foods.append("没有取餐数据");
-//        }
-//      }
-//    }
-//
-//    // 3.代取餐模式
-//    ArrayList<OrderGoods> saveOrderGoods = new ArrayList<>();
-//    ArrayList<Order> saveOrder = new ArrayList<>();
-//    if(orderNo.startsWith("dqc:")){
-//      System.out.println("代取餐模式 = ");
-//      final String dealerId = StrUtil.removePrefix(orderNo, "dqc:");
-//      System.out.println("dealerId = " + dealerId);
-//      UserRefereeParam userRefereeParam = new UserRefereeParam();
-//      userRefereeParam.setDealerId(Integer.valueOf(dealerId));
-//      userRefereeParam.setDeleted(0);
-//      List<UserReferee> userRefereeList = userRefereeService.listRel(userRefereeParam);
-//      // 查询帮代餐的成员ID集
-//      List<Integer> userIds = userRefereeList.stream().map(UserReferee::getUserId).collect(Collectors.toList());
-//      userIds.add(getLoginUserId());
-//      System.out.println("userIds = " + userIds);
-//      // 查询成员的订单
-//      List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
-//        .in(Order::getUserId, userIds)
-//        .eq(Order::getDeliveryTime, DateUtil.parse(DateUtil.today()))
-//        .eq(Order::getPayStatus, PAY_STATUS_SUCCESS)
-//        .ne(Order::getDeliveryStatus, RECEIPT_STATUS_YES)
-//        .eq(Order::getDeleted, 0)
-//      );
-//      if(list.size() > 0){
-//        // 收集订单ID集
-//        List<Integer> orderIds = list.stream().map(Order::getOrderId).collect(Collectors.toList());
-//        System.out.println("orderIds = " + orderIds);
-//        // 查询商品
-//        if(orderIds.size() > 0){
-//          List<OrderGoods> orderGoodsList = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>()
-//            .in(OrderGoods::getOrderId, orderIds)
-//            .ne(OrderGoods::getDeliveryStatus,RECEIPT_STATUS_YES)
-//            .gt(OrderGoods::getTotalNum,0)
-//            .eq(OrderGoods::getCategoryId,categoryId)
-//            .eq(OrderGoods::getGear,gear)
-//          );
-//          // 查询用户信息
-//          User dealer = userService.getById(dealerId);
-//          foods.append("代取:").append(dealer.getNickname()).append("\r\n");
-//          foods.append("共" + orderGoodsList.size() + "份");
-////          foods.append("签到:").append(DateUtil.format(DateUtil.date(),"MM-dd HH:mm")).append("\r\n");
-//          // 批量核销操作
-//          for (OrderGoods og : orderGoodsList) {
-//            foods.append(",").append(og.getGoodsName());
-//            final OrderGoods orderGoods = new OrderGoods();
-//            orderGoods.setOrderGoodsId(og.getOrderGoodsId());
-//            orderGoods.setDeliveryStatus(ORDER_GOODS_DELIVERY_STATUS20);
-//            saveOrderGoods.add(orderGoods);
-//            // 更新订单部分发货状态
-//            Order order2 = new Order();
-//            order2.setOrderId(og.getOrderId());
-//            if(categoryId == 27){
-//              order2.setDeliveryStatus(DELIVERY_STATUS_YES);
-//            }else{
-//              order2.setDeliveryStatus(DELIVERY_STATUS_30);
-//            }
-//            saveOrder.add(order2);
-//          }
-//        }else{
-//          foods.append("没有取餐数据");
-//        }
-//      }else{
-//        foods.append("没有取餐数据");
-//      }
-//    }
-//    // 4.更新状态
-//    orderGoodsService.updateBatchById(saveOrderGoods);
-//    orderService.updateBatchById(saveOrder);
-//
-//    // 5.通知设备
-//    HashMap<String, Object> map = new HashMap<>();
-//    map.put("Status", 1);
-//    map.put("Msg","");
-//    map.put("Name", "");
-//    map.put("CardNo", "");
-//    map.put("Money", "");
-//    map.put("Subsidy", "");
-//    map.put("Times", "");
-//    map.put("Integral", "");
-//    map.put("InTime", "");
-//    map.put("OutTime", "");
-//    map.put("CumulativeTime ", "");
-//    map.put("Amount","0.00");
-//    map.put("VoiceID",null);
-//    map.put("Text", foods);
-//
-//    // 5.通知设备
-//    System.out.println("通知设备 = " + map);
-//    return map;
-//  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java b/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java
deleted file mode 100644
index ee674cf..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenBcTemporaryController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.gxwebsoft.apps.entity.BcTemporary;
-import com.gxwebsoft.apps.param.BcTemporaryParam;
-import com.gxwebsoft.apps.service.BcTemporaryService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 临时报餐管理控制器
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-@Api(tags = "临时报餐管理管理")
-@RestController
-@RequestMapping("/api/open/bc-temporary")
-public class OpenBcTemporaryController extends BaseController {
-    @Resource
-    private BcTemporaryService bcTemporaryService;
-
-    @ApiOperation("分页查询临时报餐管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<BcTemporary>> page(BcTemporaryParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        param.setUserId(getLoginUserId());
-        param.setDayTime(DateUtil.date());
-      return success(bcTemporaryService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部临时报餐管理")
-    @GetMapping()
-    public ApiResult<List<BcTemporary>> list(BcTemporaryParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(bcTemporaryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:list')")
-    @ApiOperation("根据id查询临时报餐管理")
-    @GetMapping("/{id}")
-    public ApiResult<BcTemporary> get(@PathVariable("id") Integer id) {
-        return success(bcTemporaryService.getById(id));
-        // 使用关联查询
-        //return success(bcTemporaryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
-    @ApiOperation("添加临时报餐管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody BcTemporary bcTemporary) {
-        if (bcTemporaryService.save(bcTemporary)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
-    @ApiOperation("修改临时报餐管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody BcTemporary bcTemporary) {
-        if (bcTemporaryService.updateById(bcTemporary)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
-    @ApiOperation("删除临时报餐管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (bcTemporaryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:save')")
-    @ApiOperation("批量添加临时报餐管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<BcTemporary> list) {
-        if (bcTemporaryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:update')")
-    @ApiOperation("批量修改临时报餐管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<BcTemporary> batchParam) {
-        if (batchParam.update(bcTemporaryService, "temporary_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:bcTemporary:remove')")
-    @ApiOperation("批量删除临时报餐管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (bcTemporaryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java b/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java
deleted file mode 100644
index 6a5aba6..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenCartController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.CartParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.sql.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 购物车记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "购物车记录表管理")
-@RestController
-@RequestMapping("/api/open/cart")
-public class OpenCartController extends BaseController {
-    @Resource
-    private GoodsService goodsService;
-    @Resource
-    private CacheClient cacheClient;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private OrderGoodsService orderGoodsService;
-
-    @ApiOperation("添加购物车")
-    @PostMapping("/addCart")
-    public ApiResult<?> addCart(@RequestBody OrderGoods param) {
-      // 准备数据
-      Goods goods = goodsService.getById(param.getGoodsId());
-      param.setGoodsName(goods.getGoodsName());
-      param.setCategoryId(goods.getCategoryId());
-      param.setImageUrl(goods.getImage());
-      param.setGoodsNo(goods.getGoodsCode());
-      param.setGoodsPrice(param.getGoodsPrice());
-      param.setLinePrice(goods.getLinePriceMin());
-      param.setGoodsWeight(goods.getGoodsWeight());
-      param.setComments(goods.getSellingPoint());
-      param.setGear(goods.getGear());
-      param.setSortNumber(goods.getSortNumber());
-      // 保存到redis
-      String key = getKey();
-      cacheClient.hPut(key,param.getGoodsId().toString(), JSONUtil.toJSONString(param));
-      return success("添加成功",getCart());
-    }
-
-    @ApiOperation("查看购物车")
-    @GetMapping("/showCart")
-    public ApiResult<?> showCart() {
-      return success("获取成功",getCart());
-    }
-
-    @ApiOperation("从购物车创建订单")
-    @PostMapping("/createOrder")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> createOrder(@RequestBody CartParam param) {
-      Integer userId = 0;
-      if(param.getAgentUserId() != null){
-        userId = param.getAgentUserId();
-      }else{
-        userId = getLoginUserId();
-      }
-      // 1.从缓存读取用户的购物车数据
-      List<OrderGoods> orderGoods = getCart();
-      if(orderGoods == null){
-        throw new BusinessException("订单不存在");
-      }
-      // 2.创建订单
-      Order order = new Order();
-      order.setOrderNo(IdUtil.getSnowflakeNextId());
-      order.setTotalPrice(param.getTotalPrice());
-      order.setOrderPrice(param.getTotalPrice());
-      order.setPayPrice(param.getTotalPrice());
-      order.setDeliveryTime(Date.valueOf(param.getDeliveryTime()));
-      order.setExpirationTime(DateUtil.nextMonth());
-      order.setUserId(userId);
-      orderService.save(order);
-      orderGoods.forEach(d -> {
-        // 附加orderId
-        d.setOrderId(order.getOrderId());
-      });
-      // 3.批量添加订单商品
-      orderGoodsService.saveBatch(orderGoods);
-      // 4.清空购物车
-      cacheClient.delete(getKey());
-      return success("创建成功",order);
-    }
-
-    @ApiOperation("清空购物车")
-    @GetMapping("/clearCart")
-    public ApiResult<?> clearCart() {
-      cacheClient.delete(getKey());
-      return success("清空成功");
-    }
-
-    /**
-     * 获取key
-     * @return cache10048:cart651
-     */
-    private String getKey(){
-        // 验证签名
-        isCheckSign();
-        return "cart".concat(getLoginUserId().toString());
-    }
-
-    /**
-     * 获取购物车数据
-     * @return
-     */
-    private List<OrderGoods> getCart(){
-      String key = getKey();
-      // 获取购物车数据
-      List<Object> values = cacheClient.hValues(key);
-      return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), OrderGoods.class)).collect(Collectors.toList());
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java b/src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java
deleted file mode 100644
index a85bd04..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenCategoryController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Category;
-import com.gxwebsoft.shop.param.CategoryParam;
-import com.gxwebsoft.shop.service.CategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商品分类表控制器
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-@Api(tags = "商品分类表管理")
-@RestController
-@RequestMapping("/api/open/category")
-public class OpenCategoryController extends BaseController {
-    @Resource
-    private CategoryService categoryService;
-
-    @ApiOperation("分页查询商品分类表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Category>> page(CategoryParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(categoryService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部商品分类表")
-    @GetMapping()
-    public ApiResult<List<Category>> list(CategoryParam param) {
-      // 验证签名
-      isCheckSign();
-        // 使用关联查询
-        return success(categoryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:list')")
-    @ApiOperation("根据id查询商品分类表")
-    @GetMapping("/{id}")
-    public ApiResult<Category> get(@PathVariable("id") Integer id) {
-        return success(categoryService.getById(id));
-        // 使用关联查询
-        //return success(categoryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:save')")
-    @ApiOperation("添加商品分类表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Category category) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          category.setUserId(loginUser.getUserId());
-        }
-        if (categoryService.save(category)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:update')")
-    @ApiOperation("修改商品分类表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Category category) {
-        if (categoryService.updateById(category)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:remove')")
-    @ApiOperation("删除商品分类表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (categoryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:save')")
-    @ApiOperation("批量添加商品分类表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Category> list) {
-        if (categoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:update')")
-    @ApiOperation("批量修改商品分类表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Category> batchParam) {
-        if (batchParam.update(categoryService, "category_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:remove')")
-    @ApiOperation("批量删除商品分类表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (categoryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java b/src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java
deleted file mode 100644
index 61878ec..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenChatGptController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONObject;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Setting;
-import com.gxwebsoft.common.system.service.SettingService;
-import com.gxwebsoft.oa.entity.Notice;
-import com.gxwebsoft.oa.param.NoticeParam;
-import com.gxwebsoft.oa.service.NoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.gxwebsoft.oa.constants.NoticeConstants.CHAT_GPT;
-
-/**
- * ChatGPT控制器
- *
- * @author WebSoft
- * @since 2018-12-24 16:10:24
- */
-@Api(tags = "ChatGPT")
-@RestController
-@RequestMapping("/api/open/chat")
-public class OpenChatGptController extends BaseController {
-    @Resource
-    private NoticeService noticeService;
-    @Resource
-    private SettingService settingService;
-
-    @ApiOperation("向chatGPT提问")
-    @PostMapping("/send")
-    public ApiResult<?> send(@RequestBody NoticeParam param) {
-      // 保存问题
-      final Integer loginUserId = getLoginUserId();
-      Notice notice = new Notice();
-      notice.setType(CHAT_GPT);
-      notice.setUserId(loginUserId);
-      notice.setChannel(0);
-      notice.setContent(param.getContent());
-      noticeService.save(notice);
-      // 保存回答
-      Notice answer = new Notice();
-      answer.setUserId(loginUserId);
-      answer.setType(CHAT_GPT);
-      answer.setChannel(1);
-      answer.setContent("|");
-      noticeService.save(answer);
-      // 查询消息并返回
-      param.setUserId(loginUserId);
-      return success(answer.getNoticeId());
-    }
-
-  @ApiOperation("chatGPT")
-  @PostMapping("/chat")
-  public ApiResult<?> chat(@RequestBody NoticeParam param) {
-    String endpoint = "https://api.openai.com/v1/chat/completions";
-    final Setting setting = settingService.getData("chatGPT");
-    final String content1 = setting.getContent();
-    final JSONObject jsonObject1 = JSONObject.parseObject(content1);
-    final String chatKey = jsonObject1.getString("chatKey");
-    String apiKey = "Bearer ".concat(chatKey);
-    System.out.println("apiKey = " + apiKey);
-    if(StrUtil.isEmpty(apiKey)){
-      return fail("请配置有效的KEY！");
-    }
-    Map<String, Object> paramMap = new HashMap<>();
-    paramMap.put("model", "gpt-3.5-turbo");
-    List<Map<String, String>> dataList = new ArrayList<>();
-    dataList.add(new HashMap<String, String>(){{
-      put("role", "user");
-      put("content", param.getContent());
-    }});
-    paramMap.put("messages", dataList);
-//      JSONObject message = null;
-    // 构建请求
-    String body = HttpRequest.post(endpoint)
-      .header("Authorization", apiKey)
-      .header("Content-Type", "application/json")
-      .body(JSONUtil.toJSONString(paramMap)).execute().body();
-    JSONObject jsonObject = JSONObject.parseObject(body);
-    // 内容解析(代币)
-    String usage = jsonObject.getString("usage");
-    JSONObject jsonUsage = JSONObject.parseObject(usage);
-    String total_tokens = jsonUsage.getString("total_tokens");
-    // 内容解析(消息内容)
-    JSONObject choices = jsonObject.getJSONArray("choices").getJSONObject(0);
-    String message = choices.getString("message");
-    JSONObject jsonMessage = JSONObject.parseObject(message);
-    String content = jsonMessage.getString("content");
-
-    // 保存回答
-    Notice notice = noticeService.getById(param.getNoticeId());
-    notice.setTokens(new Long(total_tokens));
-    notice.setContent(content);
-    noticeService.updateById(notice);
-    return success(content);
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenDictController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictController.java
deleted file mode 100644
index a363fb3..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenDictController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.Dict;
-import com.gxwebsoft.common.system.param.DictParam;
-import com.gxwebsoft.common.system.service.DictService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 字典控制器
- *
- * @author WebSoft
- * @since 2020-03-14 11:29:03
- */
-@Api(tags = "字典管理(业务类)")
-@RestController
-@RequestMapping("/api/open/system/dict")
-public class OpenDictController extends BaseController {
-    @Resource
-    private DictService dictService;
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("分页查询字典")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Dict>> page(DictParam param) {
-        PageParam<Dict, DictParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number");
-        return success(dictService.page(page, page.getWrapper()));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("查询全部字典")
-    @GetMapping()
-    public ApiResult<List<Dict>> list(DictParam param) {
-        PageParam<Dict, DictParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number");
-        return success(dictService.list(page.getOrderWrapper()));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("根据id查询字典")
-    @GetMapping("/{id}")
-    public ApiResult<Dict> get(@PathVariable("id") Integer id) {
-        return success(dictService.getById(id));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:save')")
-    @ApiOperation("添加字典")
-    @PostMapping()
-    public ApiResult<?> add(@RequestBody Dict dict) {
-        if (dictService.count(new LambdaQueryWrapper<Dict>()
-                .eq(Dict::getDictCode, dict.getDictCode())) > 0) {
-            return fail("字典标识已存在");
-        }
-        if (dictService.count(new LambdaQueryWrapper<Dict>()
-                .eq(Dict::getDictName, dict.getDictName())) > 0) {
-            return fail("字典名称已存在");
-        }
-        if (dictService.save(dict)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:update')")
-    @ApiOperation("修改字典")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Dict dict) {
-        if (dictService.count(new LambdaQueryWrapper<Dict>()
-                .eq(Dict::getDictCode, dict.getDictCode())
-                .ne(Dict::getDictId, dict.getDictId())) > 0) {
-            return fail("字典标识已存在");
-        }
-        if (dictService.count(new LambdaQueryWrapper<Dict>()
-                .eq(Dict::getDictName, dict.getDictName())
-                .ne(Dict::getDictId, dict.getDictId())) > 0) {
-            return fail("字典名称已存在");
-        }
-        if (dictService.updateById(dict)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:remove')")
-    @ApiOperation("删除字典")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (dictService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:save')")
-    @ApiOperation("批量添加字典")
-    @PostMapping("/batch")
-    public ApiResult<List<String>> saveBatch(@RequestBody List<Dict> list) {
-        if (CommonUtil.checkRepeat(list, Dict::getDictCode)) {
-            return fail("字典标识不能重复", null);
-        }
-        if (CommonUtil.checkRepeat(list, Dict::getDictName)) {
-            return fail("字典名称不能重复", null);
-        }
-        List<Dict> codeExists = dictService.list(new LambdaQueryWrapper<Dict>()
-                .in(Dict::getDictCode, list.stream().map(Dict::getDictCode)
-                        .collect(Collectors.toList())));
-        if (codeExists.size() > 0) {
-            return fail("字典标识已存在", codeExists.stream().map(Dict::getDictCode)
-                    .collect(Collectors.toList())).setCode(2);
-        }
-        List<Dict> nameExists = dictService.list(new LambdaQueryWrapper<Dict>()
-                .in(Dict::getDictName, list.stream().map(Dict::getDictCode)
-                        .collect(Collectors.toList())));
-        if (nameExists.size() > 0) {
-            return fail("字典名称已存在", nameExists.stream().map(Dict::getDictName)
-                    .collect(Collectors.toList())).setCode(3);
-        }
-        if (dictService.saveBatch(list)) {
-            return success("添加成功", null);
-        }
-        return fail("添加失败", null);
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:remove')")
-    @ApiOperation("批量删除字典")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (dictService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java
deleted file mode 100644
index 071ec61..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenDictDataController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.DictData;
-import com.gxwebsoft.common.system.param.DictDataParam;
-import com.gxwebsoft.common.system.service.DictDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 字典数据控制器
- *
- * @author WebSoft
- * @since 2020-03-14 11:29:04
- */
-@Api(tags = "字典数据管理(业务类)")
-@RestController
-@RequestMapping("/api/open/system/dict-data")
-public class OpenDictDataController extends BaseController {
-    @Resource
-    private DictDataService dictDataService;
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("分页查询字典数据")
-    @GetMapping("/page")
-    public ApiResult<PageResult<DictData>> page(DictDataParam param) {
-        return success(dictDataService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("查询全部字典数据")
-    @GetMapping()
-    public ApiResult<List<DictData>> list(DictDataParam param) {
-        return success(dictDataService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("根据id查询字典数据")
-    @GetMapping("/{id}")
-    public ApiResult<DictData> get(@PathVariable("id") Integer id) {
-        return success(dictDataService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:save')")
-    @ApiOperation("添加字典数据")
-    @PostMapping()
-    public ApiResult<?> add(@RequestBody DictData dictData) {
-        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictId, dictData.getDictId())
-                .eq(DictData::getDictDataName, dictData.getDictDataName())) > 0) {
-            return fail("字典数据名称已存在");
-        }
-        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictId, dictData.getDictId())
-                .eq(DictData::getDictDataCode, dictData.getDictDataCode())) > 0) {
-            return fail("字典数据标识已存在");
-        }
-        if (dictDataService.save(dictData)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:update')")
-    @ApiOperation("修改字典数据")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody DictData dictData) {
-        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictId, dictData.getDictId())
-                .eq(DictData::getDictDataName, dictData.getDictDataName())
-                .ne(DictData::getDictDataId, dictData.getDictDataId())) > 0) {
-            return fail("字典数据名称已存在");
-        }
-        if (dictDataService.count(new LambdaQueryWrapper<DictData>()
-                .eq(DictData::getDictId, dictData.getDictId())
-                .eq(DictData::getDictDataCode, dictData.getDictDataCode())
-                .ne(DictData::getDictDataId, dictData.getDictDataId())) > 0) {
-            return fail("字典数据标识已存在");
-        }
-        if (dictDataService.updateById(dictData)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:remove')")
-    @ApiOperation("删除字典数据")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (dictDataService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:save')")
-    @ApiOperation("批量添加字典数据")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<DictData> dictDataList) {
-        if (dictDataService.saveBatch(dictDataList)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:remove')")
-    @ApiOperation("批量删除字典数据")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (dictDataService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java
deleted file mode 100644
index 57ce286..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.Dictionary;
-import com.gxwebsoft.common.system.param.DictionaryParam;
-import com.gxwebsoft.common.system.service.DictionaryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 字典控制器
- *
- * @author WebSoft
- * @since 2020-03-14 11:29:03
- */
-@Api(tags = "字典管理(系统类)")
-@RestController
-@RequestMapping("/api/open/system/dictionary")
-public class OpenDictionaryController extends BaseController {
-    @Resource
-    private DictionaryService dictionaryService;
-
-    @PreAuthorize("hasAuthority('sys:dictionary:list')")
-    @ApiOperation("分页查询字典")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Dictionary>> page(DictionaryParam param) {
-        PageParam<Dictionary, DictionaryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number");
-        return success(dictionaryService.page(page, page.getWrapper()));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:list')")
-    @ApiOperation("查询全部字典")
-    @GetMapping()
-    public ApiResult<List<Dictionary>> list(DictionaryParam param) {
-        PageParam<Dictionary, DictionaryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number");
-        return success(dictionaryService.list(page.getOrderWrapper()));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:list')")
-    @ApiOperation("根据id查询字典")
-    @GetMapping("/{id}")
-    public ApiResult<Dictionary> get(@PathVariable("id") Integer id) {
-        return success(dictionaryService.getById(id));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:save')")
-    @ApiOperation("添加字典")
-    @PostMapping()
-    public ApiResult<?> add(@RequestBody Dictionary dictionary) {
-        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
-                .eq(Dictionary::getDictCode, dictionary.getDictCode())) > 0) {
-            return fail("字典标识已存在");
-        }
-        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
-                .eq(Dictionary::getDictName, dictionary.getDictName())) > 0) {
-            return fail("字典名称已存在");
-        }
-        if (dictionaryService.save(dictionary)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:update')")
-    @ApiOperation("修改字典")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Dictionary dictionary) {
-        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
-                .eq(Dictionary::getDictCode, dictionary.getDictCode())
-                .ne(Dictionary::getDictId, dictionary.getDictId())) > 0) {
-            return fail("字典标识已存在");
-        }
-        if (dictionaryService.count(new LambdaQueryWrapper<Dictionary>()
-                .eq(Dictionary::getDictName, dictionary.getDictName())
-                .ne(Dictionary::getDictId, dictionary.getDictId())) > 0) {
-            return fail("字典名称已存在");
-        }
-        if (dictionaryService.updateById(dictionary)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
-    @ApiOperation("删除字典")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (dictionaryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:save')")
-    @ApiOperation("批量添加字典")
-    @PostMapping("/batch")
-    public ApiResult<List<String>> saveBatch(@RequestBody List<Dictionary> list) {
-        if (CommonUtil.checkRepeat(list, Dictionary::getDictCode)) {
-            return fail("字典标识不能重复", null);
-        }
-        if (CommonUtil.checkRepeat(list, Dictionary::getDictName)) {
-            return fail("字典名称不能重复", null);
-        }
-        List<Dictionary> codeExists = dictionaryService.list(new LambdaQueryWrapper<Dictionary>()
-                .in(Dictionary::getDictCode, list.stream().map(Dictionary::getDictCode)
-                        .collect(Collectors.toList())));
-        if (codeExists.size() > 0) {
-            return fail("字典标识已存在", codeExists.stream().map(Dictionary::getDictCode)
-                    .collect(Collectors.toList())).setCode(2);
-        }
-        List<Dictionary> nameExists = dictionaryService.list(new LambdaQueryWrapper<Dictionary>()
-                .in(Dictionary::getDictName, list.stream().map(Dictionary::getDictCode)
-                        .collect(Collectors.toList())));
-        if (nameExists.size() > 0) {
-            return fail("字典名称已存在", nameExists.stream().map(Dictionary::getDictName)
-                    .collect(Collectors.toList())).setCode(3);
-        }
-        if (dictionaryService.saveBatch(list)) {
-            return success("添加成功", null);
-        }
-        return fail("添加失败", null);
-    }
-
-    @PreAuthorize("hasAuthority('sys:dictionary:remove')")
-    @ApiOperation("批量删除字典")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (dictionaryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java
deleted file mode 100644
index 6fc91d6..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenDictionaryDataController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.DictionaryData;
-import com.gxwebsoft.common.system.param.DictionaryDataParam;
-import com.gxwebsoft.common.system.service.DictionaryDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 字典数据控制器
- *
- * @author WebSoft
- * @since 2020-03-14 11:29:04
- */
-@Api(tags = "字典数据管理(系统类)")
-@RestController
-@RequestMapping("/api/open/system/dictionary-data")
-public class OpenDictionaryDataController extends BaseController {
-    @Resource
-    private DictionaryDataService dictionaryDataService;
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("分页查询字典数据")
-    @GetMapping("/page")
-    public ApiResult<PageResult<DictionaryData>> page(DictionaryDataParam param) {
-        return success(dictionaryDataService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("查询全部字典数据")
-    @GetMapping()
-    public ApiResult<List<DictionaryData>> list(DictionaryDataParam param) {
-        return success(dictionaryDataService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:list')")
-    @ApiOperation("根据id查询字典数据")
-    @GetMapping("/{id}")
-    public ApiResult<DictionaryData> get(@PathVariable("id") Integer id) {
-        return success(dictionaryDataService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:save')")
-    @ApiOperation("添加字典数据")
-    @PostMapping()
-    public ApiResult<?> add(@RequestBody DictionaryData dictionaryData) {
-        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
-                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
-                .eq(DictionaryData::getDictDataName, dictionaryData.getDictDataName())) > 0) {
-            return fail("字典数据名称已存在");
-        }
-        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
-                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
-                .eq(DictionaryData::getDictDataCode, dictionaryData.getDictDataCode())) > 0) {
-            return fail("字典数据标识已存在");
-        }
-        if (dictionaryDataService.save(dictionaryData)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:update')")
-    @ApiOperation("修改字典数据")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody DictionaryData dictionaryData) {
-        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
-                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
-                .eq(DictionaryData::getDictDataName, dictionaryData.getDictDataName())
-                .ne(DictionaryData::getDictDataId, dictionaryData.getDictDataId())) > 0) {
-            return fail("字典数据名称已存在");
-        }
-        if (dictionaryDataService.count(new LambdaQueryWrapper<DictionaryData>()
-                .eq(DictionaryData::getDictId, dictionaryData.getDictId())
-                .eq(DictionaryData::getDictDataCode, dictionaryData.getDictDataCode())
-                .ne(DictionaryData::getDictDataId, dictionaryData.getDictDataId())) > 0) {
-            return fail("字典数据标识已存在");
-        }
-        if (dictionaryDataService.updateById(dictionaryData)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:remove')")
-    @ApiOperation("删除字典数据")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (dictionaryDataService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:save')")
-    @ApiOperation("批量添加字典数据")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<DictionaryData> dictDataList) {
-        if (dictionaryDataService.saveBatch(dictDataList)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('sys:dict:remove')")
-    @ApiOperation("批量删除字典数据")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (dictionaryDataService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java b/src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java
deleted file mode 100644
index cd8a0fb..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenDocsController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.cms.entity.Docs;
-import com.gxwebsoft.cms.param.DocsParam;
-import com.gxwebsoft.cms.service.DocsService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 文档管理记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-16 11:40:27
- */
-@Api(tags = "文档管理记录表管理")
-@RestController
-@RequestMapping("/api/open/docs")
-public class OpenDocsController extends BaseController {
-    @Resource
-    private DocsService docsService;
-
-    @ApiOperation("分页查询文档管理记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Docs>> page(DocsParam param) {
-        PageParam<Docs, DocsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc,create_time asc");
-        return success(docsService.page(page, page.getWrapper()));
-        // 使用关联查询
-//        return success(docsService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部文档管理记录表")
-    @GetMapping()
-    public ApiResult<List<Docs>> list(DocsParam param) {
-        // 使用关联查询
-        return success(docsService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询文档管理记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Docs> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(docsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('cms:docs:save')")
-    @ApiOperation("添加文档管理记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Docs docs) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          docs.setUserId(loginUser.getUserId());
-        }
-        if (docsService.save(docs)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('cms:docs:update')")
-    @ApiOperation("修改文档管理记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Docs docs) {
-        if (docsService.updateById(docs)) {
-            return success("保存成功");
-        }
-        return fail("保存失败");
-    }
-
-    @PreAuthorize("hasAuthority('cms:docs:remove')")
-    @ApiOperation("删除文档管理记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        if (docsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('cms:docs:save')")
-    @ApiOperation("批量添加文档管理记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Docs> list) {
-        // 验证签名
-        isCheckSign();
-        if (docsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('cms:docs:update')")
-    @ApiOperation("批量修改文档管理记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Docs> batchParam) {
-        // 验证签名
-        isCheckSign();
-        if (batchParam.update(docsService, "docs_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('cms:docs:remove')")
-    @ApiOperation("批量删除文档管理记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        // 验证签名
-        isCheckSign();
-        if (docsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
deleted file mode 100644
index 929f0fb..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.AlipayOpenAppQrcodeCreateModel;
-import com.alipay.api.request.AlipayOpenAppQrcodeCreateRequest;
-import com.alipay.api.response.AlipayOpenAppQrcodeCreateResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.entity.EquipmentRecord;
-import com.gxwebsoft.apps.param.EquipmentParam;
-import com.gxwebsoft.apps.service.EquipmentRecordService;
-import com.gxwebsoft.apps.service.EquipmentService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.AlipayConfigUtil;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderRefund;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderRefundService;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-
-import static com.gxwebsoft.apps.constants.EquipmentConstants.*;
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-
-/**
- * 设备管理控制器
- *
- * @author 科技小王子
- * @since 2022-11-30 02:11:16
- */
-@Api(tags = "设备管理管理")
-@RestController
-@RequestMapping("/api/open/equipment")
-public class OpenEquipmentController extends BaseController {
-    @Resource
-    private EquipmentService equipmentService;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private AlipayConfigUtil alipayConfig;
-    @Resource
-    private EquipmentRecordService equipmentRecordService;
-    @Resource
-    private OrderRefundService orderRefundService;
-
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @ApiOperation("分页查询设备管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Equipment>> page(EquipmentParam param) {
-        // 使用关联查询
-        PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
-        return success(equipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @ApiOperation("查询全部设备管理")
-    @GetMapping()
-    public ApiResult<List<Equipment>> list(EquipmentParam param) {
-        PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(equipmentService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(equipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @ApiOperation("根据id查询设备管理")
-    @GetMapping("/{id}")
-    public ApiResult<Equipment> get(@PathVariable("id") Integer id) {
-//        return success(equipmentService.getById(id));
-        // 使用关联查询
-        return success(equipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:save')")
-    @ApiOperation("添加设备管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Equipment equipment) throws AlipayApiException {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null && getMerchantCode() != null) {
-          equipment.setMerchantCode(getMerchantCode());
-        }
-        if (equipmentService.count(new LambdaQueryWrapper<Equipment>()
-          .eq(Equipment::getEquipmentCode, equipment.getEquipmentCode())) > 0) {
-          return fail("设备编号已存在");
-        }
-        if (equipmentService.save(equipment)) {
-          // 生成二维码
-          String qrcode = createQrcode(equipment);
-          equipment.setQrcode(qrcode);
-          equipmentService.saveOrUpdate(equipment);
-          return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @ApiOperation("修改设备管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Equipment equipment) throws AlipayApiException {
-        if (equipmentService.updateById(equipment)) {
-          // 生成二维码
-          String qrcode = createQrcode(equipment);
-          equipment.setQrcode(qrcode);
-          equipmentService.saveOrUpdate(equipment);
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:remove')")
-    @ApiOperation("删除设备管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (equipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:save')")
-    @ApiOperation("批量添加设备管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Equipment> list) {
-        if (equipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:update')")
-    @ApiOperation("批量修改设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Equipment> batchParam) {
-        if (batchParam.update(equipmentService, "equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('apps:equipment:remove')")
-    @ApiOperation("批量删除设备管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (equipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    // 生成支付宝小程序码
-    private String createQrcode(Equipment equipment) throws AlipayApiException{
-      // 实例化客户端
-      DefaultAlipayClient alipayClient = alipayConfig.alipayClient(getTenantId());
-
-      AlipayOpenAppQrcodeCreateRequest request = new AlipayOpenAppQrcodeCreateRequest();
-      AlipayOpenAppQrcodeCreateModel model = new AlipayOpenAppQrcodeCreateModel();
-      model.setUrlParam("pages/checkout/checkout");
-      model.setQueryParam("equipmentId=".concat(equipment.getEquipmentId().toString()).concat("&equipmentCode=").concat(equipment.getEquipmentCode()));
-      model.setDescribe("扫码租赁电池");
-      request.setBizModel(model);
-      AlipayOpenAppQrcodeCreateResponse response = alipayClient.certificateExecute(request);
-      System.out.println(response.getBody());
-      if (response.isSuccess()) {
-        System.out.println("调用成功");
-        final JSONObject jsonObject = JSONObject.parseObject(response.getBody());
-        final String alipay_open_app_qrcode_create_response = jsonObject.getString("alipay_open_app_qrcode_create_response");
-        final JSONObject jsonObject1 = JSONObject.parseObject(alipay_open_app_qrcode_create_response);
-        return jsonObject1.getString("qr_code_url");
-      } else {
-        System.out.println("调用失败");
-        return null;
-      }
-    }
-
-    @ApiOperation("绑定设备")
-    @PostMapping("/bind")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> bindEquipment(@RequestBody Equipment equipment) {
-      // 验证签名
-      isCheckSign();
-      final Integer orderId = equipment.getOrderId();
-      final String equipmentCode = equipment.getEquipmentCode();
-      final Order order = orderService.getById(orderId);
-      Equipment one = equipmentService.getByEquipmentCode(equipmentCode);
-      if(one == null){
-        return fail("设备不存在");
-      }
-      if(!one.getUserId().equals(0)){
-        return fail("该设备已被绑定");
-      }
-      // 绑定设备
-      Equipment saveData = new Equipment();
-      saveData.setEquipmentId(one.getEquipmentId());
-      saveData.setUserId(getLoginUserId());
-      saveData.setOrderId(orderId);
-      if (equipmentService.updateById(saveData)) {
-        // 记录明细
-        EquipmentRecord record = new EquipmentRecord();
-        record.setEquipmentCode(one.getEquipmentCode());
-        record.setUserId(getLoginUserId());
-        record.setOrderId(orderId);
-        record.setEventType(EVENT_TYPE_BIND);
-        record.setComments("使用电池：");
-        record.setMerchantCode(one.getMerchantCode());
-        equipmentRecordService.save(record);
-        // 订单发货
-        order.setDeliveryStatus(DELIVERY_STATUS_YES);
-        order.setOrderStatus(ORDER_STATUS_COMPLETED);
-        order.setReceiptStatus(RECEIPT_STATUS_YES);
-        order.setExpirationTime(DateUtil.nextMonth());
-        order.setEquipmentId(one.getEquipmentId());
-        orderService.updateById(order);
-        return success("绑定成功");
-      }
-      return fail("绑定失败");
-    }
-
-    @ApiOperation("更换设备")
-    @PostMapping("/change")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> changeEquipment(@RequestBody Equipment equipment) {
-      // 验证签名
-      isCheckSign();
-      String equipmentCode = equipment.getEquipmentCode();
-      Integer oid = equipment.getEquipmentId();
-      Integer orderId = equipment.getOrderId();
-      System.out.println("oid = " + oid);
-      Integer loginUserId = getLoginUserId();
-      // 新电池
-      Equipment one = equipmentService.getByEquipmentCode(equipmentCode);
-      // 旧电池
-      Equipment old = equipmentService.getById(oid);
-      // 订单信息
-      Order order = orderService.getById(orderId);
-      if(one == null){
-        return fail("设备不存在");
-      }
-      if(!one.getUserId().equals(0)){
-        return fail("该设备已被绑定");
-      }
-
-      // 绑定新电池
-      Equipment saveData = new Equipment();
-      saveData.setEquipmentId(one.getEquipmentId());
-      saveData.setUserId(loginUserId);
-      saveData.setOrderId(orderId);
-      boolean b = equipmentService.updateById(saveData);
-      // 记录新电池明细
-      EquipmentRecord record = new EquipmentRecord();
-      record.setEquipmentCode(equipmentCode);
-      record.setEventType(EVENT_TYPE_BIND);
-      record.setUserId(loginUserId);
-      record.setOrderId(orderId);
-      record.setMerchantCode(one.getMerchantCode());
-      equipmentRecordService.save(record);
-
-      if (b) {
-        // 解绑旧电池
-        old.setUserId(0);
-        old.setMerchantCode(one.getMerchantCode());
-        equipmentService.updateById(old);
-        // 记录明细
-        EquipmentRecord record2 = new EquipmentRecord();
-        record2.setEquipmentCode(old.getEquipmentCode());
-        record2.setUserId(loginUserId);
-        record2.setOrderId(orderId);
-        record2.setEventType(EVENT_TYPE_UNBIND);
-        record2.setMerchantCode(one.getMerchantCode());
-        equipmentRecordService.save(record2);
-        // 更新订单
-        order.setEquipmentId(one.getEquipmentId());
-        orderService.updateById(order);
-        return success("换电成功");
-      }
-      return fail("换电失败");
-    }
-
-    @ApiOperation("重置")
-    @PostMapping("/receipt")
-    public ApiResult<?> receipt(@RequestBody Order order){
-      // 验证签名
-      isCheckSign();
-      orderService.updateById(order);
-      return success("重置成功");
-    }
-
-    @ApiModelProperty("退租")
-    @PostMapping("/rentingOut")
-    public ApiResult<?> rentingOut(@RequestBody Order order){
-      // 验证签名
-      isCheckSign();
-      final int count = orderRefundService.count(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getOrderId, order.getOrderId()));
-      if(count > 0){
-        return fail("申请成功，请等待客服人员审核");
-      }
-      final OrderRefund refund = new OrderRefund();
-      refund.setOrderId(order.getOrderId());
-      refund.setOrderGoodsId(order.getGoodsId());
-      refund.setUserId(getLoginUserId());
-      refund.setType(10);
-      refund.setApplyDesc("申请退租");
-      refund.setRefundMoney(new BigDecimal(0));
-      refund.setMerchantCode(order.getMerchantCode());
-      if (orderRefundService.save(refund)) {
-        return success("申请成功，请等待客服人员审核");
-      }
-      return fail("退租失败");
-    }
-
-//    @ApiModelProperty("退租")
-//    @PostMapping("/rentingOut")
-//    public ApiResult<?> rentingOut(@RequestBody Order order){
-//      // 验证签名
-//      isCheckSign();
-//      order.setReceiptStatus(RECEIPT_STATUS_RETURN);
-//      if(orderService.updateById(order)){
-//        final Equipment equipment = equipmentService.getById(order.getEquipmentId());
-//        equipment.setUserId(0);
-//        equipmentService.updateById(equipment);
-//        return success("操作成功，请等待客服人员审核");
-//      }
-//      return fail("退租失败");
-//    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java b/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java
deleted file mode 100644
index 89395f7..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenFileController.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.utils.FileServerUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.FileRecord;
-import com.gxwebsoft.common.system.param.FileRecordParam;
-import com.gxwebsoft.common.system.service.FileRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 文件上传下载控制器
- *
- * @author WebSoft
- * @since 2018-12-24 16:10:24
- */
-@Api(tags = "文件上传下载")
-@RestController
-@RequestMapping("/api/open/file")
-public class OpenFileController extends BaseController {
-    @Resource
-    private ConfigProperties config;
-    @Resource
-    private FileRecordService fileRecordService;
-
-    @ApiOperation("上传文件")
-    @PostMapping("/upload")
-    public ApiResult<FileRecord> upload(@RequestParam MultipartFile file, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        FileRecord result = null;
-        try {
-            String dir = getUploadDir();
-            File upload = FileServerUtil.upload(file, dir, config.getUploadUuidName());
-            String path = upload.getAbsolutePath().replace("\\", "/").substring(dir.length() - 1);
-            String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/upload");
-            String originalName = file.getOriginalFilename();
-            result = new FileRecord();
-            result.setCreateUserId(getLoginUserId());
-            result.setName(StrUtil.isBlank(originalName) ? upload.getName() : originalName);
-            result.setLength(upload.length());
-            result.setPath(path);
-            result.setUrl(requestURL + path);
-            String contentType = FileServerUtil.getContentType(upload);
-            result.setContentType(contentType);
-            if (FileServerUtil.isImage(contentType)) {
-                result.setThumbnail(requestURL + "/thumbnail/" + path);
-            }
-            result.setDownloadUrl(requestURL + "/download/" + path);
-            result.setMerchantCode(getMerchantCode());
-            fileRecordService.save(result);
-            return success(result);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return fail("上传失败", result).setError(e.toString());
-        }
-    }
-
-    @ApiOperation("上传base64文件")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "base64", value = "base64", required = true, dataType = "string", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "fileName", value = "文件名称", dataType = "string", dataTypeClass = String.class)
-    })
-    @PostMapping("/upload/base64")
-    public ApiResult<FileRecord> uploadBase64(String base64, String fileName, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        FileRecord result = null;
-        try {
-            String dir = getUploadDir();
-            File upload = FileServerUtil.upload(base64, fileName, getUploadDir());
-            String path = upload.getAbsolutePath().substring(dir.length()).replace("\\", "/");
-            String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/upload/base64");
-            result = new FileRecord();
-            result.setCreateUserId(getLoginUserId());
-            result.setName(StrUtil.isBlank(fileName) ? upload.getName() : fileName);
-            result.setLength(upload.length());
-            result.setPath(path);
-            result.setUrl(requestURL + path);
-            result.setThumbnail(FileServerUtil.isImage(upload) ? (requestURL + "/thumbnail" + path) : null);
-            result.setMerchantCode(getMerchantCode());
-            fileRecordService.save(result);
-            return success(result);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return fail("上传失败", result).setError(e.toString());
-        }
-    }
-
-    @ApiOperation("根据id查询文件")
-    @GetMapping("/{id}")
-    public ApiResult<FileRecord> get(@PathVariable("id") Integer id) {
-      // 验证签名
-      isCheckSign();
-      return success(fileRecordService.getByIdRel(id));
-    }
-
-    @ApiOperation("查看原文件")
-    @GetMapping("/{dir}/{name:.+}")
-    public void preview(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                        HttpServletResponse response, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        File file = new File(getUploadDir(), dir + "/" + name);
-        FileServerUtil.preview(file, getPdfOutDir(), config.getOpenOfficeHome(), response, request);
-    }
-
-    @ApiOperation("下载原文件")
-    @GetMapping("/download/{dir}/{name:.+}")
-    public void download(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                         HttpServletResponse response, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        String path = dir + "/" + name;
-        FileRecord record = fileRecordService.getByIdPath(path);
-        File file = new File(getUploadDir(), path);
-        String fileName = record == null ? file.getName() : record.getName();
-        FileServerUtil.preview(file, true, fileName, null, null, response, request);
-    }
-
-    @ApiOperation("查看缩略图")
-    @GetMapping("/thumbnail/{dir}/{name:.+}")
-    public void thumbnail(@PathVariable("dir") String dir, @PathVariable("name") String name,
-                          HttpServletResponse response, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        File file = new File(getUploadDir(), dir + "/" + name);
-        File thumbnail = new File(getUploadSmDir(), dir + "/" + name);
-        FileServerUtil.previewThumbnail(file, thumbnail, config.getThumbnailSize(), response, request);
-    }
-
-    @ApiOperation("删除文件")
-    @DeleteMapping("/remove/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        FileRecord record = fileRecordService.getById(id);
-        if (fileRecordService.removeById(id)) {
-            if (StrUtil.isNotBlank(record.getPath())) {
-                fileRecordService.deleteFileAsync(Arrays.asList(
-                        new File(getUploadDir(), record.getPath()),
-                        new File(getUploadSmDir(), record.getPath())
-                ));
-            }
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("批量删除文件")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "id数组", required = true, dataType = "string", dataTypeClass = String.class)
-    })
-    @DeleteMapping("/remove/batch")
-    public ApiResult<?> deleteBatch(@RequestBody List<Integer> ids) {
-        // 验证签名
-        isCheckSign();
-        List<FileRecord> fileRecords = fileRecordService.listByIds(ids);
-        if (fileRecordService.removeByIds(ids)) {
-            List<File> files = new ArrayList<>();
-            for (FileRecord record : fileRecords) {
-                if (StrUtil.isNotBlank(record.getPath())) {
-                    files.add(new File(getUploadDir(), record.getPath()));
-                    files.add(new File(getUploadSmDir(), record.getPath()));
-                }
-            }
-            fileRecordService.deleteFileAsync(files);
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("分页查询文件")
-    @GetMapping("/page")
-    public ApiResult<PageResult<FileRecord>> page(FileRecordParam param, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
-        PageResult<FileRecord> result = fileRecordService.pageRel(param);
-//        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/page");
-        String requestURL = config.getFileServer();
-        for (FileRecord record : result.getList()) {
-            if (StrUtil.isNotBlank(record.getPath())) {
-                record.setUrl(requestURL + record.getPath());
-                if (FileServerUtil.isImage(record.getContentType())) {
-                    record.setThumbnail(requestURL + "/thumbnail" + record.getPath());
-                }
-                record.setDownloadUrl(requestURL + "/download" + record.getPath());
-            }
-        }
-        return success(result);
-    }
-
-    @ApiOperation("查询全部文件")
-    @GetMapping("/list")
-    public ApiResult<List<FileRecord>> list(FileRecordParam param, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        List<FileRecord> records = fileRecordService.listRel(param);
-//        String requestURL = StrUtil.removeSuffix(request.getRequestURL(), "/list");
-        String requestURL = config.getFileServer();
-        for (FileRecord record : records) {
-            if (StrUtil.isNotBlank(record.getPath())) {
-                record.setUrl(requestURL + record.getPath());
-                if (FileServerUtil.isImage(record.getContentType())) {
-                    record.setThumbnail(requestURL + "/thumbnail" + record.getPath());
-                }
-                record.setDownloadUrl(requestURL + "/download" + record.getPath());
-            }
-        }
-        return success(records);
-    }
-
-    /**
-     * 文件上传基目录
-     */
-    private String getUploadBaseDir() {
-        return File.listRoots()[config.getUploadLocation()].getAbsolutePath()
-                .replace("\\", "/") + "/upload/";
-    }
-
-    /**
-     * 文件上传位置(服务器)
-     */
-    private String getUploadDir() {
-        return config.getUploadPath() + "file/";
-    }
-
-    /**
-     * 文件上传位置(本地)
-     */
-//    private String getUploadDir() {
-//        return "/Users/gxwebsoft/Documents/uploads/";
-//    }
-
-    /**
-     * 缩略图生成位置
-     */
-    private String getUploadSmDir() {
-        return getUploadBaseDir() + "thumbnail/";
-    }
-
-    /**
-     * office转pdf输出位置
-     */
-    private String getPdfOutDir() {
-        return getUploadBaseDir() + "pdf/";
-    }
-
-    @ApiOperation("添加文件")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody FileRecord fileRecord) {
-      // 验证签名
-      isCheckSign();
-      if (fileRecordService.save(fileRecord)) {
-        return success("上传成功");
-      }
-      return fail("上传失败");
-    }
-
-    @ApiOperation("修改文件")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody FileRecord fileRecord) {
-      // 验证签名
-      isCheckSign();
-      if (fileRecordService.updateById(fileRecord)) {
-        return success("修改成功");
-      }
-      return fail("修改失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java b/src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java
deleted file mode 100644
index 71bb612..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenGoodsController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.GoodsParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 商品记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-@Api(tags = "商品记录表管理")
-@RestController
-@RequestMapping("/api/open/goods")
-public class OpenGoodsController extends BaseController {
-    @Resource
-    private GoodsService goodsService;
-    @Resource
-    private CacheClient cacheClient;
-
-    @ApiOperation("分页查询商品记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Goods>> page(GoodsParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(goodsService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部商品记录表")
-    @GetMapping()
-    public ApiResult<?> list(GoodsParam param) {
-      return success(goodsService.listRel(param));
-    }
-
-    @ApiOperation("查询菜品列表(废弃)")
-    @GetMapping("/getFoodList")
-    public ApiResult<?> getFoodList(GoodsParam param) {
-      // 验证签名
-//      isCheckSign();
-//      List<Goods> goods = goodsService.listRel(param);
-//      // 给列表附加购买数量
-//      ArrayList<Goods> list = new ArrayList<>(goods.size());
-//      goods.forEach(d -> {
-//        OrderGoods item = cacheClient.hGet(getKey(), d.getGoodsId().toString(), OrderGoods.class);
-//        if(item != null){
-//          d.setTotalNum(item.getTotalNum());
-//        }else{
-//          d.setTotalNum(0);
-//        }
-//        list.add(d);
-//      });
-//      return success(goodsService.listRel(param));
-
-      // 计算购物车总金额及数量
-//      int totalNum = cache.stream().mapToInt(OrderGoods::getTotalNum).sum();
-//      BigDecimal totalPrice = cache.stream().filter(d -> d.getTotalNum() > 0).map(OrderGoods::getGoodsPrice).collect(Collectors.toList()).stream().reduce(BigDecimal.ZERO, BigDecimal::add);
-//      Map<String, Object> map = new HashMap<>();
-//      map.put("totalNum",totalNum);
-//      map.put("totalPrice",totalPrice);
-//      map.put("goodsList",list);
-//      return success(map);
-        return fail("已废弃");
-    }
-
-//    @PreAuthorize("hasAuthority('shop:goods:list')")
-//    @OperationLog
-//    @ApiOperation("根据id查询商品记录表")
-//    @GetMapping("/{id}")
-//    public ApiResult<Goods> get(@PathVariable("id") Integer id) {
-//        return success(goodsService.getById(id));
-//        // 使用关联查询
-//        //return success(goodsService.getByIdRel(id));
-//    }
-//
-//    @PreAuthorize("hasAuthority('shop:goods:save')")
-//    @OperationLog
-//    @ApiOperation("添加商品记录表")
-//    @PostMapping()
-//    public ApiResult<?> save(@RequestBody Goods goods) {
-//        // 记录当前登录用户id、租户id
-//        User loginUser = getLoginUser();
-//        if (loginUser != null) {
-//          goods.setUserId(loginUser.getUserId());
-//        }
-//        if (goodsService.save(goods)) {
-//            return success("添加成功");
-//        }
-//        return fail("添加失败");
-//    }
-//
-//    @PreAuthorize("hasAuthority('shop:goods:update')")
-//    @OperationLog
-//    @ApiOperation("修改商品记录表")
-//    @PutMapping()
-//    public ApiResult<?> update(@RequestBody Goods goods) {
-//        if (goodsService.updateById(goods)) {
-//            return success("修改成功");
-//        }
-//        return fail("修改失败");
-//    }
-//
-//    @PreAuthorize("hasAuthority('shop:goods:remove')")
-//    @OperationLog
-//    @ApiOperation("删除商品记录表")
-//    @DeleteMapping("/{id}")
-//    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-//        if (goodsService.removeById(id)) {
-//            return success("删除成功");
-//        }
-//        return fail("删除失败");
-//    }
-//
-//    @PreAuthorize("hasAuthority('shop:goods:save')")
-//    @OperationLog
-//    @ApiOperation("批量添加商品记录表")
-//    @PostMapping("/batch")
-//    public ApiResult<?> saveBatch(@RequestBody List<Goods> list) {
-//        if (goodsService.saveBatch(list)) {
-//            return success("添加成功");
-//        }
-//        return fail("添加失败");
-//    }
-//
-//    @PreAuthorize("hasAuthority('shop:goods:update')")
-//    @OperationLog
-//    @ApiOperation("批量修改商品记录表")
-//    @PutMapping("/batch")
-//    public ApiResult<?> removeBatch(@RequestBody BatchParam<Goods> batchParam) {
-//        if (batchParam.update(goodsService, "goods_id")) {
-//            return success("修改成功");
-//        }
-//        return fail("修改失败");
-//    }
-//
-//    @PreAuthorize("hasAuthority('shop:goods:remove')")
-//    @OperationLog
-//    @ApiOperation("批量删除商品记录表")
-//    @DeleteMapping("/batch")
-//    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-//        if (goodsService.removeByIds(ids)) {
-//            return success("删除成功");
-//        }
-//        return fail("删除失败");
-//    }
-
-    /**
-     * 获取key
-     * @return cache10048:cart651
-     */
-    private String getKey(){
-      // 验证签名
-      isCheckSign();
-      return "cart".concat(getLoginUserId().toString());
-    }
-
-    /**
-     * 获取购物车数据
-     * @return
-     */
-    private List<OrderGoods> getCart(){
-      String key = getKey();
-      // 获取购物车数据
-      List<Object> values = cacheClient.hValues(key);
-      return values.stream().map(item -> JSONUtil.parseObject(JSONUtil.toJSONString(item), OrderGoods.class)).collect(Collectors.toList());
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenMainController.java b/src/main/java/com/gxwebsoft/open/controller/OpenMainController.java
deleted file mode 100644
index bc70768..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenMainController.java
+++ /dev/null
@@ -1,908 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.exceptions.ServerException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.google.gson.Gson;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.ExistenceParam;
-import com.gxwebsoft.common.system.entity.*;
-import com.gxwebsoft.common.system.mapper.TenantMapper;
-import com.gxwebsoft.common.system.mapper.UserMapper;
-import com.gxwebsoft.common.system.param.LoginParam;
-import com.gxwebsoft.common.system.param.SmsCaptchaParam;
-import com.gxwebsoft.common.system.param.UpdatePasswordParam;
-import com.gxwebsoft.common.system.result.CaptchaResult;
-import com.gxwebsoft.common.system.result.LoginResult;
-import com.gxwebsoft.common.system.service.*;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.service.AppService;
-import com.gxwebsoft.oa.service.CustomerService;
-import com.wf.captcha.SpecCaptcha;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 登录认证控制器
- *
- * @author WebSoft
- * @since 2018-12-24 16:10:11
- */
-@Api(tags = "登录认证")
-@RestController
-@RequestMapping("/api/open")
-public class OpenMainController extends BaseController {
-    @Resource
-    private ConfigProperties configProperties;
-    @Resource
-    private UserService userService;
-    @Resource
-    private RoleMenuService roleMenuService;
-    @Resource
-    private LoginRecordService loginRecordService;
-    @Resource
-    private CacheClient cacheClient;
-    @Resource
-    private RoleService roleService;
-    @Resource
-    private UserRoleService userRoleService;
-    @Resource
-    private MenuService menuService;
-    @Resource
-    private EmailRecordService emailRecordService;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-    @Resource
-    private TenantMapper tenantMapper;
-    @Resource
-    private TenantService tenantService;
-    @Resource
-    private AppService appService;
-    @Resource
-    private DictService dictService;
-    @Resource
-    private DictDataService dictDataService;
-
-    @ApiOperation("用户登录")
-    @PostMapping("/login")
-    public ApiResult<LoginResult> login(@RequestBody LoginParam param, HttpServletRequest request) {
-        // 验证签名
-        isCheckSign();
-        String username = param.getUsername();
-        Integer tenantId = param.getTenantId();
-        // 手机号码登录
-        User userByPhone = userService.getByPhone(param.getUsername());
-        if (userByPhone != null) {
-          username = userByPhone.getUsername();
-        }
-
-        User user = userService.getByUsername(username, tenantId);
-        if (user == null) {
-            String message = "账号不存在";
-            loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
-            return fail(message, null);
-        }
-        if (!user.getStatus().equals(0)) {
-            String message = "账号被冻结";
-            loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
-            return fail(message, null);
-        }
-        if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
-            String message = "密码错误";
-            loginRecordService.saveAsync(username, LoginRecord.TYPE_ERROR, message, tenantId, request);
-            return fail(message, null);
-        }
-        loginRecordService.saveAsync(username, LoginRecord.TYPE_LOGIN, null, tenantId, request);
-        // 签发token
-        String access_token = JwtUtil.buildToken(new JwtSubject(username, tenantId),
-                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-        return success("登录成功", new LoginResult(access_token, user));
-    }
-
-    @Transactional(rollbackFor = {Exception.class}, isolation = Isolation.SERIALIZABLE)
-    @ApiOperation("账号注册")
-    @PostMapping("/register")
-    public ApiResult<?> register(@RequestBody User user) {
-      // 验证签名
-      Integer userType = user.getType();              // 用户类型
-      String tenantName = user.getCompanyName();     // 客户名称
-      String phone = user.getPhone();                // 手机号码
-      String username = user.getUsername();          // 账号
-      String password = user.getPassword();          // 密码
-      String code = user.getCode();                  // 短信验证码
-      String email = user.getEmail();                // 邮箱
-
-      // 短信验证
-      if (!StrUtil.equals(code,cacheClient.get(phone,String.class)) && !StrUtil.equals(code,"170083")) {
-        throw new BusinessException("验证码不正确");
-      }
-      user.setUsername(username);
-      user.setPhone(phone);
-      user.setRealName(tenantName);
-      user.setCompanyName(tenantName);
-      user.setStatus(0);          // 设置状态
-      user.setPassword(userService.encodePassword(password));   // 密码加密
-      userService.saveUser(user);
-
-      // 用户类型：开发者
-      if(userType.equals(6)) {
-        // 发送邮件通知
-        String title = "恭喜！您的开发者账号已注册成功";
-        String content = "用户ID：".concat(user.getUserId().toString()).concat("，账号：".concat(phone).concat("，密码：").concat(password));
-        sendEmail(title,content,email);
-        return success("注册成功");
-      }
-
-      // 用户类型：企业主
-      if (userType.equals(10)) {
-        if (tenantMapper.selectCount(new LambdaQueryWrapper<Tenant>()
-          .eq(Tenant::getTenantName, tenantName)) > 0) {
-          throw new BusinessException("该主体名称已存在");
-        }
-        // 添加租户
-        Tenant tenant = new Tenant();
-        tenant.setUserId(user.getUserId());
-        tenant.setTenantName(tenantName);
-        tenant.setTenantCode(CommonUtil.randomUUID16());
-        tenantService.save(tenant);
-
-        // 添加默认字典
-        Dict dict = new Dict();
-        dict.setDictName("性别");
-        dict.setDictCode("sex");
-        dict.setTenantId(tenant.getTenantId());
-        dictService.save(dict);
-        DictData dictData = new DictData();
-        dictData.setDictId(dict.getDictId());
-        dictData.setDictDataName("男");
-        dictData.setDictDataCode("1");
-        dictData.setSortNumber(100);
-        dictData.setTenantId(tenant.getTenantId());
-        dictDataService.save(dictData);
-        dictData.setDictDataName("女");
-        dictData.setDictDataCode("2");
-        dictData.setTenantId(tenant.getTenantId());
-        dictDataService.save(dictData);
-        dict.setDictName("机构类型");
-        dict.setDictCode("organizationType");
-        dict.setTenantId(tenant.getTenantId());
-        dictService.save(dict);
-        dictData.setDictId(dict.getDictId());
-        dictData.setDictDataName("公司");
-        dictData.setDictDataCode("1");
-        dictData.setTenantId(tenant.getTenantId());
-        dictDataService.save(dictData);
-        dictData.setDictId(dict.getDictId());
-        dictData.setDictDataName("部门");
-        dictData.setDictDataCode("2");
-        dictData.setTenantId(tenant.getTenantId());
-        dictDataService.save(dictData);
-
-        // 添加超级管理员
-        User admin = new User();
-        admin.setUsername("admin");
-        admin.setNickname("超级管理员");
-        admin.setPhone(phone);
-        admin.setEmail(email);
-        admin.setRealName(tenantName);
-        admin.setCompanyName(tenantName);
-        admin.setPassword(userService.encodePassword(password));
-        admin.setTenantId(tenant.getTenantId());
-        boolean result = userService.save(admin);
-        Integer superAdminUserId = admin.getUserId();
-        // 创建角色
-        if (result) {
-          Role role = new Role();
-          role.setRoleName("超级管理员");
-          role.setRoleCode("superAdmin");
-          role.setComments("超级管理员");
-          role.setTenantId(tenant.getTenantId());
-          roleService.save(role);
-
-          // 保存超级管理员角色ID
-          Integer superAdminRoleId = role.getRoleId();
-          role.setRoleName("注册用户");
-          role.setRoleCode("user");
-          role.setComments("普通注册用户");
-          roleService.save(role);
-          role.setRoleName("游客");
-          role.setRoleCode("guest");
-          role.setComments("用于未登录时的浏览权限");
-          roleService.save(role);
-          Integer guestRoleId = role.getRoleId();
-
-          // 添加游客账号
-          User www = new User();
-          www.setTenantId(tenant.getTenantId());
-          www.setUsername("www");
-          www.setNickname("游客");
-          www.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-          userService.save(www);
-
-          // 添加超管用户角色
-          UserRole userRole = new UserRole();
-          userRole.setUserId(superAdminUserId);
-          userRole.setRoleId(superAdminRoleId);
-          userRole.setTenantId(tenant.getTenantId());
-          userRoleService.save(userRole);
-
-          // 添加游客用户角色
-          userRole.setUserId(www.getUserId());
-          userRole.setRoleId(guestRoleId);
-          boolean resultUserRole = userRoleService.save(userRole);
-
-          /// 添加系统菜单
-          if (resultUserRole) {
-            Menu menu = new Menu();
-            // 10.系统管理
-            menu.setTitle("系统管理");
-            menu.setParentId(0);
-            menu.setPath("/system");
-            menu.setIcon("setting-outlined");
-            menu.setSortNumber(10);
-            menu.setTenantId(tenant.getTenantId());
-            menuService.save(menu);
-            Integer parentId = menu.getMenuId();
-            menu.setParentId(menu.getMenuId());
-            menu.setTitle("用户管理");
-            menu.setPath("/system/user");
-            menu.setComponent("/system/user");
-            menu.setIcon("team-outlined");
-            menu.setSortNumber(2);
-            menuService.save(menu);
-            Integer userParentId = menu.getMenuId();
-            menu.setParentId(userParentId);
-            menu.setMenuType(1);
-            menu.setTitle("查询");
-            menu.setIcon("");
-            menu.setAuthority("sys:user:list");
-            menuService.save(menu);
-            menu.setParentId(userParentId);
-            menu.setTitle("添加");
-            menu.setAuthority("sys:user:save");
-            menuService.save(menu);
-            menu.setParentId(userParentId);
-            menu.setTitle("修改");
-            menu.setAuthority("sys:user:update");
-            menuService.save(menu);
-            menu.setParentId(userParentId);
-            menu.setTitle("删除");
-            menu.setAuthority("sys:user:remove");
-            menuService.save(menu);
-            menu.setMenuType(0);
-            menu.setParentId(parentId);
-            menu.setTitle("角色管理");
-            menu.setPath("/system/role");
-            menu.setComponent("/system/role");
-            menu.setIcon("idcard-outlined");
-            menu.setAuthority("");
-            menu.setSortNumber(3);
-            menuService.save(menu);
-            Integer roleParentId = menu.getMenuId();
-            menu.setParentId(roleParentId);
-            menu.setMenuType(1);
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setTitle("查询");
-            menu.setAuthority("sys:role:list");
-            menuService.save(menu);
-            menu.setParentId(roleParentId);
-            menu.setTitle("添加");
-            menu.setAuthority("sys:role:save");
-            menuService.save(menu);
-            menu.setParentId(roleParentId);
-            menu.setTitle("修改");
-            menu.setAuthority("sys:role:update");
-            menuService.save(menu);
-            menu.setParentId(roleParentId);
-            menu.setTitle("删除");
-            menu.setAuthority("sys:role:remove");
-            menuService.save(menu);
-            menu.setMenuType(0);
-            menu.setParentId(parentId);
-            menu.setTitle("菜单管理");
-            menu.setPath("/system/menu");
-            menu.setComponent("/system/menu");
-            menu.setIcon("appstore-outlined");
-            menu.setAuthority("");
-            menu.setSortNumber(1);
-            menuService.save(menu);
-            Integer menuParentId = menu.getMenuId();
-            menu.setParentId(menuParentId);
-            menu.setMenuType(1);
-            menu.setTitle("查询");
-            menu.setAuthority("sys:menu:list");
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menuService.save(menu);
-            menu.setParentId(menuParentId);
-            menu.setTitle("添加");
-            menu.setAuthority("sys:menu:save");
-            menuService.save(menu);
-            menu.setParentId(menuParentId);
-            menu.setTitle("修改");
-            menu.setAuthority("sys:menu:update");
-            menuService.save(menu);
-            menu.setParentId(menuParentId);
-            menu.setTitle("删除");
-            menu.setAuthority("sys:menu:remove");
-            menuService.save(menu);
-            menu.setMenuType(0);
-            menu.setParentId(parentId);
-            menu.setTitle("机构管理");
-            menu.setPath("/system/organization");
-            menu.setComponent("/system/organization");
-            menu.setIcon("bank-outlined");
-            menu.setAuthority("");
-            menu.setSortNumber(5);
-            menuService.save(menu);
-            Integer orgParentId = menu.getMenuId();
-            menu.setParentId(orgParentId);
-            menu.setMenuType(1);
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setIcon("");
-            menu.setTitle("查询");
-            menu.setAuthority("sys:org:list");
-            menuService.save(menu);
-            menu.setParentId(orgParentId);
-            menu.setTitle("添加");
-            menu.setAuthority("sys:org:save");
-            menuService.save(menu);
-            menu.setParentId(orgParentId);
-            menu.setTitle("修改");
-            menu.setAuthority("sys:org:update");
-            menuService.save(menu);
-            menu.setParentId(orgParentId);
-            menu.setTitle("删除");
-            menu.setAuthority("sys:org:remove");
-            menuService.save(menu);
-            menu.setMenuType(0);
-            menu.setParentId(parentId);
-            menu.setTitle("字典管理");
-            menu.setPath("/system/dict");
-            menu.setComponent("/system/dict");
-            menu.setIcon("profile-outlined");
-            menu.setAuthority("");
-            menu.setSortNumber(4);
-            menuService.save(menu);
-            Integer dictParentId = menu.getMenuId();
-            menu.setParentId(dictParentId);
-            menu.setMenuType(1);
-            menu.setTitle("查询");
-            menu.setAuthority("sys:dict:list");
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menuService.save(menu);
-            menu.setParentId(dictParentId);
-            menu.setTitle("添加");
-            menu.setAuthority("sys:dict:save");
-            menuService.save(menu);
-            menu.setParentId(dictParentId);
-            menu.setTitle("修改");
-            menu.setAuthority("sys:dict:update");
-            menuService.save(menu);
-            menu.setParentId(dictParentId);
-            menu.setTitle("删除");
-            menu.setAuthority("sys:dict:remove");
-            menuService.save(menu);
-            menu.setMenuType(0);
-            menu.setParentId(parentId);
-            menu.setTitle("登录日志");
-            menu.setPath("/system/login-record");
-            menu.setComponent("/system/login-record");
-            menu.setIcon("calendar-outlined");
-            menu.setAuthority("sys:login-record:list");
-            menu.setSortNumber(7);
-            menuService.save(menu);
-            menu.setParentId(parentId);
-            menu.setTitle("操作日志");
-            menu.setPath("/system/operation-record");
-            menu.setComponent("/system/operation-record");
-            menu.setIcon("file-search-outlined");
-            menu.setAuthority("sys:operation-record:list");
-            menu.setSortNumber(8);
-            menuService.save(menu);
-            menu.setParentId(parentId);
-            menu.setTitle("文件管理");
-            menu.setPath("/system/file");
-            menu.setComponent("/system/file");
-            menu.setIcon("folder-outlined");
-            menu.setAuthority("");
-            menu.setSortNumber(6);
-            menuService.save(menu);
-            Integer fileParentId = menu.getMenuId();
-            menu.setParentId(fileParentId);
-            menu.setMenuType(1);
-            menu.setTitle("查看记录");
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setIcon("");
-            menu.setAuthority("sys:file:list");
-            menuService.save(menu);
-            menu.setParentId(fileParentId);
-            menu.setTitle("上传文件");
-            menu.setAuthority("sys:file:upload");
-            menuService.save(menu);
-            menu.setParentId(fileParentId);
-            menu.setTitle("修改文件");
-            menu.setAuthority("sys:file:update");
-            menuService.save(menu);
-            menu.setParentId(fileParentId);
-            menu.setTitle("删除文件");
-            menu.setAuthority("sys:org:remove");
-            menuService.save(menu);
-            menu.setMenuType(0);
-            menu.setParentId(parentId);
-            menu.setTitle("系统设置");
-            menu.setPath("/system/setting");
-            menu.setComponent("/system/setting");
-            menu.setIcon("setting-outlined");
-            menu.setAuthority("sys:setting:save");
-            menu.setSortNumber(10);
-            menuService.save(menu);
-            menu.setParentId(parentId);
-            menu.setTitle("用户信息");
-            menu.setPath("/system/user-info");
-            menu.setComponent("/system/user-info");
-            menu.setIcon("team-outlined");
-            menu.setAuthority("");
-            menu.setHide(1);
-            menu.setMenuType(0);
-            menu.setSortNumber(9);
-            menuService.save(menu);
-            Integer userInfoParentId = menu.getMenuId();
-            menu.setParentId(userInfoParentId);
-            menu.setMenuType(1);
-            menu.setTitle("修改个人密码");
-            menu.setAuthority("sys:auth:password");
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menuService.save(menu);
-            menu.setParentId(userInfoParentId);
-            menu.setTitle("修改个人资料");
-            menu.setAuthority("sys:auth:user");
-            menuService.save(menu);
-            // 1.控制台
-            menu.setParentId(0);
-            menu.setTitle("管理首页");
-            menu.setPath("/dashboard");
-            menu.setIcon("home-outlined");
-            menu.setComponent("/dashboard/workplace");
-            menu.setAuthority("");
-            menu.setSortNumber(1);
-            menu.setHide(0);
-            menu.setMenuType(0);
-            menuService.save(menu);
-//            Integer dashboardParentId = menu.getMenuId();
-//            menu.setTitle("工作台");
-//            menu.setPath("/dashboard/workplace");
-//            menu.setComponent("/dashboard/workplace");
-//            menu.setIcon("DesktopOutlined");
-//            menu.setParentId(dashboardParentId);
-//            menu.setMenuType(0);
-//            menu.setHide(0);
-//            menu.setSortNumber(0);
-//            menuService.save(menu);
-//            menu.setTitle("统计分析");
-//            menu.setPath("/dashboard/analysis");
-//            menu.setComponent("/dashboard/analysis");
-//            menu.setIcon("BarChartOutlined");
-//            menu.setParentId(dashboardParentId);
-//            menu.setMenuType(0);
-//            menu.setHide(0);
-//            menu.setSortNumber(1);
-//            menuService.save(menu);
-            // 2.办公协同
-            // 7.内容管理
-            menu.setParentId(0);
-            menu.setTitle("内容管理");
-            menu.setPath("/cms");
-            menu.setComponent("");
-            menu.setAuthority("");
-            menu.setIcon("FileSearchOutlined");
-            menu.setHide(0);
-            menu.setMenuType(0);
-            menu.setSortNumber(7);
-            menuService.save(menu);
-            Integer contentParentId = menu.getMenuId();
-            menu.setTitle("文章管理");
-            menu.setPath("/cms/article");
-            menu.setComponent("/cms/article");
-            menu.setIcon("FileSearchOutlined");
-            menu.setAuthority("");
-            menu.setSortNumber(1);
-            menu.setMenuType(0);
-            menu.setParentId(contentParentId);
-            menuService.save(menu);
-            Integer articleParentId = menu.getMenuId();
-            menu.setParentId(articleParentId);
-            menu.setMenuType(1);
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setTitle("查询");
-            menu.setSortNumber(0);
-            menu.setAuthority("cms:article:list");
-            menuService.save(menu);
-            menu.setTitle("添加");
-            menu.setAuthority("cms:article:save");
-            menuService.save(menu);
-            menu.setTitle("修改");
-            menu.setAuthority("cms:article:update");
-            menuService.save(menu);
-            menu.setTitle("删除");
-            menu.setAuthority("cms:article:remove");
-            menuService.save(menu);
-            menu.setTitle("文章分类");
-            menu.setPath("/cms/category");
-            menu.setComponent("/cms/category");
-            menu.setIcon("ApartmentOutlined");
-            menu.setAuthority("");
-            menu.setMenuType(0);
-            menu.setSortNumber(2);
-            menu.setParentId(contentParentId);
-            menuService.save(menu);
-            Integer categoryParentId = menu.getMenuId();
-            menu.setParentId(categoryParentId);
-            menu.setMenuType(1);
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setSortNumber(0);
-            menu.setTitle("查询");
-            menu.setAuthority("cms:articleCategory:list");
-            menuService.save(menu);
-            menu.setTitle("添加");
-            menu.setAuthority("cms:articleCategory:save");
-            menuService.save(menu);
-            menu.setTitle("修改");
-            menu.setAuthority("cms:articleCategory:update");
-            menuService.save(menu);
-            menu.setTitle("删除");
-            menu.setAuthority("cms:articleCategory:remove");
-            menuService.save(menu);
-            menu.setTitle("文档管理");
-            menu.setPath("/cms/docs/:id");
-            menu.setComponent("/cms/docs");
-            menu.setIcon("ReadOutlined");
-            menu.setAuthority("");
-            menu.setSortNumber(3);
-            menu.setMenuType(0);
-            menu.setParentId(contentParentId);
-            menuService.save(menu);
-            Integer docsParentId = menu.getMenuId();
-            menu.setParentId(docsParentId);
-            menu.setMenuType(1);
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setSortNumber(0);
-            menu.setTitle("查询");
-            menu.setAuthority("cms:docs:list");
-            menuService.save(menu);
-            menu.setTitle("添加");
-            menu.setAuthority("cms:docs:save");
-            menuService.save(menu);
-            menu.setTitle("修改");
-            menu.setAuthority("cms:docs:update");
-            menuService.save(menu);
-            menu.setTitle("删除");
-            menu.setAuthority("cms:docs:remove");
-            menuService.save(menu);
-            // 9.应用中心
-//            menu.setParentId(0);
-//            menu.setTitle("应用中心");
-//            menu.setPath("https://www.gxwebsoft.com/market");
-//            menu.setIcon("AppstoreAddOutlined");
-//            menu.setComponent("");
-//            menu.setAuthority("");
-//            menu.setSortNumber(11);
-//            menu.setMenuType(0);
-//            menuService.save(menu);
-
-            // 个人中心
-            menu.setParentId(0);
-            menu.setTitle("个人中心");
-            menu.setPath("/user-center");
-            menu.setIcon("UserOutlined");
-            menu.setComponent("");
-            menu.setAuthority("");
-            menu.setMenuType(0);
-            menu.setHide(1);
-            menu.setSortNumber(99);
-            menuService.save(menu);
-            Integer userCenterParentId = menu.getMenuId();
-            menu.setTitle("个人资料");
-            menu.setPath("/user/profile");
-            menu.setComponent("/user/profile");
-            menu.setIcon("IdcardOutlined");
-            menu.setParentId(userCenterParentId);
-            menu.setMenuType(0);
-            menu.setSortNumber(0);
-            menuService.save(menu);
-            Integer userProfileParentId = menu.getMenuId();
-            menu.setParentId(userProfileParentId);
-            menu.setMenuType(1);
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menu.setTitle("修改资料");
-            menu.setSortNumber(0);
-            menu.setAuthority("sys:auth:user");
-            menuService.save(menu);
-            menu.setTitle("修改密码");
-            menu.setAuthority("sys:auth:password");
-            menuService.save(menu);
-
-            menu.setTitle("上传头像");
-            menu.setAuthority("sys:file:upload");
-            menuService.save(menu);
-            menu.setTitle("预览头像");
-            menu.setAuthority("sys:file:list");
-            menuService.save(menu);
-            menu.setTitle("保存头像");
-            menu.setAuthority("sys:user:update");
-            menuService.save(menu);
-            menu.setTitle("我的消息");
-            menu.setPath("/user/notice");
-            menu.setComponent("/user/notice");
-            menu.setIcon("sound-outlined");
-            menu.setParentId(userCenterParentId);
-            menu.setMenuType(0);
-            menuService.save(menu);
-            Integer userNoticeParentId = menu.getMenuId();
-            menu.setParentId(userNoticeParentId);
-            menu.setTitle("列表");
-            menu.setAuthority("oa:notice:list");
-            menu.setSortNumber(0);
-            menu.setMenuType(1);
-            menu.setIcon("");
-            menu.setPath("");
-            menu.setComponent("");
-            menuService.save(menu);
-            menu.setTitle("添加");
-            menu.setAuthority("oa:notice:save");
-            menuService.save(menu);
-            menu.setTitle("编辑");
-            menu.setAuthority("oa:notice:update");
-            menuService.save(menu);
-            menu.setTitle("删除");
-            menu.setAuthority("oa:notice:remove");
-            menuService.save(menu);
-            menu.setParentId(userCenterParentId);
-            menu.setTitle("用户注册");
-            menu.setAuthority("sys:user:save");
-            menuService.save(menu);
-            menu.setTitle("字典查询");
-            menu.setAuthority("sys:dict:list");
-
-            boolean resultMenu = menuService.save(menu);
-            // 添加菜单ID到超级管理员所属角色ID
-            if (resultMenu) {
-              saveRedis(tenant);
-            }
-          }
-        }
-        // 发送邮件通知
-        String title = "恭喜！您的企业账号已注册成功";
-        String content = "企业名称：".concat(tenantName) + "\r\n企业ID：".concat(tenant.getTenantId().toString()).concat("\r\n管理员账号密码：").concat("admin/").concat(password);
-        String adminUrl = "\r\n后台管理地址：".concat("https://admin.gxwebsoft.com");
-//        String developer = "\r\n开发者账号：".concat(phone).concat("\r\n密码：".concat(password));
-        sendEmail(title,content.concat(adminUrl),email);
-        return success("创建成功");
-      }
-      return fail("注册失败");
-    }
-
-  private void sendEmail(String title, String content, String receiver) {
-    // 发送邮件通知
-    EmailRecord emailRecord = new EmailRecord();
-    emailRecord.setTitle(title);
-    emailRecord.setContent(content);
-    emailRecord.setReceiver(receiver);
-    emailRecord.setCreateUserId(42);
-    emailRecordService.sendTextEmail(title,content,receiver.split(","));
-    emailRecordService.save(emailRecord);
-  }
-
-    @ApiOperation("检查用户是否存在")
-    @GetMapping("/existence")
-    public ApiResult<?> existence(ExistenceParam<User> param) {
-      if (param.isExistence(userService, User::getUserId)) {
-        return success("已存在", param.getValue());
-      }
-      return fail("不存在");
-    }
-
-    @ApiOperation("获取应用信息")
-    @GetMapping("/appInfo")
-    public ApiResult<App> appInfo() {
-      // 验证签名
-      isCheckSign();
-      App appInfo = appService.getById(getAppId());
-      User user = userService.getByUsername("www", 10052);
-      System.out.println("user = " + user);
-      return success(appInfo);
-    }
-
-    @ApiOperation("获取登录用户信息")
-    @GetMapping("/auth/user")
-    public ApiResult<User> userInfo() {
-      // 验证签名
-      isCheckSign();
-      return success(userService.getByIdRel(getLoginUserId()));
-    }
-
-    @ApiOperation("获取登录用户菜单")
-    @GetMapping("/auth/menu")
-    public ApiResult<List<Menu>> userMenu() {
-        // 验证签名
-        isCheckSign();
-        List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
-        return success(CommonUtil.toTreeData(menus, 0, Menu::getParentId, Menu::getMenuId, Menu::setChildren));
-    }
-
-    @PreAuthorize("hasAuthority('sys:auth:user')")
-    @ApiOperation("修改个人信息")
-    @PutMapping("/auth/user")
-    public ApiResult<User> updateInfo(@RequestBody User user) {
-        // 验证签名
-        isCheckSign();
-        user.setUserId(getLoginUserId());
-        // 不能修改的字段
-        user.setUsername(null);
-        user.setPassword(null);
-        user.setEmailVerified(null);
-        user.setOrganizationId(null);
-        user.setStatus(null);
-
-        if (userService.updateById(user)) {
-            return success(userService.getByIdRel(user.getUserId()));
-        }
-        return fail("保存失败", null);
-    }
-
-    @PreAuthorize("hasAuthority('sys:auth:password')")
-    @ApiOperation("修改自己密码")
-    @PutMapping("/auth/password")
-    public ApiResult<?> updatePassword(@RequestBody UpdatePasswordParam param) {
-        // 验证签名
-        isCheckSign();
-        if (StrUtil.hasBlank(param.getOldPassword(), param.getPassword())) {
-            return fail("参数不能为空");
-        }
-        Integer userId = getLoginUserId();
-        if (userId == null) {
-            return fail("未登录");
-        }
-        if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
-            return fail("原密码输入不正确");
-        }
-        User user = new User();
-        user.setUserId(userId);
-        user.setPassword(userService.encodePassword(param.getPassword()));
-
-        if (userService.updateById(user)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("图形验证码")
-    @GetMapping("/captcha")
-    public ApiResult<CaptchaResult> captcha() {
-        SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5);
-        // 验证签名
-        isCheckSign();
-        return success(new CaptchaResult(specCaptcha.toBase64(), specCaptcha.text().toLowerCase()));
-    }
-
-    @ApiOperation("短信验证码")
-    @PostMapping("/sendSmsCaptcha")
-    public ApiResult<?> sendSmsCaptcha(@RequestBody SmsCaptchaParam param) {
-      // 验证签名
-      isCheckSign();
-      DefaultProfile profile = DefaultProfile.getProfile("regionld", "LTAI5tBWM9dSmEAoQFhNqxqJ", "Dr0BqiKl7eaL1NNKoCd12qKsbgjnum");
-      IAcsClient client = new DefaultAcsClient(profile);
-      CommonRequest request = new CommonRequest();
-      request.setSysMethod(MethodType.POST);
-      request.setSysDomain("dysmsapi.aliyuncs.com");
-      request.setSysVersion("2017-05-25");
-      request.setSysAction("SendSms");
-      request.putQueryParameter("RegionId", "cn-hangzhou");
-      request.putQueryParameter("PhoneNumbers", param.getPhone());
-      request.putQueryParameter("SignName", "南宁网宿科技");
-      request.putQueryParameter("TemplateCode", "SMS_257840118");
-      // 生成短信验证码
-      Random randObj = new Random();
-      String code = Integer.toString(100000 + randObj.nextInt(900000));
-      request.putQueryParameter("TemplateParam", "{\"code\":" + code + "}");
-      try {
-        CommonResponse response = client.getCommonResponse(request);
-        String json = response.getData();
-        Gson g = new Gson();
-        HashMap result = g.fromJson(json, HashMap.class);
-        if("OK".equals(result.get("Message"))) {
-          cacheClient.set(param.getPhone(),code,5L,TimeUnit.MINUTES);
-          return success("发送成功",result.get("Message"));
-        }else{
-          return fail("发送失败");
-        }
-      } catch (ServerException e) {
-        e.printStackTrace();
-      } catch (ClientException e) {
-        e.printStackTrace();
-      }
-      return fail("发送失败");
-    }
-
-    @ApiOperation("重置密码")
-    @PutMapping("/password")
-    public ApiResult<?> resetPassword(@RequestBody User user) {
-      // 验证签名
-      isCheckSign();
-      if (user.getPassword() == null) {
-        return fail("参数不正确");
-      }
-      if (user.getCode() == null) {
-        return fail("验证码不能为空");
-      }
-      // 短信验证码校验
-      String code = cacheClient.get(user.getPhone(), String.class);
-      if (!StrUtil.equals(code,user.getCode())) {
-        return fail("验证码不正确");
-      }
-
-      user.setUserId(getLoginUserId());
-      user.setPassword(userService.encodePassword(user.getPassword()));
-      if (userService.updateById(user)) {
-        return success("密码修改成功");
-      } else {
-        return fail("密码修改失败");
-      }
-    }
-
-    // 缓存租户信息
-    private void saveRedis(Tenant tenant) {
-      String key = "cache:tenant";
-      String tenantId = tenant.getTenantId().toString();
-      if (StrUtil.isEmpty(tenant.getTenantCode())) {
-        tenant.setTenantCode(CommonUtil.randomUUID16());
-      }
-      String data = JSONUtil.toJSONString(tenant);
-      stringRedisTemplate.opsForHash().put(key,tenantId, data);
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java b/src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java
deleted file mode 100644
index d337209..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenMarketController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.TenantService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.entity.App;
-import com.gxwebsoft.oa.param.AppParam;
-import com.gxwebsoft.oa.service.AppService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.*;
-
-/**
- * 应用控制器
- *
- * @author WebSoft
- * @since 2022-11-18 13:55:29
- */
-@Api(tags = "应用市场")
-@RestController
-@RequestMapping("/api/open/market")
-public class OpenMarketController extends BaseController {
-    @Resource
-    private AppService appService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-    @Resource
-    private TenantService tenantService;
-    @Resource
-    private CacheClient cacheClient;
-
-    @ApiOperation("分页查询应用")
-    @GetMapping("/page")
-    public ApiResult<PageResult<App>> page(AppParam param) {
-        // 验证签名
-//        isCheckSign();
-//        PageParam<App, AppParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(appService.page(page, page.getWrapper()));
-
-        // 使用关联查询
-        param.setSearch(1);
-        return success(appService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部应用")
-    @GetMapping()
-    public ApiResult<List<App>> list(AppParam param) {
-        // 验证签名
-        isCheckSign();
-//        PageParam<App, AppParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(appService.list(page.getOrderWrapper()));
-
-        // 使用关联查询
-        param.setSearch(1);
-        return success(appService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询应用")
-    @GetMapping("/{id}")
-    public ApiResult<App> get(@PathVariable("id") Integer id) {
-//        return success(appService.getById(id));
-        // 验证签名
-        isCheckSign();
-        return success(appService.getByIdRel(id));
-    }
-
-    @ApiOperation("排行榜")
-    @GetMapping("/ranking")
-    public ApiResult<?> ranking(UserParam param) {
-      // 使用关联查询
-      Set<String> reverseRange = cacheClient.reverseRange(USER_RANKING_BY_APPS, 0, 2);
-      List<User> list = new ArrayList<>(reverseRange.size());
-      if(reverseRange.size() == 0) {
-        userService.listRanking(param);
-      }
-      reverseRange.forEach(v -> {
-        Double score = cacheClient.score(USER_RANKING_BY_APPS, v);
-        User user = userService.getById(v);
-        user.setApps(score);
-        list.add(user);
-      });
-      return success("操作成功",list);
-    }
-
-    @ApiOperation("搜索历史")
-    @GetMapping("/search-history")
-    public ApiResult<?> searchHistory(String keyword, Long number) {
-      // 验证签名
-      isCheckSign();
-      String key = cacheClient.key(SEARCH_HISTORY,getLoginUserId());
-      if(StrUtil.isNotBlank(keyword)){
-        cacheClient.leftPush(key,keyword);
-      }
-      // 超出100裁剪
-      Long size = cacheClient.listSize(key);
-      if (number == null) {
-        number = 9L;
-      }
-      return success("操作成功",cacheClient.listRange(key,0L,number));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java b/src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java
deleted file mode 100644
index 36e5b0a..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenMerchantController.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.param.MerchantParam;
-import com.gxwebsoft.shop.service.MerchantService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY;
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_KEY;
-
-/**
- * 商户管理控制器
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-@Api(tags = "商户管理管理")
-@RestController
-@RequestMapping("/api/open/merchant")
-public class OpenMerchantController extends BaseController {
-    @Resource
-    private MerchantService merchantService;
-    @Resource
-    private CacheClient cacheClient;
-
-    @ApiOperation("分页查询商户管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Merchant>> page(MerchantParam param) {
-        // 验证签名
-        isCheckSign();
-        // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
-        // 使用关联查询
-        return success(merchantService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部商户管理")
-    @GetMapping()
-    public ApiResult<List<Merchant>> list(MerchantParam param) {
-      // 验证签名
-      isCheckSign();
-        PageParam<Merchant, MerchantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        // 使用关联查询
-        return success(merchantService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询商户管理")
-    @GetMapping("/{id}")
-    public ApiResult<Merchant> get(@PathVariable("id") Integer id) {
-      // 验证签名
-      isCheckSign();
-      // 使用关联查询
-        return success(merchantService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加商户管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Merchant merchant) {
-      // 验证签名
-      isCheckSign();
-        if (merchantService.count(new LambdaQueryWrapper<Merchant>()
-          .eq(Merchant::getMerchantCode, merchant.getMerchantCode())) > 0) {
-          return fail("商户编号已存在");
-        }
-        if (merchantService.save(merchant)) {
-            // 添加缓存
-            String lngAndLat = merchant.getLngAndLat();
-            String[] split = lngAndLat.split(",");
-            Double x = Double.parseDouble(split[0]);
-            Double y = Double.parseDouble(split[1]);
-            String id = merchant.getMerchantId().toString();
-            cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-            cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant);
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("修改商户管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Merchant merchant) {
-      // 验证签名
-      isCheckSign();
-        // 超级管理员不能设为店主
-        if(getLoginUser().getUserId().equals(merchant.getMerchantOwner())){
-          return fail("超级管理员不能绑定为负责人！");
-        }
-        if (merchantService.updateById(merchant)) {
-            // 添加缓存
-            String lngAndLat = merchant.getLngAndLat();
-            String[] split = lngAndLat.split(",");
-            Double x = Double.parseDouble(split[0]);
-            Double y = Double.parseDouble(split[1]);
-            String id = merchant.getMerchantId().toString();
-            cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-            cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-            cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant);
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除商户管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-      // 验证签名
-      isCheckSign();
-        if (merchantService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("批量添加商户管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Merchant> list) {
-      // 验证签名
-      isCheckSign();
-        if (merchantService.saveBatch(list)) {
-            list.forEach(d -> {
-              // 添加缓存
-              String lngAndLat = d.getLngAndLat();
-              String[] split = lngAndLat.split(",");
-              Double x = Double.parseDouble(split[0]);
-              Double y = Double.parseDouble(split[1]);
-              String id = d.getMerchantId().toString();
-              cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-              cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-              cacheClient.set(MERCHANT_KEY.concat(":").concat(d.getMerchantId().toString()),d);
-            });
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("批量修改商户管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Merchant> batchParam) {
-      // 验证签名
-      isCheckSign();
-        if (batchParam.update(merchantService, "merchant_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("批量删除商户管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-      // 验证签名
-      isCheckSign();
-        if (merchantService.removeByIds(ids)) {
-            // 删除缓存
-            ids.forEach(id -> {
-              cacheClient.geoRemove(MERCHANT_GEO_KEY,id);
-            });
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("根据定位查询附近的商户列表")
-    @PostMapping("/getListByGeo")
-    public ApiResult<List<Merchant>> getListByGeo(@RequestBody MerchantParam param) {
-      // 验证签名
-      isCheckSign();
-      return success(merchantService.listByGeo(param));
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java b/src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java
deleted file mode 100644
index 58dcffb..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenNoticeController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Notice;
-import com.gxwebsoft.oa.param.NoticeParam;
-import com.gxwebsoft.oa.service.NoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 消息记录表控制器
- *
- * @author 科技小王子
- * @since 2023-03-22 14:07:26
- */
-@Api(tags = "消息记录表管理")
-@RestController
-@RequestMapping("/api/open/notice")
-public class OpenNoticeController extends BaseController {
-    @Resource
-    private NoticeService noticeService;
-
-    @ApiOperation("分页查询消息记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Notice>> page(NoticeParam param) {
-        // 验证签名
-//        isCheckSign();
-        // 使用关联查询
-        param.setUserId(getLoginUserId());
-        return success(noticeService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部消息记录表")
-    @GetMapping()
-    public ApiResult<List<Notice>> list(NoticeParam param) {
-        // 验证签名
-//        isCheckSign();
-        // 使用关联查询
-        param.setUserId(getLoginUserId());
-        return success(noticeService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询消息记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Notice> get(@PathVariable("id") Integer id) {
-        // 验证签名
-//        isCheckSign();
-        return success(noticeService.getById(id));
-        // 使用关联查询
-        //return success(noticeService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加消息记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Notice notice) {
-        // 验证签名
-//        isCheckSign();
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          notice.setUserId(loginUser.getUserId());
-        }
-        if (noticeService.save(notice)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("修改消息记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Notice notice) {
-        // 验证签名
-//        isCheckSign();
-        if (noticeService.updateById(notice)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除消息记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-      if (noticeService.removeById(id)) {
-        return success("删除成功");
-      }
-      return fail("删除失败");
-    }
-
-    @ApiOperation("批量添加消息记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Notice> list) {
-        // 验证签名
-//        isCheckSign();
-        if (noticeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("批量修改消息记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Notice> batchParam) {
-        // 验证签名
-//        isCheckSign();
-        if (batchParam.update(noticeService, "notice_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("批量删除消息记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        // 验证签名
-//        isCheckSign();
-        if (noticeService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java b/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java
deleted file mode 100644
index cef7907..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.utils.BcUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.mapper.OrderMapper;
-import com.gxwebsoft.shop.param.CartParam;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_REFUND;
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-
-/**
- * 订单记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-@Api(tags = "订单记录表管理")
-@RestController
-@RequestMapping("/api/open/order")
-public class OpenOrderController extends BaseController {
-    @Resource
-    private BcUtil bcUtil;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private OrderGoodsService orderGoodsService;
-    @Resource
-    private OrderMapper orderMapper;
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserBalanceLogService userBalanceLogService;
-
-    @ApiOperation("查询全部订单记录表")
-    @GetMapping()
-    public ApiResult<List<Order>> list(OrderParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(orderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("根据id查询订单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Order> get(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        return success(orderService.getById(id));
-        // 使用关联查询
-        //return success(orderService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("查询报餐明细")
-    @GetMapping("/getMyOrder")
-    public ApiResult<Order> getMyOrder(CartParam cartParam) {
-      Integer userId = 0;
-      if(cartParam.getAgentUserId() != null){
-        userId = cartParam.getAgentUserId();
-      }else{
-        userId = getLoginUserId();
-      }
-      System.out.println("cartParam = " + cartParam);
-      System.out.println("userId = " + userId);
-      // 验证签名
-      isCheckSign();
-      // 报餐明细（查询昨天这个时间点后下的订单）
-      LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-      lambdaQueryWrapper
-        .eq(Order::getUserId,userId)
-        .eq(Order::getPayStatus,PAY_STATUS_SUCCESS)
-        .eq(Order::getOrderStatus,ORDER_STATUS_DOING)
-        .eq(Order::getDeleted,0)
-        .eq(Order::getIsTemporary,0)
-        .eq(Order::getDeliveryTime,cartParam.getDeliveryTime());
-      Order order = orderService.getOne(lambdaQueryWrapper,false);
-      // 查询订单商品
-      if(order != null){
-        OrderGoodsParam param = new OrderGoodsParam();
-        param.setOrderId(order.getOrderId());
-        // 是否按餐段查询
-        if(cartParam.getIsPeriod() != null){
-          param.setCategoryId(bcUtil.categoryId);
-        }
-        PageParam<OrderGoods, OrderGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("gear asc, sort_number asc, create_time desc");
-        order.setGoodsList(orderGoodsService.list(page.getOrderWrapper()));
-      }
-      // 是否允许临时报餐
-      if(cartParam.getHasTemporary() != null){
-        final OrderParam orderParam = new OrderParam();
-        orderParam.setDeliveryTime(cartParam.getDeliveryTime());
-        orderParam.setUserId(userId);
-        orderParam.setPayStatus(PAY_STATUS_SUCCESS);
-        final List<Order> list = orderService.listRel(orderParam);
-//        System.out.println("list1 = " + list);
-        if(list.size() > 0){
-          final Order order1 = list.get(0);
-          final Integer orderId = order1.getOrderId();
-          final OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-          orderGoodsParam.setOrderId(orderId);
-          orderGoodsParam.setCategoryId(cartParam.getCategoryId());
-//          System.out.println("orderGoodsParam = " + orderGoodsParam);
-          final List<OrderGoods> goodsList1 = orderGoodsService.listRel(orderGoodsParam);
-//          System.out.println("goodsList1 = " + goodsList1);
-          if(goodsList1.size() > 0){
-            order1.setGoodsList(goodsList1);
-            return fail("请勿重复报餐",order1);
-          }
-        }
-      }
-      return success(order);
-    }
-
-    @ApiOperation("查询今日当前餐段菜品")
-    @PostMapping("/currentOrderGoods")
-    public ApiResult<List<OrderGoods>> currentOrderGoods(OrderGoodsParam param) {
-      // 验证签名
-      isCheckSign();
-      // 使用关联查询
-      param.setCategoryId(bcUtil.categoryId);
-      return success(orderGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("查询核销订单明细")
-    @GetMapping("/getReceiptOrder")
-    public ApiResult<?> getReceiptOrder(CartParam cartParam) {
-      // 验证签名
-      isCheckSign();
-      Integer userId = 0;
-
-      // 核销自己（查询今天他下的订单）
-      if(cartParam.getUserId() != null){
-        userId = cartParam.getUserId();
-        OrderParam orderParam = new OrderParam();
-        orderParam.setUserId(userId);
-        orderParam.setPayStatus(PAY_STATUS_SUCCESS);
-        orderParam.setOrderStatus(ORDER_STATUS_DOING);
-        orderParam.setDeliveryTime(cartParam.getDeliveryTime());
-        List<Order> list = orderService.listRel(orderParam);
-        // 查询订单商品
-        list.forEach(d -> {
-          OrderGoodsParam param = new OrderGoodsParam();
-          param.setOrderId(d.getOrderId());
-          d.setGoodsList(orderGoodsService.listRel(param));
-        });
-        return success(list);
-      }
-
-      // 代核销模式
-      if(cartParam.getDealerId() != null){
-        userId = cartParam.getDealerId();
-        return success(userId);
-      }
-      return fail("找不到报餐数据",null);
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:save')")
-    @ApiOperation("添加订单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Order order) {
-        // 验证签名
-        isCheckSign();
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          order.setUserId(loginUser.getUserId());
-        }
-        if (orderService.save(order)) {
-            return success("添加成功",order);
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:update')")
-    @ApiOperation("修改订单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Order order) {
-        // 验证签名
-        isCheckSign();
-        if (orderService.updateById(order)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("取消订单")
-    @PostMapping("/cancel")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> cancel(@RequestBody Order order) {
-      // 验证签名
-      isCheckSign();
-      if (order.getOrderId() == null) {
-        return fail("订单不存在！");
-      }
-      // 取消报餐截止时间
-      Date date = DateUtil.date();
-      int hours = date.getHours();
-      System.out.println("hours = " + hours);
-      if(hours > 19){
-        return fail("每天晚上8点后截止取消报餐");
-      }
-      order.setOrderStatus(ORDER_STATUS_CANCEL);
-      if (orderService.updateById(order)) {
-        final Order orderInfo  = orderService.getById(order.getOrderId());
-        // 退款
-        User user = userService.getById(orderInfo.getUserId());
-        System.out.println("user = " + user);
-        BigDecimal balance = user.getBalance().add(orderInfo.getPayPrice());
-        user.setBalance(balance);
-        userService.updateById(user);
-        // 记录余额明细
-        UserBalanceLog userBalanceLog = new UserBalanceLog();
-        userBalanceLog.setUserId(orderInfo.getUserId());
-        userBalanceLog.setScene(BALANCE_REFUND);
-        userBalanceLog.setMoney(orderInfo.getPayPrice());
-        userBalanceLog.setBalance(balance);
-        userBalanceLog.setComments(orderInfo.getOrderNo().toString());
-        userBalanceLog.setMerchantCode(orderInfo.getMerchantCode());
-        userBalanceLogService.save(userBalanceLog);
-        return success("订单取消成功",orderInfo);
-      }
-      return fail("订单取消失败");
-    }
-
-    @ApiOperation("删除订单记录表")
-    @GetMapping("/remove/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        if (orderService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:save')")
-    @ApiOperation("批量添加订单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Order> list) {
-        // 验证签名
-        isCheckSign();
-        if (orderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:update')")
-    @ApiOperation("批量修改订单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Order> batchParam) {
-        // 验证签名
-        isCheckSign();
-        if (batchParam.update(orderService, "order_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:remove')")
-    @ApiOperation("批量删除订单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        // 验证签名
-        isCheckSign();
-        if (orderService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("支付成功")
-    @PostMapping("/setPayStatus")
-    public ApiResult<?> setPayStatus(@RequestBody Order order){
-      // 验证签名
-      isCheckSign();
-      if (orderService.updateById(order)) {
-        return success("设置成功");
-      }
-      return fail("设置失败");
-    }
-
-    @ApiOperation("核销二维码")
-    @PutMapping("/verification")
-    public ApiResult<?> verification(@RequestBody Order order) {
-      // 验证签名
-      isCheckSign();
-      order.setOrderStatus(ORDER_STATUS_COMPLETED);
-      order.setReceiptTime(DateUtil.date());
-      if (orderService.updateById(order)) {
-        return success("核销成功");
-      }
-      return fail("核销失败");
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java b/src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java
deleted file mode 100644
index 79d1013..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenOrderGoodsController.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_REFUND;
-import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_CANCEL;
-
-/**
- * 订单商品记录表控制器
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-@Api(tags = "订单商品记录表管理")
-@RestController
-@RequestMapping("/api/open/order-goods")
-public class OpenOrderGoodsController extends BaseController {
-    @Resource
-    private OrderGoodsService orderGoodsService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserBalanceLogService userBalanceLogService;
-    @Resource
-    private OrderService orderService;
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
-    @ApiOperation("分页查询订单商品记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<OrderGoods>> page(OrderGoodsParam param) {
-        PageParam<OrderGoods, OrderGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("gear asc, sort_number asc, create_time desc");
-        return success(orderGoodsService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(orderGoodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
-    @ApiOperation("查询全部订单商品记录表")
-    @GetMapping()
-    public ApiResult<List<OrderGoods>> list(OrderGoodsParam param) {
-        PageParam<OrderGoods, OrderGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("gear asc, sort_number asc, create_time desc");
-        return success(orderGoodsService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(orderGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
-    @ApiOperation("根据id查询订单商品记录表")
-    @GetMapping("/{id}")
-    public ApiResult<OrderGoods> get(@PathVariable("id") Integer id) {
-        return success(orderGoodsService.getById(id));
-        // 使用关联查询
-        //return success(orderGoodsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:save')")
-    @ApiOperation("添加订单商品记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody OrderGoods orderGoods) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          orderGoods.setUserId(loginUser.getUserId());
-          orderGoods.setMerchantCode(getMerchantCode());
-        }
-        if (orderGoodsService.save(orderGoods)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:update')")
-    @ApiOperation("修改订单商品记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody OrderGoods orderGoods) {
-        if (orderGoodsService.updateById(orderGoods)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
-    @ApiOperation("删除订单商品记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderGoodsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:save')")
-    @ApiOperation("批量添加订单商品记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<OrderGoods> list) {
-        if (orderGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:update')")
-    @ApiOperation("批量修改订单商品记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderGoods> batchParam) {
-        if (batchParam.update(orderGoodsService, "order_goods_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
-    @ApiOperation("批量删除订单商品记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderGoodsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
-    @ApiOperation("取消订单商品")
-    @PostMapping("/cancel")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> cancel(@RequestBody OrderGoods orderGoods) {
-      // 验证签名
-      isCheckSign();
-      if (orderGoods.getOrderGoodsId() == null) {
-        return fail("菜品不存在！");
-      }
-//      System.out.println("orderGoods = " + orderGoods);
-      final Order byId = orderService.getById(orderGoods.getOrderId());
-      // 取消报餐截止时间
-      orderGoodsService.removeById(orderGoods);
-//      System.out.println("orderGoods = " + orderGoods);
-      // 退款
-      User user = userService.getById(byId.getUserId());
-//      System.out.println("user = " + user);
-//      System.out.println("orderGoods.getGoodsPrice() = " + orderGoods.getGoodsPrice());
-      BigDecimal balance = user.getBalance().add(orderGoods.getGoodsPrice());
-      user.setBalance(balance);
-      userService.updateById(user);
-        // 记录余额明细
-        UserBalanceLog userBalanceLog = new UserBalanceLog();
-        userBalanceLog.setUserId(byId.getUserId());
-        userBalanceLog.setScene(BALANCE_REFUND);
-        userBalanceLog.setMoney(orderGoods.getGoodsPrice());
-        userBalanceLog.setBalance(balance);
-        userBalanceLog.setComments(orderGoods.getOrderId().toString());
-        userBalanceLogService.save(userBalanceLog);
-        final int count = orderGoodsService.count(new LambdaUpdateWrapper<OrderGoods>().eq(OrderGoods::getOrderId, orderGoods.getOrderId()).gt(OrderGoods::getTotalNum,0));
-//        System.out.println("count = " + count);
-        // 更新订单金额
-        System.out.println("byId = " + byId);
-        if (!byId.getTotalPrice().equals(0)) {
-          byId.setTotalPrice(byId.getTotalPrice().subtract(orderGoods.getGoodsPrice()));
-          orderService.updateById(byId);
-        }
-
-        // 无菜品就把订单删除
-        if(count == 0){
-          final Order order = new Order();
-          order.setOrderId(orderGoods.getOrderId());
-          order.setOrderStatus(ORDER_STATUS_CANCEL);
-          orderService.removeById(orderGoods.getOrderId());
-        }
-        return success("菜品取消成功");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java b/src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java
deleted file mode 100644
index 6ae17f7..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenSettingController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.Setting;
-import com.gxwebsoft.common.system.service.SettingService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 系统设置控制器
- *
- * @author WebSoft
- * @since 2022-11-19 13:54:27
- */
-@Api(tags = "系统设置管理")
-@RestController
-@RequestMapping("/api/open/system/setting")
-public class OpenSettingController extends BaseController {
-    @Resource
-    private SettingService settingService;
-    @Resource
-    private CacheClient cacheClient;
-
-    @ApiOperation("根据key查询系统设置")
-    @GetMapping("/{settingKey}")
-    public ApiResult<Setting> get(@PathVariable("settingKey") String settingKey) {
-      final Setting data = settingService.getData(settingKey);
-      return success(settingService.getData(settingKey));
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java b/src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java
deleted file mode 100644
index f043a72..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenTaskController.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.entity.TaskUser;
-import com.gxwebsoft.oa.param.TaskParam;
-import com.gxwebsoft.oa.service.AppService;
-import com.gxwebsoft.oa.service.TaskRecordService;
-import com.gxwebsoft.oa.service.TaskService;
-import com.gxwebsoft.oa.service.TaskUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 工单记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:21:43
- */
-@Api(tags = "工单记录表管理")
-@RestController
-@RequestMapping("/api/open/oa/task")
-public class OpenTaskController extends BaseController {
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private TaskRecordService taskRecordService;
-    @Resource
-    private TaskUserService taskUserService;
-    @Resource
-    private AppService appService;
-
-    @ApiOperation("分页查询工单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Task>> page(TaskParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        final User loginUser = getLoginUser();
-        final Integer type = loginUser.getType();
-        // 如果是开发者账号则按受理人查询
-        if (type.equals(6)) {
-          param.setCommander(loginUser.getUserId());
-        }else{
-          param.setPromoter(getLoginUserId());
-        }
-
-        return success(taskService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部工单记录表")
-    @GetMapping()
-    public ApiResult<List<Task>> list(TaskParam param) {
-        // 验证签名
-        isCheckSign();
-        PageParam<Task, TaskParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(taskService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(taskService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('oa:task:list')")
-    @ApiOperation("根据id查询工单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Task> get(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        Task task = taskService.getByIdRel(id);
-        task.setAppInfo(appService.getById(task.getAppId()));
-      return success(task);
-    }
-
-    @ApiOperation("添加工单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Task task) {
-        // 验证签名
-        isCheckSign();
-        // 当前登录用户id
-        Integer loginUserId = getLoginUserId();
-        task.setUserId(loginUserId);
-        task.setPromoter(loginUserId);
-        task.setComments(StrUtil.sub(task.getContent(),0,200));
-        task.setLastReadUser(loginUserId);
-        // 创建工单
-        if (taskService.save(task)) {
-              // 添加聊天内容明细
-              TaskRecord taskRecord = new TaskRecord();
-              taskRecord.setUserId(loginUserId);
-              taskRecord.setContent(task.getContent());
-              taskRecord.setTaskId(task.getTaskId());
-              taskRecord.setFiles(task.getFiles());
-              taskRecordService.save(taskRecord);
-              // 添加工单成员
-              TaskUser taskUser = new TaskUser();
-              taskUser.setUserId(loginUserId);
-              taskUser.setTaskId(task.getTaskId());
-              taskUserService.save(taskUser);
-              return success("创建成功");
-              }
-        return fail("创建失败");
-    }
-
-    @ApiOperation("修改工单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Task task) {
-        // 验证签名
-        isCheckSign();
-        if (taskService.updateById(task)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除工单记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        if (taskService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("批量添加工单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Task> list) {
-      // 验证签名
-      isCheckSign();
-        if (taskService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("批量修改工单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Task> batchParam) {
-        // 验证签名
-        isCheckSign();
-        if (batchParam.update(taskService, "task_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("批量删除工单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        // 验证签名
-        isCheckSign();
-        if (taskService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("统计信息")
-    @GetMapping("/count")
-    public ApiResult<?> count(){
-      // 验证签名
-      isCheckSign();
-      User loginUser = getLoginUser();
-      ArrayList<Object> countNum = taskService.getCountNum(loginUser,null);
-      return success("操作成功",countNum);
-    }
-
-    // 查询用户的工单ID
-    private List<Integer> getTaskIds(){
-      final Integer loginUserId = getLoginUserId();
-      return taskUserService.list(new LambdaQueryWrapper<TaskUser>().eq(TaskUser::getUserId, loginUserId))
-        .stream().map(TaskUser::getTaskId).collect(Collectors.toList());
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java b/src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java
deleted file mode 100644
index 6dff9ae..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenTaskRecordController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.oa.entity.Task;
-import com.gxwebsoft.oa.entity.TaskRecord;
-import com.gxwebsoft.oa.param.TaskRecordParam;
-import com.gxwebsoft.oa.service.TaskRecordService;
-import com.gxwebsoft.oa.service.TaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.oa.constants.TaskConstants.PROGRESS2;
-import static com.gxwebsoft.oa.constants.TaskConstants.PROGRESS3;
-
-/**
- * 工单回复记录表控制器
- *
- * @author 科技小王子
- * @since 2023-03-05 00:52:21
- */
-@Api(tags = "工单回复记录表管理")
-@RestController
-@RequestMapping("/api/open/oa/task-record")
-public class OpenTaskRecordController extends BaseController {
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private TaskRecordService taskRecordService;
-
-    @ApiOperation("分页查询工单回复记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TaskRecord>> page(TaskRecordParam param) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(taskRecordService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部工单回复记录表")
-    @GetMapping()
-    public ApiResult<List<TaskRecord>> list(TaskRecordParam param) {
-        // 验证签名
-        isCheckSign();
-        // 更新查阅状态
-        Task task = taskService.getById(param.getTaskId());
-        if(!getLoginUserId().equals(task.getLastReadUser())){
-          task.setIsRead(1);
-        }
-        taskService.updateById(task);
-        // 使用关联查询
-        return success(taskRecordService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询工单回复记录表")
-    @GetMapping("/{id}")
-    public ApiResult<TaskRecord> get(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        // 使用关联查询
-        return success(taskRecordService.getByIdRel(id));
-    }
-
-    @ApiOperation("添加工单回复记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TaskRecord taskRecord) {
-        // 验证签名
-        isCheckSign();
-        taskRecord.setUserId(getLoginUserId());
-        int count = taskRecordService.count(new LambdaQueryWrapper<TaskRecord>().eq(TaskRecord::getTaskId,taskRecord.getTaskId()));
-        if(count > 100){
-          return fail("回复数超过最大限制");
-        }
-        if (taskRecordService.save(taskRecord)) {
-            // 变更工单状态
-            Task task = taskService.getById(taskRecord.getTaskId());
-            task.setProgress(PROGRESS2);
-            task.setIsRead(0);
-            task.setLastReadUser(getLoginUserId());
-            taskService.updateById(task);
-            return success("提交成功");
-        }
-        return fail("提交失败");
-    }
-
-    @ApiOperation("修改工单回复记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TaskRecord taskRecord) {
-        // 验证签名
-        isCheckSign();
-        if (taskRecordService.updateById(taskRecord)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("删除工单回复记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        // 验证签名
-        isCheckSign();
-        if (taskRecordService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("批量添加工单回复记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TaskRecord> list) {
-        // 验证签名
-        isCheckSign();
-        if (taskRecordService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @ApiOperation("批量修改工单回复记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TaskRecord> batchParam) {
-        // 验证签名
-        isCheckSign();
-        if (batchParam.update(taskRecordService, "task_record_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @ApiOperation("批量删除工单回复记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        // 验证签名
-        isCheckSign();
-        if (taskRecordService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java b/src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java
deleted file mode 100644
index bdafc8a..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenTenantController.java
+++ /dev/null
@@ -1,1265 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.Menu;
-import com.gxwebsoft.common.system.entity.RoleMenu;
-import com.gxwebsoft.common.system.entity.Tenant;
-import com.gxwebsoft.common.system.param.TenantParam;
-import com.gxwebsoft.common.system.service.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 租户控制器
- *
- * @author WebSoft
- * @since 2022-11-17 17:13:39
- */
-@Api(tags = "租户管理")
-@RestController
-@RequestMapping("/api/open/tenant")
-public class OpenTenantController extends BaseController {
-  @Resource
-  private TenantService tenantService;
-  @Resource
-  private UserService userService;
-  @Resource
-  private RoleService roleService;
-  @Resource
-  private UserRoleService userRoleService;
-  @Resource
-  private MenuService menuService;
-  @Resource
-  private RoleMenuService roleMenuService;
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
-  private DictService dictService;
-  @Resource
-  private DictDataService dictDataService;
-
-  @ApiOperation("分页查询租户")
-  @GetMapping("/page")
-  public ApiResult<PageResult<Tenant>> page(TenantParam param) {
-    // 特殊验证签名
-    if (!param.getTenantCode().equals("ZAcxbdmDQFwUKC3e")) {
-      throw new BusinessException("签名失败");
-    }
-    PageParam<Tenant, TenantParam> page = new PageParam<>(param);
-    page.setDefaultOrder("create_time desc");
-//        return success(tenantService.page(page, page.getWrapper()));
-    // 使用关联查询
-    return success(tenantService.pageRel(param));
-  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:list')")
-  @ApiOperation("查询全部租户")
-  @GetMapping()
-  public ApiResult<List<Tenant>> list(TenantParam param) {
-    // 验证签名
-    isCheckSign();
-    PageParam<Tenant, TenantParam> page = new PageParam<>(param);
-    page.setDefaultOrder("create_time desc");
-    return success(tenantService.list(page.getOrderWrapper()));
-    // 使用关联查询
-    //return success(tenantService.listRel(param));
-  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:list')")
-  @ApiOperation("根据id查询租户")
-  @GetMapping("/{id}")
-  public ApiResult<Tenant> get(@PathVariable("id") Integer id) {
-    // 验证签名
-    isCheckSign();
-    return success(tenantService.getById(id));
-    // 使用关联查询
-//        return success(tenantService.getByIdRel(id));
-  }
-
-//  @Transactional(rollbackFor = {Exception.class})
-//  @PreAuthorize("hasAuthority('oa:tenant:save')")
-//  @OperationLog
-//  @ApiOperation("添加租户(已废弃)")
-//  @PostMapping()
-//  public ApiResult<?> save(@RequestBody Tenant tenant) {
-//    // 验证签名
-//    isCheckSign();
-//    // 记录当前登录用户id、租户id
-//    User loginUser = getLoginUser();
-//    if (loginUser != null) {
-//      tenant.setUserId(loginUser.getUserId());
-//      if (loginUser.getTenantId() != 5) return fail("权限不足!");
-//    }
-//    // 添加租户
-//    tenant.setTenantCode(CommonUtil.randomUUID16());
-//    tenantService.save(tenant);
-//
-//    // 添加超级管理员
-//    User user = new User();
-//    user.setUsername("admin");
-//    user.setNickname("超级管理员");
-//    user.setPassword(userService.encodePassword(tenant.getPassword()));
-//    user.setTenantId(tenant.getTenantId());
-//    boolean result = userService.save(user);
-//    Integer superAdminUserId = user.getUserId();
-//
-//    // 创建角色
-//    if (result) {
-//      Role role = new Role();
-//      role.setRoleName("超级管理员");
-//      role.setRoleCode("superAdmin");
-//      role.setComments("超级管理员");
-//      role.setTenantId(tenant.getTenantId());
-//      roleService.save(role);
-//
-//      // 保存超级管理员角色ID
-//      Integer superAdminRoleId = role.getRoleId();
-//      role.setRoleName("注册用户");
-//      role.setRoleCode("user");
-//      role.setComments("普通注册用户");
-//      roleService.save(role);
-//      role.setRoleName("游客");
-//      role.setRoleCode("guest");
-//      role.setComments("用于未登录时的浏览权限");
-//      roleService.save(role);
-//      Integer guestRoleId = role.getRoleId();
-//
-//      // 添加默认字典
-//      final Dict dict = new Dict();
-//      dict.setDictName("性别");
-//      dict.setDictCode("sex");
-//      dict.setTenantId(tenant.getTenantId());
-//      dictService.save(dict);
-//      final DictData dictData = new DictData();
-//      dictData.setDictId(dict.getDictId());
-//      dictData.setDictDataName("男");
-//      dictData.setDictDataCode("1");
-//      dictData.setTenantId(tenant.getTenantId());
-//      dictDataService.save(dictData);
-//      dictData.setDictDataName("女");
-//      dictData.setDictDataCode("2");
-//      dictData.setTenantId(tenant.getTenantId());
-//      dictDataService.save(dictData);
-//
-//      // 添加游客账号
-//      user.setUsername("www");
-//      user.setNickname("游客");
-//      user.setPassword(userService.encodePassword("123456"));
-//      userService.save(user);
-//
-//      // 添加超管用户角色
-//      UserRole userRole = new UserRole();
-//      userRole.setUserId(superAdminUserId);
-//      userRole.setRoleId(superAdminRoleId);
-//      userRole.setTenantId(tenant.getTenantId());
-//      userRoleService.save(userRole);
-//
-//      // 添加游客用户角色
-//      userRole.setUserId(user.getUserId());
-//      userRole.setRoleId(guestRoleId);
-//      boolean resultUserRole = userRoleService.save(userRole);
-//
-//      /// 添加系统菜单
-//      if (resultUserRole) {
-//        Menu menu = new Menu();
-//        // 10.系统管理
-//        menu.setTitle("系统管理");
-//        menu.setParentId(0);
-//        menu.setPath("/system");
-//        menu.setIcon("setting-outlined");
-//        menu.setSortNumber(10);
-//        menu.setTenantId(tenant.getTenantId());
-//        menuService.save(menu);
-//        Integer parentId = menu.getMenuId();
-//        menu.setParentId(menu.getMenuId());
-//        menu.setTitle("用户管理");
-//        menu.setPath("/system/user");
-//        menu.setComponent("/system/user");
-//        menu.setIcon("team-outlined");
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        Integer userParentId = menu.getMenuId();
-//        menu.setParentId(userParentId);
-//        menu.setMenuType(1);
-//        menu.setTitle("查询");
-//        menu.setIcon("");
-//        menu.setAuthority("sys:user:list");
-//        menuService.save(menu);
-//        menu.setParentId(userParentId);
-//        menu.setTitle("添加");
-//        menu.setAuthority("sys:user:save");
-//        menuService.save(menu);
-//        menu.setParentId(userParentId);
-//        menu.setTitle("修改");
-//        menu.setAuthority("sys:user:update");
-//        menuService.save(menu);
-//        menu.setParentId(userParentId);
-//        menu.setTitle("删除");
-//        menu.setAuthority("sys:user:remove");
-//        menuService.save(menu);
-//        menu.setMenuType(0);
-//        menu.setParentId(parentId);
-//        menu.setTitle("角色管理");
-//        menu.setPath("/system/role");
-//        menu.setComponent("/system/role");
-//        menu.setIcon("idcard-outlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(3);
-//        menuService.save(menu);
-//        Integer roleParentId = menu.getMenuId();
-//        menu.setParentId(roleParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setTitle("查询");
-//        menu.setAuthority("sys:role:list");
-//        menuService.save(menu);
-//        menu.setParentId(roleParentId);
-//        menu.setTitle("添加");
-//        menu.setAuthority("sys:role:save");
-//        menuService.save(menu);
-//        menu.setParentId(roleParentId);
-//        menu.setTitle("修改");
-//        menu.setAuthority("sys:role:update");
-//        menuService.save(menu);
-//        menu.setParentId(roleParentId);
-//        menu.setTitle("删除");
-//        menu.setAuthority("sys:role:remove");
-//        menuService.save(menu);
-//        menu.setMenuType(0);
-//        menu.setParentId(parentId);
-//        menu.setTitle("菜单管理");
-//        menu.setPath("/system/menu");
-//        menu.setComponent("/system/menu");
-//        menu.setIcon("appstore-outlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        Integer menuParentId = menu.getMenuId();
-//        menu.setParentId(menuParentId);
-//        menu.setMenuType(1);
-//        menu.setTitle("查询");
-//        menu.setAuthority("sys:menu:list");
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menuService.save(menu);
-//        menu.setParentId(menuParentId);
-//        menu.setTitle("添加");
-//        menu.setAuthority("sys:menu:save");
-//        menuService.save(menu);
-//        menu.setParentId(menuParentId);
-//        menu.setTitle("修改");
-//        menu.setAuthority("sys:menu:update");
-//        menuService.save(menu);
-//        menu.setParentId(menuParentId);
-//        menu.setTitle("删除");
-//        menu.setAuthority("sys:menu:remove");
-//        menuService.save(menu);
-//        menu.setMenuType(0);
-//        menu.setParentId(parentId);
-//        menu.setTitle("机构管理");
-//        menu.setPath("/system/organization");
-//        menu.setComponent("/system/organization");
-//        menu.setIcon("bank-outlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(5);
-//        menuService.save(menu);
-//        Integer orgParentId = menu.getMenuId();
-//        menu.setParentId(orgParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setIcon("");
-//        menu.setTitle("查询");
-//        menu.setAuthority("sys:org:list");
-//        menuService.save(menu);
-//        menu.setParentId(orgParentId);
-//        menu.setTitle("添加");
-//        menu.setAuthority("sys:org:save");
-//        menuService.save(menu);
-//        menu.setParentId(orgParentId);
-//        menu.setTitle("修改");
-//        menu.setAuthority("sys:org:update");
-//        menuService.save(menu);
-//        menu.setParentId(orgParentId);
-//        menu.setTitle("删除");
-//        menu.setAuthority("sys:org:remove");
-//        menuService.save(menu);
-//        menu.setMenuType(0);
-//        menu.setParentId(parentId);
-//        menu.setTitle("字典管理");
-//        menu.setPath("/system/dict");
-//        menu.setComponent("/system/dict");
-//        menu.setIcon("profile-outlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(4);
-//        menuService.save(menu);
-//        Integer dictParentId = menu.getMenuId();
-//        menu.setParentId(dictParentId);
-//        menu.setMenuType(1);
-//        menu.setTitle("查询");
-//        menu.setAuthority("sys:dict:list");
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menuService.save(menu);
-//        menu.setParentId(dictParentId);
-//        menu.setTitle("添加");
-//        menu.setAuthority("sys:dict:save");
-//        menuService.save(menu);
-//        menu.setParentId(dictParentId);
-//        menu.setTitle("修改");
-//        menu.setAuthority("sys:dict:update");
-//        menuService.save(menu);
-//        menu.setParentId(dictParentId);
-//        menu.setTitle("删除");
-//        menu.setAuthority("sys:dict:remove");
-//        menuService.save(menu);
-//        menu.setMenuType(0);
-//        menu.setParentId(parentId);
-//        menu.setTitle("登录日志");
-//        menu.setPath("/system/login-record");
-//        menu.setComponent("/system/login-record");
-//        menu.setIcon("calendar-outlined");
-//        menu.setAuthority("sys:login-record:list");
-//        menu.setSortNumber(7);
-//        menuService.save(menu);
-//        menu.setParentId(parentId);
-//        menu.setTitle("操作日志");
-//        menu.setPath("/system/operation-record");
-//        menu.setComponent("/system/operation-record");
-//        menu.setIcon("file-search-outlined");
-//        menu.setAuthority("sys:operation-record:list");
-//        menu.setSortNumber(8);
-//        menuService.save(menu);
-//        menu.setParentId(parentId);
-//        menu.setTitle("文件管理");
-//        menu.setPath("/system/file");
-//        menu.setComponent("/system/file");
-//        menu.setIcon("folder-outlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(6);
-//        menuService.save(menu);
-//        Integer fileParentId = menu.getMenuId();
-//        menu.setParentId(fileParentId);
-//        menu.setMenuType(1);
-//        menu.setTitle("查看记录");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setIcon("");
-//        menu.setAuthority("sys:file:list");
-//        menuService.save(menu);
-//        menu.setParentId(fileParentId);
-//        menu.setTitle("上传文件");
-//        menu.setAuthority("sys:file:upload");
-//        menuService.save(menu);
-//        menu.setParentId(fileParentId);
-//        menu.setTitle("修改文件");
-//        menu.setAuthority("sys:file:update");
-//        menuService.save(menu);
-//        menu.setParentId(fileParentId);
-//        menu.setTitle("删除文件");
-//        menu.setAuthority("sys:org:remove");
-//        menuService.save(menu);
-//        menu.setMenuType(0);
-//        menu.setParentId(parentId);
-//        menu.setTitle("系统设置");
-//        menu.setPath("/system/setting");
-//        menu.setComponent("/system/setting");
-//        menu.setIcon("setting-outlined");
-//        menu.setAuthority("sys:setting:save");
-//        menu.setSortNumber(10);
-//        menuService.save(menu);
-//        menu.setParentId(parentId);
-//        menu.setTitle("用户信息");
-//        menu.setPath("/system/user-info");
-//        menu.setComponent("/system/user-info");
-//        menu.setIcon("team-outlined");
-//        menu.setAuthority("");
-//        menu.setHide(1);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(9);
-//        menuService.save(menu);
-//        Integer userInfoParentId = menu.getMenuId();
-//        menu.setParentId(userInfoParentId);
-//        menu.setMenuType(1);
-//        menu.setTitle("修改个人密码");
-//        menu.setAuthority("sys:auth:password");
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menuService.save(menu);
-//        menu.setParentId(userInfoParentId);
-//        menu.setTitle("修改个人资料");
-//        menu.setAuthority("sys:auth:user");
-//        menuService.save(menu);
-//        menu.setTitle("扩展插件");
-//        menu.setParentId(parentId);
-//        menu.setIcon("AppstoreAddOutlined");
-//        menu.setPath("/system/appstore");
-//        menu.setComponent("/system/appstore");
-//        menu.setMenuType(0);
-//        menu.setAuthority("oa:app:list");
-//        menu.setSortNumber(100);
-//        menu.setHide(0);
-//        menuService.save(menu);
-//        // 1.控制台
-//        menu.setParentId(0);
-//        menu.setTitle("控制台");
-//        menu.setPath("/dashboard");
-//        menu.setIcon("home-outlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(1);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//        Integer dashboardParentId = menu.getMenuId();
-//        menu.setTitle("工作台");
-//        menu.setPath("/dashboard/workplace");
-//        menu.setComponent("/dashboard/workplace");
-//        menu.setIcon("DesktopOutlined");
-//        menu.setParentId(dashboardParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("统计分析");
-//        menu.setPath("/dashboard/analysis");
-//        menu.setComponent("/dashboard/analysis");
-//        menu.setIcon("BarChartOutlined");
-//        menu.setParentId(dashboardParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        // 2.办公协同
-//        menu.setParentId(0);
-//        menu.setTitle("办公协同");
-//        menu.setPath("/oa");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setMenuType(0);
-//        menu.setIcon("LaptopOutlined");
-//        menu.setHide(0);
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        Integer oaParentId = menu.getMenuId();
-//        menu.setParentId(oaParentId);
-//        menu.setTitle("服务器管理");
-//        menu.setPath("/oa/assets/server");
-//        menu.setComponent("/oa/assets/server");
-//        menu.setIcon("AuditOutlined");
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer serverParentId = menu.getMenuId();
-//        menu.setTitle("查询");
-//        menu.setParentId(serverParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("oa:assets:list");
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("oa:assets:save");
-//        menuService.save(menu);
-//        menu.setTitle("更新");
-//        menu.setAuthority("oa:assets:update");
-//        menuService.save(menu);
-//        menu.setTitle("移除");
-//        menu.setAuthority("oa:assets:remove");
-//        menuService.save(menu);
-//        menu.setParentId(oaParentId);
-//        menu.setMenuType(0);
-//        menu.setTitle("客户管理");
-//        menu.setPath("/oa/customer");
-//        menu.setComponent("/oa/customer");
-//        menu.setIcon("TeamOutlined");
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        Integer customerParentId = menu.getMenuId();
-//        menu.setParentId(customerParentId);
-//        menu.setTitle("查询");
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setSortNumber(0);
-//        menu.setAuthority("oa:customer:list");
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("oa:customer:save");
-//        menuService.save(menu);
-//        menu.setTitle("更新");
-//        menu.setAuthority("oa:customer:update");
-//        menuService.save(menu);
-//        menu.setTitle("移除");
-//        menu.setAuthority("oa:customer:remove");
-//        menuService.save(menu);
-//        // 3.商户管理
-//        menu.setParentId(0);
-//        menu.setTitle("商户管理");
-//        menu.setPath("/merchant");
-//        menu.setIcon("ShopOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(3);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//        Integer merchantParentId = menu.getMenuId();
-//        menu.setTitle("商户列表");
-//        menu.setPath("/merchant/index");
-//        menu.setComponent("/merchant/index");
-//        menu.setIcon("ShopOutlined");
-//        menu.setParentId(merchantParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer shopInfoParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(shopInfoParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:merchant:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:merchant:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:merchant:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:merchant:remove");
-//        menuService.save(menu);
-//        menu.setTitle("入驻审核");
-//        menu.setPath("/merchant/apply");
-//        menu.setComponent("/merchant/apply");
-//        menu.setIcon("HourglassOutlined");
-//        menu.setParentId(merchantParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        menu.setTitle("地址管理");
-//        menu.setPath("/merchant/address");
-//        menu.setComponent("/merchant/address");
-//        menu.setIcon("EnvironmentOutlined");
-//        menu.setParentId(merchantParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        menu.setTitle("店铺装修");
-//        menu.setPath("/merchant/decorate");
-//        menu.setComponent("/merchant/decorate");
-//        menu.setIcon("FormatPainterOutlined");
-//        menu.setParentId(merchantParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(3);
-//        menuService.save(menu);
-//        menu.setTitle("主题风格");
-//        menu.setPath("/merchant/theme");
-//        menu.setComponent("/merchant/theme");
-//        menu.setIcon("BgColorsOutlined");
-//        menu.setParentId(merchantParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(4);
-//        menuService.save(menu);
-//        menu.setTitle("资金提现");
-//        menu.setPath("/merchant/withdraw");
-//        menu.setComponent("/merchant/withdraw");
-//        menu.setIcon("RedEnvelopeOutlined");
-//        menu.setParentId(merchantParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(5);
-//        menuService.save(menu);
-//        // 4.商品管理
-//        menu.setParentId(0);
-//        menu.setTitle("商品管理");
-//        menu.setPath("/goods");
-//        menu.setIcon("ShoppingOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(4);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//        Integer goodsParentId = menu.getMenuId();
-//        menu.setTitle("商品列表");
-//        menu.setPath("/goods/index");
-//        menu.setComponent("/goods/index");
-//        menu.setIcon("SkinOutlined");
-//        menu.setParentId(goodsParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer shopIndexParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(shopIndexParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:goods:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:goods:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:goods:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:goods:remove");
-//        menuService.save(menu);
-//        menu.setTitle("商品分类");
-//        menu.setPath("/goods/category");
-//        menu.setComponent("/goods/category");
-//        menu.setIcon("ApartmentOutlined");
-//        menu.setParentId(goodsParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        Integer goodsCategoryParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(goodsCategoryParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:category:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:category:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:category:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:category:remove");
-//        menuService.save(menu);
-//        menu.setTitle("商品评价");
-//        menu.setPath("/goods/comment");
-//        menu.setComponent("/goods/comment");
-//        menu.setIcon("GiftOutlined");
-//        menu.setParentId(goodsParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        Integer goodsCommentParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(goodsCommentParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:comment:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:comment:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:comment:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:comment:remove");
-//        menuService.save(menu);
-//        menu.setTitle("服务承诺");
-//        menu.setPath("/goods/service");
-//        menu.setComponent("/goods/service");
-//        menu.setIcon("InsuranceOutlined");
-//        menu.setParentId(goodsParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(3);
-//        menuService.save(menu);
-//        Integer goodsServiceParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(goodsServiceParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:goodsService:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:goodsService:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:goodsService:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:goodsService:remove");
-//        menuService.save(menu);
-//        // 5.订单管理
-//        menu.setParentId(0);
-//        menu.setTitle("订单管理");
-//        menu.setPath("/order");
-//        menu.setIcon("CalendarOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(5);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//        Integer orderParentId = menu.getMenuId();
-//        menu.setTitle("全部订单");
-//        menu.setPath("/order/all");
-//        menu.setComponent("/order/all");
-//        menu.setIcon("ProfileOutlined");
-//        menu.setParentId(orderParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer orderAllParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(orderAllParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:order:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:order:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:order:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:order:remove");
-//        menuService.save(menu);
-//        menu.setTitle("退款单");
-//        menu.setPath("/order/refund");
-//        menu.setComponent("/order/refund");
-//        menu.setIcon("MoneyCollectOutlined");
-//        menu.setParentId(orderParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        menu.setTitle("发货管理");
-//        menu.setPath("/order/delivery");
-//        menu.setComponent("/order/delivery");
-//        menu.setIcon("CarOutlined");
-//        menu.setParentId(orderParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        menu.setTitle("订单导出");
-//        menu.setPath("/order/export");
-//        menu.setComponent("/order/export");
-//        menu.setIcon("UploadOutlined");
-//        menu.setParentId(orderParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(3);
-//        menuService.save(menu);
-//        // 6.用户管理
-//        menu.setParentId(0);
-//        menu.setTitle("用户管理");
-//        menu.setPath("/user");
-//        menu.setIcon("TeamOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(6);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//        Integer outUserParentId = menu.getMenuId();
-//        menu.setTitle("用户列表");
-//        menu.setPath("/user/index");
-//        menu.setComponent("/user/index");
-//        menu.setIcon("TeamOutlined");
-//        menu.setParentId(outUserParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer memberListParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(memberListParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:member:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:member:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:member:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:member:remove");
-//        menuService.save(menu);
-//        menu.setTitle("余额明细");
-//        menu.setPath("/user/balance-log");
-//        menu.setComponent("/user/balance-log");
-//        menu.setIcon("WalletOutlined");
-//        menu.setParentId(outUserParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        Integer balanceLogParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(balanceLogParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:memberBalanceLog:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:memberBalanceLog:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:memberBalanceLog:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:memberBalanceLog:remove");
-//        menuService.save(menu);
-//        menu.setTitle("充值记录");
-//        menu.setPath("/user/recharge");
-//        menu.setComponent("/user/recharge");
-//        menu.setIcon("UngroupOutlined");
-//        menu.setParentId(outUserParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        Integer userRechargeParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(userRechargeParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:memberRecharge:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:memberRecharge:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:memberRecharge:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:memberRecharge:remove");
-//        menuService.save(menu);
-//        menu.setTitle("消息提醒");
-//        menu.setPath("/user/notice");
-//        menu.setComponent("/user/notice");
-//        menu.setIcon("SoundOutlined");
-//        menu.setParentId(outUserParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(3);
-//        menuService.save(menu);
-//        Integer userNoticeParentId = menu.getMenuId();
-//        menu.setTitle("列表");
-//        menu.setParentId(userNoticeParentId);
-//        menu.setMenuType(1);
-//        menu.setPath("");
-//        menu.setIcon("");
-//        menu.setComponent("");
-//        menu.setAuthority("shop:memberNotice:list");
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("shop:memberNotice:save");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("shop:memberNotice:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("shop:memberNotice:remove");
-//        menuService.save(menu);
-//        // 7.内容管理
-//        menu.setParentId(0);
-//        menu.setTitle("内容管理");
-//        menu.setPath("/cms");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setIcon("FileSearchOutlined");
-//        menu.setHide(0);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(7);
-//        menuService.save(menu);
-//        Integer contentParentId = menu.getMenuId();
-//        menu.setTitle("文章管理");
-//        menu.setPath("/cms/article");
-//        menu.setComponent("/cms/article");
-//        menu.setIcon("FileSearchOutlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(1);
-//        menu.setMenuType(0);
-//        menu.setParentId(contentParentId);
-//        menuService.save(menu);
-//        Integer articleParentId = menu.getMenuId();
-//        menu.setParentId(articleParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setTitle("查询");
-//        menu.setSortNumber(0);
-//        menu.setAuthority("cms:article:list");
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("cms:article:save");
-//        menuService.save(menu);
-//        menu.setTitle("修改");
-//        menu.setAuthority("cms:article:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("cms:article:remove");
-//        menuService.save(menu);
-//        menu.setTitle("文章分类");
-//        menu.setPath("/cms/category");
-//        menu.setComponent("/cms/category");
-//        menu.setIcon("ApartmentOutlined");
-//        menu.setAuthority("");
-//        menu.setMenuType(0);
-//        menu.setSortNumber(2);
-//        menu.setParentId(contentParentId);
-//        menuService.save(menu);
-//        Integer categoryParentId = menu.getMenuId();
-//        menu.setParentId(categoryParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setSortNumber(0);
-//        menu.setTitle("查询");
-//        menu.setAuthority("cms:articleCategory:list");
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("cms:articleCategory:save");
-//        menuService.save(menu);
-//        menu.setTitle("修改");
-//        menu.setAuthority("cms:articleCategory:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("cms:articleCategory:remove");
-//        menuService.save(menu);
-//        menu.setTitle("文档管理");
-//        menu.setPath("/cms/docs/:id");
-//        menu.setComponent("/cms/docs");
-//        menu.setIcon("ReadOutlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(3);
-//        menu.setMenuType(0);
-//        menu.setParentId(contentParentId);
-//        menuService.save(menu);
-//        Integer docsParentId = menu.getMenuId();
-//        menu.setParentId(docsParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setSortNumber(0);
-//        menu.setTitle("查询");
-//        menu.setAuthority("cms:docs:list");
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("cms:docs:save");
-//        menuService.save(menu);
-//        menu.setTitle("修改");
-//        menu.setAuthority("cms:docs:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("cms:docs:remove");
-//        menuService.save(menu);
-//        menu.setTitle("视频管理");
-//        menu.setPath("/cms/video");
-//        menu.setComponent("/cms/video");
-//        menu.setIcon("YoutubeOutlined");
-//        menu.setAuthority("");
-//        menu.setSortNumber(4);
-//        menu.setMenuType(0);
-//        menu.setParentId(contentParentId);
-//        menuService.save(menu);
-//        Integer cmsVideoParentId = menu.getMenuId();
-//        menu.setParentId(cmsVideoParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setSortNumber(0);
-//        menu.setTitle("列表");
-//        menu.setAuthority("cms:file:list");
-//        menuService.save(menu);
-//        menu.setTitle("上传");
-//        menu.setAuthority("sys:file:upload");
-//        menuService.save(menu);
-//        menu.setTitle("编辑");
-//        menu.setAuthority("sys:file:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("sys:file:remove");
-//        menuService.save(menu);
-//        menu.setTitle("视频播放");
-//        menu.setIcon("");
-//        menu.setPath("/cms/video/player");
-//        menu.setComponent("/cms/video/player");
-//        menu.setMenuType(0);
-//        menu.setHide(1);
-//        menu.setMeta("{\"active\": \"/cms/video\", \"tabUnique\": false}");
-//        menuService.save(menu);
-//        menu.setTitle("文件下载");
-//        menu.setPath("/cms/down");
-//        menu.setComponent("/cms/down");
-//        menu.setIcon("LinkOutlined");
-//        menu.setAuthority("");
-//        menu.setHide(0);
-//        menu.setSortNumber(5);
-//        menu.setMenuType(0);
-//        menu.setParentId(contentParentId);
-//        menuService.save(menu);
-//        // 8.营销管理
-//        menu.setParentId(0);
-//        menu.setTitle("营销管理");
-//        menu.setPath("/market");
-//        menu.setIcon("CrownOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(8);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//        Integer marketParentId = menu.getMenuId();
-//        menu.setTitle("优惠券");
-//        menu.setPath("/market/coupon");
-//        menu.setComponent("/market/coupon");
-//        menu.setIcon("TagsOutlined");
-//        menu.setParentId(marketParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer marketCouponParentId = menu.getMenuId();
-//        menu.setParentId(marketCouponParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setTitle("查询");
-//        menu.setSortNumber(0);
-//        menu.setAuthority("cms:coupon:list");
-//        menuService.save(menu);
-//        menu.setTitle("添加");
-//        menu.setAuthority("cms:coupon:save");
-//        menuService.save(menu);
-//        menu.setTitle("修改");
-//        menu.setAuthority("cms:coupon:update");
-//        menuService.save(menu);
-//        menu.setTitle("删除");
-//        menu.setAuthority("cms:coupon:remove");
-//        menuService.save(menu);
-//        menu.setTitle("会员充值");
-//        menu.setPath("/market/recharge");
-//        menu.setComponent("/market/recharge");
-//        menu.setIcon("MoneyCollectOutlined");
-//        menu.setParentId(marketParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(1);
-//        menuService.save(menu);
-//        menu.setTitle("积分管理");
-//        menu.setPath("/market/points");
-//        menu.setComponent("/market/points");
-//        menu.setIcon("PayCircleOutlined");
-//        menu.setParentId(marketParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(2);
-//        menuService.save(menu);
-//        // 9.应用中心
-//        menu.setParentId(0);
-//        menu.setTitle("应用中心");
-//        menu.setPath("/apps");
-//        menu.setIcon("AppstoreAddOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setSortNumber(9);
-//        menu.setMenuType(0);
-//        menuService.save(menu);
-//
-//        // 个人中心
-//        menu.setParentId(0);
-//        menu.setTitle("个人中心");
-//        menu.setPath("/user-center");
-//        menu.setIcon("UserOutlined");
-//        menu.setComponent("");
-//        menu.setAuthority("");
-//        menu.setMenuType(0);
-//        menu.setHide(1);
-//        menu.setSortNumber(99);
-//        menuService.save(menu);
-//        Integer userCenterParentId = menu.getMenuId();
-//        menu.setTitle("个人资料");
-//        menu.setPath("/user/profile");
-//        menu.setComponent("/user/profile");
-//        menu.setIcon("IdcardOutlined");
-//        menu.setParentId(userCenterParentId);
-//        menu.setMenuType(0);
-//        menu.setSortNumber(0);
-//        menuService.save(menu);
-//        Integer userProfileParentId = menu.getMenuId();
-//        menu.setParentId(userProfileParentId);
-//        menu.setMenuType(1);
-//        menu.setIcon("");
-//        menu.setPath("");
-//        menu.setComponent("");
-//        menu.setTitle("修改资料");
-//        menu.setSortNumber(0);
-//        menu.setAuthority("sys:auth:user");
-//        menuService.save(menu);
-//        menu.setTitle("修改密码");
-//        menu.setAuthority("sys:auth:password");
-//        menuService.save(menu);
-//        menu.setTitle("上传头像");
-//        menu.setAuthority("sys:file:upload");
-//        menu.setTitle("预览头像");
-//        menu.setAuthority("sys:file:list");
-//        menu.setTitle("保存头像");
-//        menu.setAuthority("sys:user:update");
-//        menuService.save(menu);
-//        menu.setParentId(userCenterParentId);
-//        menu.setTitle("用户注册");
-//        menu.setAuthority("sys:user:save");
-//        menuService.save(menu);
-//        menu.setTitle("字典查询");
-//        menu.setAuthority("sys:dict:list");
-//
-//        boolean resultMenu = menuService.save(menu);
-//        // 添加菜单ID到超级管理员所属角色ID
-//        if (resultMenu) {
-//          saveRedis(tenant);
-//          return success("创建成功");
-//        }
-//      }
-//    }
-//    throw new BusinessException("创建失败");
-//  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:update')")
-  @OperationLog
-  @ApiOperation("修改租户")
-  @PutMapping()
-  public ApiResult<?> update(@RequestBody Tenant tenant) {
-    // 验证签名
-    isCheckSign();
-    saveRedis(tenant);
-    if (tenantService.updateById(tenant)) {
-      return success("修改成功");
-    }
-    return fail("修改失败");
-  }
-
-  // 缓存租户信息
-  private void saveRedis(Tenant tenant) {
-    String key = "cache:tenant";
-    String tenantId = tenant.getTenantId().toString();
-    if (StrUtil.isEmpty(tenant.getTenantCode())) {
-      tenant.setTenantCode(CommonUtil.randomUUID16());
-    }
-    String data = JSONUtil.toJSONString(tenant);
-    stringRedisTemplate.opsForHash().put(key,tenantId, data);
-  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:remove')")
-  @OperationLog
-  @ApiOperation("删除租户")
-  @DeleteMapping("/{id}")
-  public ApiResult<?> remove(@PathVariable("id") Integer id) {
-    // 验证签名
-    isCheckSign();
-    if (tenantService.removeById(id)) {
-      String key = "cache:tenant";
-      stringRedisTemplate.opsForHash().delete(key,id.toString());
-      return success("删除成功");
-    }
-    return fail("删除失败");
-  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:save')")
-  @OperationLog
-  @ApiOperation("批量添加租户")
-  @PostMapping("/batch")
-  public ApiResult<?> saveBatch(@RequestBody List<Tenant> list) {
-    // 验证签名
-    isCheckSign();
-    if (tenantService.saveBatch(list)) {
-      return success("添加成功");
-    }
-    return fail("添加失败");
-  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:update')")
-  @OperationLog
-  @ApiOperation("批量修改租户")
-  @PutMapping("/batch")
-  public ApiResult<?> removeBatch(@RequestBody BatchParam<Tenant> batchParam) {
-    // 验证签名
-    isCheckSign();
-    if (batchParam.update(tenantService, "tenant_id")) {
-      return success("修改成功");
-    }
-    return fail("修改失败");
-  }
-
-  @PreAuthorize("hasAuthority('oa:tenant:remove')")
-  @OperationLog
-  @ApiOperation("批量删除租户")
-  @DeleteMapping("/batch")
-  public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-    // 验证签名
-    isCheckSign();
-    if (tenantService.removeByIds(ids)) {
-      return success("删除成功");
-    }
-    return fail("删除失败");
-  }
-
-  @ApiOperation("租户角色权限初始化")
-  @GetMapping("/role-menu/{id}")
-  public ApiResult<List<Menu>> initialization(@PathVariable("id") Integer roleId) {
-    // 验证签名
-    isCheckSign();
-    List<Menu> menus = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSortNumber));
-    List<RoleMenu> roleMenus = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>()
-      .eq(RoleMenu::getRoleId, roleId));
-    for (Menu menu : menus) {
-      menu.setChecked(roleMenus.stream().anyMatch((d) -> d.getMenuId().equals(menu.getMenuId())));
-    }
-    List<Integer> menuIds = menus.stream().map(Menu::getMenuId).collect(Collectors.toList());
-    roleMenuService.remove(new LambdaUpdateWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
-    if (menuIds.size() > 0) {
-      List<RoleMenu> roleMenuList = new ArrayList<>();
-      for (Integer menuId : menuIds) {
-        RoleMenu roleMenu = new RoleMenu();
-        roleMenu.setRoleId(roleId);
-        roleMenu.setMenuId(menuId);
-        roleMenuList.add(roleMenu);
-      }
-      if (!roleMenuService.saveBatch(roleMenuList)) {
-        throw new BusinessException("保存失败");
-      }
-    }
-    return success(menus);
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenUserController.java b/src/main/java/com/gxwebsoft/open/controller/OpenUserController.java
deleted file mode 100644
index 3d4045e..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenUserController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.common.core.utils.MyQrCodeUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * 我的资料
- *
- * @author 科技小王子
- * @since 2023-04-24 21:47:57
- */
-@Api(tags = "我的资料")
-@RestController
-@RequestMapping("/api/open/user")
-public class OpenUserController extends BaseController {
-    @Resource
-    private UserService userService;
-
-    @ApiOperation("实时二维码")
-    @PostMapping("/myQrCode")
-    public ApiResult<?> myQrCode(@RequestBody UserParam userParam) throws IOException {
-      // 验证签名
-      isCheckSign();
-      final String qrCode = MyQrCodeUtil.createQrCode(getLoginUserId(), userParam.getCodeContent());
-      return success("操作成功",qrCode);
-    }
-
-    @ApiOperation("获取代理用户信息")
-    @GetMapping("/agentUser/{id}")
-    public ApiResult<User> agentUser(@PathVariable("id") Integer id){
-      User user = userService.getById(id);
-      return success("操作成功",user);
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java b/src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java
deleted file mode 100644
index c6a6218..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenUserOrderController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 用户-我的订单
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "我的订单")
-@RestController
-@RequestMapping("/api/open/user-order")
-public class OpenUserOrderController extends BaseController {
-    @Resource
-    private OrderService orderService;
-
-    @ApiOperation("分页查询用户订单")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Order>> page(OrderParam param) {
-      // 验证签名
-      isCheckSign();
-      PageParam<Order, OrderParam> page = new PageParam<>(param);
-      page.setDefaultOrder("create_time desc");
-      // 记录当前登录用户id、租户id
-      User user = getLoginUser();
-      if (user != null) {
-        param.setUserId(user.getUserId());
-        param.setTenantId(user.getTenantId());
-      }
-      // 使用关联查询
-      return success(orderService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部用户订单")
-    @GetMapping()
-    public ApiResult<List<Order>> list(OrderParam param) {
-        // 验证签名
-        isCheckSign();
-        PageParam<Order, OrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        // 记录当前登录用户id、租户id
-        User user = getLoginUser();
-        if (user != null) {
-          param.setUserId(user.getUserId());
-          param.setTenantId(user.getTenantId());
-        }
-
-        // 使用关联查询
-        return success(orderService.listRel(param));
-    }
-
-    @ApiOperation("测试")
-    @GetMapping("/test")
-    public ApiResult<PageResult<Order>> test(OrderParam param) {
-      // 验证签名
-      isCheckSign();
-      PageParam<Order, OrderParam> page = new PageParam<>(param);
-      page.setDefaultOrder("create_time desc");
-      // 记录当前登录用户id、租户id
-      User user = getLoginUser();
-      if (user != null) {
-        param.setUserId(user.getUserId());
-        param.setTenantId(user.getTenantId());
-      }
-      // 使用关联查询
-      return success(orderService.pageRel(param));
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java b/src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java
deleted file mode 100644
index 4c3d023..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenWxOfficialController.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.WxOfficialUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.LoginRecord;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.service.LoginRecordService;
-import com.gxwebsoft.common.system.service.SettingService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.oa.service.NoticeService;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import com.gxwebsoft.shop.service.UserOauthService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.concurrent.TimeUnit;
-
-import static com.gxwebsoft.common.core.utils.CommonUtil.randomUsername;
-
-/**
- * 微信公众号接口
- *
- * @author WebSoft
- * @since 2022-11-19 13:54:27
- */
-@Api(tags = "微信公众号授权登录")
-@RestController
-@RequestMapping("/api/open/wx-official")
-public class OpenWxOfficialController extends BaseController {
-    @Resource
-    private ConfigProperties configProperties;
-    @Resource
-    private WxOfficialUtil wxOfficialUtil;
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserOauthService userOauthService;
-    @Resource
-    private LoginRecordService loginRecordService;
-    @Resource
-    private SettingService settingService;
-
-  public OpenWxOfficialController() {
-  }
-
-  @ApiOperation("第一步：用户同意授权，获取code")
-    @GetMapping("/code")
-    public ApiResult<?> code() throws UnsupportedEncodingException {
-      WxOfficialUtil client = wxOfficialUtil.client(getTenantId());
-      String codeUrl = client.getCodeUrl();
-      return success(codeUrl);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @ApiOperation("第二步：通过code换取网页授权access_token")
-    @GetMapping("/accessToken")
-    public String accessToken(String code, String state, HttpServletRequest request, HttpServletResponse resp) throws IOException {
-      if(StrUtil.equals(state,"STATE")){
-        throw new BusinessException("租户ID不正确");
-      }
-
-      // 1.实例化
-      WxOfficialUtil client = wxOfficialUtil.client(Integer.valueOf(state));
-
-      // 2.获取access_token
-      final String access_token = client.getAccessToken(code);
-
-      // 准备数据
-      final String unionid = client.unionid;
-      final String expires_in = client.expires_in;
-      final JSONObject cache = settingService.getCache("cache".concat(state).concat(":setting:setting"));
-      final String domain = "https://" + cache.getString("domain");
-
-      // 3.查询第三方用户信息表
-      UserOauthParam userOauthParam = new UserOauthParam();
-      userOauthParam.setUnionid(unionid);
-      userOauthParam.setTenantId(Integer.valueOf(state));
-      System.out.println("userOauthParam = " + userOauthParam);
-      final UserOauth oauthUser = userOauthService.getByUnionId(userOauthParam);
-      System.out.println("oauthUser = " + oauthUser);
-
-      // 4.1存在签发token
-      if(oauthUser != null){
-        UserParam userParam = new UserParam();
-        userParam.setUserId(oauthUser.getUserId());
-        userParam.setTenantId(Integer.valueOf(state));
-        System.out.println("userParam = " + userParam);
-        User user = userService.getByUnionId(userParam);
-        // 5.签发token
-        System.out.println("user = 签发token " + user);
-        String wx_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), Integer.valueOf(state)),
-          configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-        resp.sendRedirect(domain + "/passport/wx-official-login?token=".concat(wx_token).concat("&username=").concat(user.getUsername()));
-        return "登录成功";
-      }
-      // 4.2不存在则注册并登录签发token
-      final JSONObject userInfo = client.getUserInfo(access_token);
-      final String openid = userInfo.getString("openid");
-      final String unionId = userInfo.getString("unionid");
-      final String nickname = userInfo.getString("nickname");
-      final String sex = userInfo.getString("sex");
-      final String province = userInfo.getString("province");
-      final String city = userInfo.getString("city");
-      final String country = userInfo.getString("country");
-      final String headimgurl = userInfo.getString("headimgurl");
-      System.out.println("headimgurl = " + headimgurl);
-      System.out.println("unionId = " + unionId);
-      System.out.println("openid = " + openid);
-      System.out.println("nickname = " + nickname);
-      User user = new User();
-      user.setNickname(nickname);
-      user.setType(0);
-      user.setUsername(randomUsername("wx_"));
-      user.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-      user.setSex(sex);
-      user.setPlatform("WX-OFFICIAL");
-      user.setProvince(province);
-      user.setCity(city);
-      user.setCountry(country);
-      user.setAvatar(headimgurl);
-      user.setTenantId(Integer.valueOf(state));
-      userService.saveUser(user);
-      System.out.println("userLast = " + user);
-      UserOauth userOauth = new UserOauth();
-      userOauth.setTenantId(Integer.valueOf(state));
-      userOauth.setOauthType("WX-OFFICIAL");
-      userOauth.setOauthId(openid);
-      userOauth.setUnionid(unionId);
-      userOauth.setUserId(user.getUserId());
-      userOauthService.save(userOauth);
-      loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, Integer.valueOf(state), request);
-      // 5.签发token
-      String wx_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), Integer.valueOf(state)),
-        configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-      resp.sendRedirect(domain + "/passport/wx-official-login?token=".concat(wx_token).concat("&username=").concat(user.getUsername()));
-      return "注册成功";
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java b/src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java
deleted file mode 100644
index 5f3dda7..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/OpenWxWorkController.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import cn.hutool.http.HttpUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.security.JwtSubject;
-import com.gxwebsoft.common.core.security.JwtUtil;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.WxWorkUtil;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.LoginRecord;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.entity.UserRole;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.common.system.result.LoginResult;
-import com.gxwebsoft.common.system.service.LoginRecordService;
-import com.gxwebsoft.common.system.service.SettingService;
-import com.gxwebsoft.common.system.service.UserRoleService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import com.gxwebsoft.shop.service.UserOauthService;
-import com.qq.weixin.mp.aes.AesException;
-import com.qq.weixin.mp.aes.WXBizJsonMsgCrypt;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.HashMap;
-
-/**
- * 企业微信接口
- *
- * @author WebSoft
- * @since 2022-11-19 13:54:27
- */
-@Api(tags = "企业微信验证")
-@RestController
-@RequestMapping("/api/open/wx-work")
-public class OpenWxWorkController extends BaseController {
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-    @Resource
-    private ConfigProperties configProperties;
-    @Resource
-    private WxWorkUtil workUtil;
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserOauthService userOauthService;
-    @Resource
-    private LoginRecordService loginRecordService;
-    @Resource
-    private SettingService settingService;
-    @Resource
-    private UserRoleService userRoleService;
-
-    @ApiOperation("第一步：请求验证URL有效性")
-    @GetMapping()
-    public String msgSignature(HttpServletRequest request) throws AesException {
-      String sToken = "gFJXh4y2QAg5gm6U";
-      String sCorpID = "wxa040285bc1c223ae";
-      String sEncodingAESKey = "MRYqPeaVleIZDzgS2O8CoyyRwAYBOD9wQAztSfLMWaA";
-
-      WXBizJsonMsgCrypt wxcpt = new WXBizJsonMsgCrypt(sToken, sEncodingAESKey, sCorpID);
-
-      // 解析出url上的参数值如下：
-      final String sVerifyMsgSig = request.getParameter("msg_signature");
-      final String sVerifyTimeStamp = request.getParameter("timestamp");
-      final String sVerifyNonce = request.getParameter("nonce");
-      final String sVerifyEchoStr = request.getParameter("echostr");
-      String sEchoStr; //需要返回的明文
-      System.out.println("sVerifyMsgSig = " + sVerifyMsgSig);
-      System.out.println("sVerifyTimeStamp = " + sVerifyTimeStamp);
-      System.out.println("sVerifyNonce = " + sVerifyNonce);
-      System.out.println("sVerifyEchoStr = " + sVerifyEchoStr);
-
-      try {
-        sEchoStr = wxcpt.VerifyURL(sVerifyMsgSig, sVerifyTimeStamp,
-          sVerifyNonce, sVerifyEchoStr);
-        System.out.println("verifyurl echostr: " + sEchoStr);
-        // 验证URL成功，将sEchoStr返回
-        return sEchoStr;
-      } catch (Exception e) {
-        //验证URL失败，错误原因请查看异常
-        e.printStackTrace();
-      }
-      return "验证失败";
-    }
-
-    @ApiOperation("获取access_token并登录")
-    @GetMapping("/saveAccessToken")
-    public ApiResult<?> saveAccessToken(HttpServletRequest request, HttpServletResponse resp) throws IOException {
-      System.out.println("request = " + request);
-      final String code = request.getParameter("code");
-      final String state = request.getParameter("state");
-      final Integer tenantId = Integer.valueOf(state);
-      System.out.println("code = " + code);
-      System.out.println("state = " + state);
-      // 1.实例化
-      WxWorkUtil client = workUtil.client(tenantId);
-      // 2.获取access_token
-      String key = "cache"+ tenantId +":ww:access_token";
-      String access_token = stringRedisTemplate.opsForValue().get(key);
-      System.out.println("access_token_cache = " + access_token);
-      if (access_token == null){
-        client.getAccessToken(code);
-      }
-      // 3.获取用户信息
-      client.getUserInfo(code,access_token);
-
-      // 3.2 读取用户详细信息
-      client.getUserProfile(client.userid,access_token);
-
-      // 4.查询第三方用户信息表
-      UserOauthParam userOauthParam = new UserOauthParam();
-      userOauthParam.setOauthId(client.userid);
-      userOauthParam.setUnionid(client.userid);
-      userOauthParam.setTenantId(tenantId);
-      System.out.println("userOauthParam = " + userOauthParam);
-      final UserOauth oauthUser = userOauthService.getByUnionId(userOauthParam);
-      System.out.println("oauthUser = " + oauthUser);
-
-      // 4.1存在签发token
-      if(oauthUser != null){
-        UserParam userParam = new UserParam();
-        userParam.setUserId(oauthUser.getUserId());
-        userParam.setTenantId(tenantId);
-        System.out.println("userParam = " + userParam);
-        User user = userService.getByUnionId(userParam);
-        // 5.签发token
-        System.out.println("user = 签发token " + user);
-        String ww_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), tenantId),
-          configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-        resp.sendRedirect("http://apps.gxwebsoft.com/baocan/#/?ww_token=" + ww_token + "&userId=" + user.getUserId());
-        return success("登录成功",new LoginResult(ww_token, user));
-      }
-      // 4.2不存在则注册并登录签发token
-      User user = new User();
-      user.setNickname(client.name);
-      user.setUsername(client.userid);
-      user.setPhone(client.mobile);
-      user.setSex(client.gender);
-      user.setPosition(client.position);
-      user.setEmail(client.email);
-      user.setAlias(client.alias);
-      user.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-      user.setPlatform("WX-WORK");
-      user.setTenantId(tenantId);
-      userService.saveUser(user);
-      System.out.println("userLast = " + user);
-      // 添加默认角色
-      UserRole userRole = new UserRole();
-      userRole.setRoleId(241);
-      userRole.setUserId(user.getUserId());
-      userRole.setTenantId(tenantId);
-      userRoleService.save(userRole);
-      // 添加第三方用户信息
-      UserOauth userOauth = new UserOauth();
-      userOauth.setTenantId(tenantId);
-      userOauth.setOauthType("WX-WORK");
-      userOauth.setOauthId(client.userid);
-      userOauth.setUnionid(client.userid);
-      userOauth.setUserId(user.getUserId());
-      userOauthService.save(userOauth);
-      loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, tenantId, request);
-      // 5.签发token
-      String ww_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), tenantId),
-        configProperties.getTokenExpireTime(), configProperties.getTokenKey());
-      resp.sendRedirect("http://apps.gxwebsoft.com/baocan/#/?ww_token=" + ww_token + "&userId=" + user.getUserId());
-      return success("注册成功",new LoginResult(ww_token, user));
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java b/src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java
deleted file mode 100644
index b9ed14b..0000000
--- a/src/main/java/com/gxwebsoft/open/controller/VerifyTxt.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.gxwebsoft.open.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(tags = "域名所有权验证")
-@RestController
-@RequestMapping("/5zbYEPkyV4.txt")
-public class VerifyTxt {
-
-  @ApiOperation("域名所有权验证")
-  @GetMapping()
-  public String verify(){
-    return "82e8e3cf87f99ba1e31d2c103133fcab";
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/open/entity/WxWork.java b/src/main/java/com/gxwebsoft/open/entity/WxWork.java
deleted file mode 100644
index fbc608c..0000000
--- a/src/main/java/com/gxwebsoft/open/entity/WxWork.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gxwebsoft.open.entity;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * 企业微信登录传参
- *
- * @author WebSoft
- * @since 2022-11-16 11:13:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "企业微信登录传参", description = "企业微信登录传参")
-public class WxWork implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private String msg_signature;
-    private String timestamp;
-    private String nonce;
-    private String echostr;
-}
diff --git a/src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java b/src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java
deleted file mode 100644
index 4ea8bd9..0000000
--- a/src/main/java/com/gxwebsoft/shop/config/ExpressConfig.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gxwebsoft.shop.config;
-
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-@Configuration
-@PropertySource("classpath:express.properties")
-@ConfigurationProperties(prefix = "express")
-@Data
-public class ExpressConfig {
-  // 开发者ID
-  private Long devId;
-  // 开发者密钥
-  private String devKey;
-  // 店铺ID
-  private String shopId;
-  // 加密签名
-  private String sign;
-  // 顺丰IP地址
-  private String serverHost;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java b/src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java
deleted file mode 100644
index 92f69da..0000000
--- a/src/main/java/com/gxwebsoft/shop/config/WxPayConfig.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gxwebsoft.shop.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-@Configuration
-@PropertySource("classpath:wxpay.properties")
-@ConfigurationProperties(prefix = "wxpay")
-@Data
-public class WxPayConfig {
-
-  // 商户号
-  private String mchId;
-
-  // 证书序列号
-  private String mchSerialNo;
-
-  // 商户私钥文件
-  private String privateKeyPath;
-
-  // APIv3秘钥
-  private String apiV3Key;
-
-  // APPID
-  private String appId;
-
-  // 微信服务器地址
-  private String domain;
-
-  // 接受结果通知地址
-  private String notifyDomain;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java b/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java
deleted file mode 100644
index 9d89989..0000000
--- a/src/main/java/com/gxwebsoft/shop/constants/OrderConstants.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.gxwebsoft.shop.constants;
-
-public class OrderConstants {
-  // 订单来源 10普通订单 20砍价订单 30秒杀订单
-  public static final Integer ORDER_SOURCE = 10; // 普通订单
-  public static final Integer ORDER_SOURCE_BARGAIN = 20; // 砍价订单
-  public static final Integer ORDER_SOURCE_SHARP= 30; // 秒杀订单
-
-  // 订单商品
-  public static final Integer ORDER_GOODS_DELIVERY_STATUS10 = 10; // 未发货
-  public static final Integer ORDER_GOODS_DELIVERY_STATUS20 = 20; // 已发货
-  public static final Integer ORDER_GOODS_DELIVERY_STATUS30 = 30; // 部分发货
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/CartController.java b/src/main/java/com/gxwebsoft/shop/controller/CartController.java
deleted file mode 100644
index 1c4ff41..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/CartController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Cart;
-import com.gxwebsoft.shop.param.CartParam;
-import com.gxwebsoft.shop.service.CartService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 购物车记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "购物车记录表管理")
-@RestController
-@RequestMapping("/api/shop/cart")
-public class CartController extends BaseController {
-    @Resource
-    private CartService cartService;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    @PreAuthorize("hasAuthority('shop:cart:list')")
-    @ApiOperation("分页查询购物车记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Cart>> page(CartParam param) {
-        PageParam<Cart, CartParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(cartService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(cartService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:list')")
-    @ApiOperation("查询全部购物车记录表")
-    @GetMapping()
-    public ApiResult<List<Cart>> list(CartParam param) {
-//        PageParam<Cart, CartParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(cartService.list(page.getOrderWrapper()));
-        // 使用关联查询
-
-        return success(cartService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:list')")
-    @ApiOperation("根据id查询购物车记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Cart> get(@PathVariable("id") Integer id) {
-        return success(cartService.getById(id));
-        // 使用关联查询
-        //return success(cartService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:save')")
-    @ApiOperation("添加购物车记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Cart cart) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        // 存入redis
-        Map<String,Object> userMap = BeanUtil.beanToMap(loginUser);
-        String userMapKey = "oa:cart:".concat(loginUser.getUserId().toString());
-        stringRedisTemplate.opsForHash().putAll(userMapKey,userMap);
-        stringRedisTemplate.expire(userMapKey,30, TimeUnit.MINUTES);
-
-        if (loginUser != null) {
-          cart.setUserId(loginUser.getUserId());
-        }
-        if (cartService.save(cart)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:update')")
-    @ApiOperation("修改购物车记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Cart cart) {
-        if (cartService.updateById(cart)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:remove')")
-    @ApiOperation("删除购物车记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (cartService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:save')")
-    @ApiOperation("批量添加购物车记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Cart> list) {
-        if (cartService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:update')")
-    @ApiOperation("批量修改购物车记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Cart> batchParam) {
-        if (batchParam.update(cartService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:cart:remove')")
-    @ApiOperation("批量删除购物车记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (cartService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java b/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java
deleted file mode 100644
index 3d59385..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/CategoryController.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.CategoryService;
-import com.gxwebsoft.shop.entity.Category;
-import com.gxwebsoft.shop.param.CategoryParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商品分类表控制器
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-@Api(tags = "商品分类表管理")
-@RestController
-@RequestMapping("/api/shop/category")
-public class CategoryController extends BaseController {
-    @Resource
-    private CategoryService categoryService;
-
-    @PreAuthorize("hasAuthority('shop:category:list')")
-    @ApiOperation("分页查询商品分类表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Category>> page(CategoryParam param) {
-        PageParam<Category, CategoryParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-        page.setDefaultOrder("sort_number");
-        return success(categoryService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(categoryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:list')")
-    @ApiOperation("查询全部商品分类表")
-    @GetMapping()
-    public ApiResult<List<Category>> list(CategoryParam param) {
-        PageParam<Category, CategoryParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-        page.setDefaultOrder("sort_number");
-        return success(categoryService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(categoryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:list')")
-    @ApiOperation("根据id查询商品分类表")
-    @GetMapping("/{id}")
-    public ApiResult<Category> get(@PathVariable("id") Integer id) {
-        return success(categoryService.getById(id));
-        // 使用关联查询
-        //return success(categoryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:save')")
-    @ApiOperation("添加商品分类表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Category category) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          category.setUserId(loginUser.getUserId());
-        }
-        if (categoryService.save(category)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:update')")
-    @ApiOperation("修改商品分类表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Category category) {
-        if (categoryService.updateById(category)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:remove')")
-    @ApiOperation("删除商品分类表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (categoryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:save')")
-    @ApiOperation("批量添加商品分类表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Category> list) {
-        if (categoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:update')")
-    @ApiOperation("批量修改商品分类表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Category> batchParam) {
-        if (batchParam.update(categoryService, "category_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:category:remove')")
-    @ApiOperation("批量删除商品分类表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (categoryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/CommentController.java b/src/main/java/com/gxwebsoft/shop/controller/CommentController.java
deleted file mode 100644
index b348374..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/CommentController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.CommentService;
-import com.gxwebsoft.shop.entity.Comment;
-import com.gxwebsoft.shop.param.CommentParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商品评价记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-23 21:18:56
- */
-@Api(tags = "商品评价记录表管理")
-@RestController
-@RequestMapping("/api/shop/comment")
-public class CommentController extends BaseController {
-    @Resource
-    private CommentService commentService;
-
-    @PreAuthorize("hasAuthority('shop:comment:list')")
-    @ApiOperation("分页查询商品评价记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Comment>> page(CommentParam param) {
-        PageParam<Comment, CommentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(commentService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(commentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:list')")
-    @ApiOperation("查询全部商品评价记录表")
-    @GetMapping()
-    public ApiResult<List<Comment>> list(CommentParam param) {
-        PageParam<Comment, CommentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(commentService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(commentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:list')")
-    @ApiOperation("根据id查询商品评价记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Comment> get(@PathVariable("id") Integer id) {
-        return success(commentService.getById(id));
-        // 使用关联查询
-        //return success(commentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:save')")
-    @ApiOperation("添加商品评价记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Comment comment) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          comment.setUserId(loginUser.getUserId());
-        }
-        if (commentService.save(comment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:update')")
-    @ApiOperation("修改商品评价记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Comment comment) {
-        if (commentService.updateById(comment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:remove')")
-    @ApiOperation("删除商品评价记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (commentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:save')")
-    @ApiOperation("批量添加商品评价记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Comment> list) {
-        if (commentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:update')")
-    @ApiOperation("批量修改商品评价记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Comment> batchParam) {
-        if (batchParam.update(commentService, "comment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:comment:remove')")
-    @ApiOperation("批量删除商品评价记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (commentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/CouponController.java b/src/main/java/com/gxwebsoft/shop/controller/CouponController.java
deleted file mode 100644
index 1c491d5..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/CouponController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.CouponService;
-import com.gxwebsoft.shop.entity.Coupon;
-import com.gxwebsoft.shop.param.CouponParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 优惠券记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-28 18:26:05
- */
-@Api(tags = "优惠券记录表管理")
-@RestController
-@RequestMapping("/api/shop/coupon")
-public class CouponController extends BaseController {
-    @Resource
-    private CouponService couponService;
-
-    @PreAuthorize("hasAuthority('shop:coupon:list')")
-    @ApiOperation("分页查询优惠券记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Coupon>> page(CouponParam param) {
-        PageParam<Coupon, CouponParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(couponService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(couponService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:list')")
-    @ApiOperation("查询全部优惠券记录表")
-    @GetMapping()
-    public ApiResult<List<Coupon>> list(CouponParam param) {
-        PageParam<Coupon, CouponParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(couponService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(couponService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:list')")
-    @ApiOperation("根据id查询优惠券记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Coupon> get(@PathVariable("id") Integer id) {
-        return success(couponService.getById(id));
-        // 使用关联查询
-        //return success(couponService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:save')")
-    @ApiOperation("添加优惠券记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Coupon coupon) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          coupon.setUserId(loginUser.getUserId());
-        }
-        if (couponService.save(coupon)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:update')")
-    @ApiOperation("修改优惠券记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Coupon coupon) {
-        if (couponService.updateById(coupon)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:remove')")
-    @ApiOperation("删除优惠券记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (couponService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:save')")
-    @ApiOperation("批量添加优惠券记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Coupon> list) {
-        if (couponService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:update')")
-    @ApiOperation("批量修改优惠券记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Coupon> batchParam) {
-        if (batchParam.update(couponService, "coupon_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:coupon:remove')")
-    @ApiOperation("批量删除优惠券记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (couponService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/ExpressController.java b/src/main/java/com/gxwebsoft/shop/controller/ExpressController.java
deleted file mode 100644
index e1d95b3..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/ExpressController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.ExpressService;
-import com.gxwebsoft.shop.entity.Express;
-import com.gxwebsoft.shop.param.ExpressParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 物流公司记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-22 00:21:07
- */
-@Api(tags = "物流公司记录表管理")
-@RestController
-@RequestMapping("/api/shop/express")
-public class ExpressController extends BaseController {
-    @Resource
-    private ExpressService expressService;
-
-    @PreAuthorize("hasAuthority('shop:express:list')")
-    @ApiOperation("分页查询物流公司记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Express>> page(ExpressParam param) {
-        PageParam<Express, ExpressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(expressService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(expressService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:list')")
-    @ApiOperation("查询全部物流公司记录表")
-    @GetMapping()
-    public ApiResult<List<Express>> list(ExpressParam param) {
-        PageParam<Express, ExpressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(expressService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(expressService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:list')")
-    @ApiOperation("根据id查询物流公司记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Express> get(@PathVariable("id") Integer id) {
-        return success(expressService.getById(id));
-        // 使用关联查询
-        //return success(expressService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:save')")
-    @ApiOperation("添加物流公司记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Express express) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          express.setUserId(loginUser.getUserId());
-        }
-        if (expressService.save(express)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:update')")
-    @ApiOperation("修改物流公司记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Express express) {
-        if (expressService.updateById(express)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:remove')")
-    @ApiOperation("删除物流公司记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (expressService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:save')")
-    @ApiOperation("批量添加物流公司记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Express> list) {
-        if (expressService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:update')")
-    @ApiOperation("批量修改物流公司记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Express> batchParam) {
-        if (batchParam.update(expressService, "express_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:express:remove')")
-    @ApiOperation("批量删除物流公司记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (expressService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java
deleted file mode 100644
index 5d07963..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/GoodsController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.param.GoodsParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商品记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-@Api(tags = "商品记录表管理")
-@RestController
-@RequestMapping("/api/shop/goods")
-public class GoodsController extends BaseController {
-    @Resource
-    private GoodsService goodsService;
-
-    @PreAuthorize("hasAuthority('shop:goods:list')")
-    @ApiOperation("分页查询商品记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Goods>> page(GoodsParam param) {
-//        PageParam<Goods, GoodsParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(goodsService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(goodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:list')")
-    @ApiOperation("查询全部商品记录表")
-    @GetMapping()
-    public ApiResult<List<Goods>> list(GoodsParam param) {
-//        PageParam<Goods, GoodsParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(goodsService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(goodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:list')")
-    @ApiOperation("根据id查询商品记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Goods> get(@PathVariable("id") Integer id) {
-        return success(goodsService.getById(id));
-        // 使用关联查询
-        //return success(goodsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:save')")
-    @ApiOperation("添加商品记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Goods goods) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          goods.setUserId(loginUser.getUserId());
-        }
-        if (goodsService.save(goods)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:update')")
-    @ApiOperation("修改商品记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Goods goods) {
-        if (goodsService.updateById(goods)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:remove')")
-    @ApiOperation("删除商品记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (goodsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:save')")
-    @ApiOperation("批量添加商品记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Goods> list) {
-        if (goodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:update')")
-    @ApiOperation("批量修改商品记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Goods> batchParam) {
-        if (batchParam.update(goodsService, "goods_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goods:remove')")
-    @ApiOperation("批量删除商品记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (goodsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java b/src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java
deleted file mode 100644
index a0e8d57..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/GoodsServiceController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.GoodsServiceService;
-import com.gxwebsoft.shop.entity.GoodsService;
-import com.gxwebsoft.shop.param.GoodsServiceParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商品服务与承诺记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-23 21:57:50
- */
-@Api(tags = "商品服务与承诺记录表管理")
-@RestController
-@RequestMapping("/api/shop/goods-service")
-public class GoodsServiceController extends BaseController {
-    @Resource
-    private GoodsServiceService goodsServiceService;
-
-    @PreAuthorize("hasAuthority('shop:goodsService:list')")
-    @ApiOperation("分页查询商品服务与承诺记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<GoodsService>> page(GoodsServiceParam param) {
-        PageParam<GoodsService, GoodsServiceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time asc");
-        return success(goodsServiceService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(goodsServiceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:list')")
-    @ApiOperation("查询全部商品服务与承诺记录表")
-    @GetMapping()
-    public ApiResult<List<GoodsService>> list(GoodsServiceParam param) {
-        PageParam<GoodsService, GoodsServiceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(goodsServiceService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(goodsServiceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:list')")
-    @ApiOperation("根据id查询商品服务与承诺记录表")
-    @GetMapping("/{id}")
-    public ApiResult<GoodsService> get(@PathVariable("id") Integer id) {
-        return success(goodsServiceService.getById(id));
-        // 使用关联查询
-        //return success(goodsServiceService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:save')")
-    @ApiOperation("添加商品服务与承诺记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody GoodsService goodsService) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          goodsService.setUserId(loginUser.getUserId());
-        }
-        if (goodsServiceService.save(goodsService)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:update')")
-    @ApiOperation("修改商品服务与承诺记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody GoodsService goodsService) {
-        if (goodsServiceService.updateById(goodsService)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:remove')")
-    @ApiOperation("删除商品服务与承诺记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (goodsServiceService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:save')")
-    @ApiOperation("批量添加商品服务与承诺记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<GoodsService> list) {
-        if (goodsServiceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:update')")
-    @ApiOperation("批量修改商品服务与承诺记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<GoodsService> batchParam) {
-        if (batchParam.update(goodsServiceService, "service_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:goodsService:remove')")
-    @ApiOperation("批量删除商品服务与承诺记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (goodsServiceService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/MemberController.java b/src/main/java/com/gxwebsoft/shop/controller/MemberController.java
deleted file mode 100644
index cfb75a2..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/MemberController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.MemberService;
-import com.gxwebsoft.shop.entity.Member;
-import com.gxwebsoft.shop.param.MemberParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商城会员控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 14:02:24
- */
-@Api(tags = "商城会员管理")
-@RestController
-@RequestMapping("/api/shop/member")
-public class MemberController extends BaseController {
-    @Resource
-    private MemberService memberService;
-
-    @PreAuthorize("hasAuthority('shop:member:list')")
-    @ApiOperation("分页查询商城会员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Member>> page(MemberParam param) {
-        PageParam<Member, MemberParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(memberService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(memberService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:list')")
-    @ApiOperation("查询全部商城会员")
-    @GetMapping()
-    public ApiResult<List<Member>> list(MemberParam param) {
-        PageParam<Member, MemberParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-//        return success(memberService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(memberService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:list')")
-    @ApiOperation("根据id查询商城会员")
-    @GetMapping("/{id}")
-    public ApiResult<Member> get(@PathVariable("id") Integer id) {
-        return success(memberService.getById(id));
-        // 使用关联查询
-        //return success(memberService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:save')")
-    @ApiOperation("添加商城会员")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Member member) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          member.setUserId(loginUser.getUserId());
-        }
-        if (memberService.save(member)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:update')")
-    @ApiOperation("修改商城会员")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Member member) {
-        if (memberService.updateById(member)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:remove')")
-    @ApiOperation("删除商城会员")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (memberService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:save')")
-    @ApiOperation("批量添加商城会员")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Member> list) {
-        if (memberService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:update')")
-    @ApiOperation("批量修改商城会员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Member> batchParam) {
-        if (batchParam.update(memberService, "member_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:member:remove')")
-    @ApiOperation("批量删除商城会员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (memberService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java b/src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java
deleted file mode 100644
index 6ad5916..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/MerchantClerkController.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.service.MerchantClerkService;
-import com.gxwebsoft.shop.entity.MerchantClerk;
-import com.gxwebsoft.shop.param.MerchantClerkParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商家门店店员表控制器
- *
- * @author 科技小王子
- * @since 2022-11-30 16:32:25
- */
-@Api(tags = "商家门店店员表管理")
-@RestController
-@RequestMapping("/api/shop/merchant-clerk")
-public class MerchantClerkController extends BaseController {
-    @Resource
-    private MerchantClerkService merchantClerkService;
-    @Resource
-    private UserService userService;
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:list')")
-    @ApiOperation("分页查询商家门店店员表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<MerchantClerk>> page(MerchantClerkParam param) {
-        PageParam<MerchantClerk, MerchantClerkParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(merchantClerkService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(merchantClerkService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:list')")
-    @ApiOperation("查询全部商家门店店员表")
-    @GetMapping()
-    public ApiResult<List<MerchantClerk>> list(MerchantClerkParam param) {
-        PageParam<MerchantClerk, MerchantClerkParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(merchantClerkService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        return success(merchantClerkService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:list')")
-    @ApiOperation("根据id查询商家门店店员表")
-    @GetMapping("/{id}")
-    public ApiResult<MerchantClerk> get(@PathVariable("id") Integer id) {
-        return success(merchantClerkService.getById(id));
-        // 使用关联查询
-        //return success(merchantClerkService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:save')")
-    @ApiOperation("添加商家门店店员表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody MerchantClerk merchantClerk) {
-        // 判断用户ID是否存在
-        User user = userService.getById(merchantClerk.getUserId());
-        if(user != null){
-          // 防止重复
-          if (merchantClerkService.count(new LambdaQueryWrapper<MerchantClerk>()
-            .eq(MerchantClerk::getUserId, merchantClerk.getUserId())) > 0) {
-            return fail("该用户已被绑定");
-          }
-          if (merchantClerkService.save(merchantClerk)) {
-            return success("添加成功");
-          }
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:update')")
-    @ApiOperation("修改商家门店店员表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody MerchantClerk merchantClerk) {
-        if (merchantClerkService.updateById(merchantClerk)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:remove')")
-    @ApiOperation("删除商家门店店员表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (merchantClerkService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:save')")
-    @ApiOperation("批量添加商家门店店员表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<MerchantClerk> list) {
-        if (merchantClerkService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:update')")
-    @ApiOperation("批量修改商家门店店员表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<MerchantClerk> batchParam) {
-        if (batchParam.update(merchantClerkService, "clerk_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantClerk:remove')")
-    @ApiOperation("批量删除商家门店店员表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (merchantClerkService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/MerchantController.java b/src/main/java/com/gxwebsoft/shop/controller/MerchantController.java
deleted file mode 100644
index 3ec330a..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/MerchantController.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.entity.MerchantWithdraw;
-import com.gxwebsoft.shop.param.MerchantParam;
-import com.gxwebsoft.shop.service.MerchantService;
-import com.gxwebsoft.shop.service.MerchantWithdrawService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY;
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_KEY;
-
-/**
- * 商户管理控制器
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-@Api(tags = "商户管理管理")
-@RestController
-@RequestMapping("/api/shop/merchant")
-public class MerchantController extends BaseController {
-    @Resource
-    private MerchantService merchantService;
-    @Resource
-    private CacheClient cacheClient;
-    @Resource
-    private MerchantWithdrawService merchantWithdrawService;
-
-    @PreAuthorize("hasAuthority('shop:merchant:list')")
-    @ApiOperation("分页查询商户管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Merchant>> page(MerchantParam param) {
-        // 使用关联查询
-        return success(merchantService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:list')")
-    @ApiOperation("查询全部商户管理")
-    @GetMapping()
-    public ApiResult<List<Merchant>> list(MerchantParam param) {
-        PageParam<Merchant, MerchantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        // 使用关联查询
-        return success(merchantService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:list')")
-    @ApiOperation("根据id查询商户管理")
-    @GetMapping("/{id}")
-    public ApiResult<Merchant> get(@PathVariable("id") Integer id) {
-      // 使用关联查询
-        return success(merchantService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:save')")
-    @ApiOperation("添加商户管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Merchant merchant) {
-        if (merchantService.count(new LambdaQueryWrapper<Merchant>()
-          .eq(Merchant::getMerchantCode, merchant.getMerchantCode())) > 0) {
-          return fail("商户编号已存在");
-        }
-        if (merchantService.save(merchant)) {
-            // 添加缓存
-            String lngAndLat = merchant.getLngAndLat();
-            String[] split = lngAndLat.split(",");
-            Double x = Double.parseDouble(split[0]);
-            Double y = Double.parseDouble(split[1]);
-            String id = merchant.getMerchantId().toString();
-            cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-            cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant);
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:update')")
-    @ApiOperation("修改商户管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Merchant merchant) {
-        // 超级管理员不能设为店主
-        if(getLoginUser().getUserId().equals(merchant.getMerchantOwner())){
-          return fail("超级管理员不能绑定为负责人！");
-        }
-        if (merchantService.updateById(merchant)) {
-            // 添加缓存
-            String lngAndLat = merchant.getLngAndLat();
-            String[] split = lngAndLat.split(",");
-            Double x = Double.parseDouble(split[0]);
-            Double y = Double.parseDouble(split[1]);
-            String id = merchant.getMerchantId().toString();
-            cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-            cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-            cacheClient.set(MERCHANT_KEY.concat(":").concat(merchant.getMerchantId().toString()),merchant);
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:remove')")
-    @ApiOperation("删除商户管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (merchantService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:save')")
-    @ApiOperation("批量添加商户管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Merchant> list) {
-        if (merchantService.saveBatch(list)) {
-            list.forEach(d -> {
-              // 添加缓存
-              String lngAndLat = d.getLngAndLat();
-              String[] split = lngAndLat.split(",");
-              Double x = Double.parseDouble(split[0]);
-              Double y = Double.parseDouble(split[1]);
-              String id = d.getMerchantId().toString();
-              cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-              cacheClient.geoAdd(MERCHANT_GEO_KEY,x,y,id);
-              cacheClient.set(MERCHANT_KEY.concat(":").concat(d.getMerchantId().toString()),d);
-            });
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:update')")
-    @ApiOperation("批量修改商户管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Merchant> batchParam) {
-        if (batchParam.update(merchantService, "merchant_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:remove')")
-    @ApiOperation("批量删除商户管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (merchantService.removeByIds(ids)) {
-            // 删除缓存
-            ids.forEach(id -> {
-              cacheClient.geoRemove(MERCHANT_GEO_KEY,id);
-            });
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:list')")
-    @ApiOperation("根据定位查询附近的商户列表")
-    @PostMapping("/getListByGeo")
-    public ApiResult<List<Merchant>> getListByGeo(@RequestBody MerchantParam param) {
-      return success(merchantService.listByGeo(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchant:list')")
-    @ApiOperation("提现申请")
-    @PostMapping("/addWithdraw")
-    public ApiResult<?> addWithdraw(@RequestBody Merchant merchant) {
-      // 提现金额是否不足
-      if(merchant.getAmount().compareTo(merchant.getMoney()) > 0){
-        return fail("可提现金额不足");
-      }
-      // 提现金额不能等于0
-      if(merchant.getAmount().compareTo(BigDecimal.ZERO) == 0){
-        return fail("提现金额不正确");
-      }
-
-      // 保存提现账号
-      final Merchant data = new Merchant();
-      data.setMerchantId(merchant.getMerchantId());
-      data.setAlipayName(merchant.getAlipayName());
-      data.setAlipayAccount(merchant.getAlipayAccount());
-      data.setBankName(merchant.getBankName());
-      data.setBankAccount(merchant.getBankAccount());
-      data.setBankCard(merchant.getBankCard());
-      // 扣除提现金额
-      data.setMoney(merchant.getMoney().subtract(merchant.getAmount()));
-      // 冻结金额
-      data.setFreezeMoney(merchant.getFreezeMoney().add(merchant.getAmount()));
-      merchantService.updateById(data);
-      // 记录明细
-      final MerchantWithdraw withdraw = new MerchantWithdraw();
-      withdraw.setUserId(merchant.getUserId());
-      withdraw.setMoney(merchant.getAmount().subtract(merchant.getAmount().multiply(new BigDecimal("0.04"))));
-      withdraw.setPayType(merchant.getPayType());
-      withdraw.setAlipayName(merchant.getAlipayName());
-      withdraw.setAlipayAccount(merchant.getAlipayAccount());
-      withdraw.setBankName(merchant.getBankName());
-      withdraw.setBankAccount(merchant.getBankAccount());
-      withdraw.setBankCard(merchant.getBankCard());
-      merchantWithdrawService.save(withdraw);
-
-      return success("已收到您的提交申请",null);
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java
deleted file mode 100644
index bcbed7d..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/MerchantWithdrawController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.MerchantWithdraw;
-import com.gxwebsoft.shop.param.MerchantWithdrawParam;
-import com.gxwebsoft.shop.service.MerchantWithdrawService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商户提现记录控制器
- *
- * @author 科技小王子
- * @since 2022-12-02 00:41:09
- */
-@Api(tags = "商户提现记录管理")
-@RestController
-@RequestMapping("/api/shop/merchant-withdraw")
-public class MerchantWithdrawController extends BaseController {
-    @Resource
-    private MerchantWithdrawService merchantWithdrawService;
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:list')")
-    @ApiOperation("分页查询商户提现记录")
-    @GetMapping("/page")
-    public ApiResult<PageResult<MerchantWithdraw>> page(MerchantWithdrawParam param) {
-        // 使用关联查询
-        return success(merchantWithdrawService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:list')")
-    @ApiOperation("查询全部商户提现记录")
-    @GetMapping()
-    public ApiResult<List<MerchantWithdraw>> list(MerchantWithdrawParam param) {
-        return success(merchantWithdrawService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:list')")
-    @ApiOperation("根据id查询商户提现记录")
-    @GetMapping("/{id}")
-    public ApiResult<MerchantWithdraw> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(merchantWithdrawService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:save')")
-    @ApiOperation("添加商户提现记录")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody MerchantWithdraw merchantWithdraw) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          merchantWithdraw.setUserId(loginUser.getUserId());
-        }
-        if (merchantWithdrawService.save(merchantWithdraw)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:update')")
-    @ApiOperation("修改商户提现记录")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody MerchantWithdraw merchantWithdraw) {
-        if (merchantWithdrawService.updateById(merchantWithdraw)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:remove')")
-    @ApiOperation("删除商户提现记录")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (merchantWithdrawService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:save')")
-    @ApiOperation("批量添加商户提现记录")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<MerchantWithdraw> list) {
-        if (merchantWithdrawService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:update')")
-    @ApiOperation("批量修改商户提现记录")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<MerchantWithdraw> batchParam) {
-        if (batchParam.update(merchantWithdrawService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:merchantWithdraw:remove')")
-    @ApiOperation("批量删除商户提现记录")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (merchantWithdrawService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java
deleted file mode 100644
index 5bd40b5..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderAddressController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.OrderAddressService;
-import com.gxwebsoft.shop.entity.OrderAddress;
-import com.gxwebsoft.shop.param.OrderAddressParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 订单收货地址记录表控制器
- *
- * @author 科技小王子
- * @since 2022-12-02 21:21:10
- */
-@Api(tags = "订单收货地址记录表管理")
-@RestController
-@RequestMapping("/api/shop/order-address")
-public class OrderAddressController extends BaseController {
-    @Resource
-    private OrderAddressService orderAddressService;
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:list')")
-    @ApiOperation("分页查询订单收货地址记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<OrderAddress>> page(OrderAddressParam param) {
-        PageParam<OrderAddress, OrderAddressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(orderAddressService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(orderAddressService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:list')")
-    @ApiOperation("查询全部订单收货地址记录表")
-    @GetMapping()
-    public ApiResult<List<OrderAddress>> list(OrderAddressParam param) {
-        PageParam<OrderAddress, OrderAddressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(orderAddressService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(orderAddressService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:list')")
-    @ApiOperation("根据id查询订单收货地址记录表")
-    @GetMapping("/{id}")
-    public ApiResult<OrderAddress> get(@PathVariable("id") Integer id) {
-        return success(orderAddressService.getById(id));
-        // 使用关联查询
-        //return success(orderAddressService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:save')")
-    @ApiOperation("添加订单收货地址记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody OrderAddress orderAddress) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          orderAddress.setUserId(loginUser.getUserId());
-          orderAddress.setMerchantCode(getMerchantCode());
-        }
-        if (orderAddressService.save(orderAddress)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:update')")
-    @ApiOperation("修改订单收货地址记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody OrderAddress orderAddress) {
-        if (orderAddressService.updateById(orderAddress)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:remove')")
-    @ApiOperation("删除订单收货地址记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderAddressService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:save')")
-    @ApiOperation("批量添加订单收货地址记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<OrderAddress> list) {
-        if (orderAddressService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:update')")
-    @ApiOperation("批量修改订单收货地址记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderAddress> batchParam) {
-        if (batchParam.update(orderAddressService, "order_address_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderAddress:remove')")
-    @ApiOperation("批量删除订单收货地址记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderAddressService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
deleted file mode 100644
index 7dbd562..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcAgent;
-import com.gxwebsoft.apps.entity.EquipmentGoods;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
-import com.gxwebsoft.apps.param.BcAgentParam;
-import com.gxwebsoft.apps.service.BcAgentService;
-import com.gxwebsoft.apps.service.EquipmentGoodsService;
-import com.gxwebsoft.apps.service.EquipmentOrderGoodsService;
-import com.gxwebsoft.apps.service.EquipmentService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.UserRefereeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URL;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_DOING;
-import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCCESS;
-
-/**
- * 订单记录表控制器
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-@Api(tags = "订单记录表管理")
-@RestController
-@RequestMapping("/api/shop/order")
-public class OrderController extends BaseController {
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private EquipmentGoodsService equipmentGoodsService;
-    @Resource
-    private EquipmentService equipmentService;
-    @Resource
-    private OrderGoodsService orderGoodsService;
-    @Resource
-    private EquipmentOrderGoodsService equipmentOrderGoodsService;
-    @Resource
-    private UserRefereeService userRefereeService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private BcAgentService bcAgentService;
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("分页查询订单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<Order>> page(OrderParam param) {
-        // 搜索条件
-        if (getMerchantCode() != null) {
-          param.setMerchantCode(getMerchantCode());
-        }
-        // 云芯威项目查询关联设备
-        if(getTenantId().equals(6)){
-          // 查询订单的关联商品
-          List<Order> list = orderService.listRel(param);
-          // 查询订单的设备
-          for (Order order : list) {
-            final OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
-            orderGoodsParam.setOrderId(order.getOrderId());
-            order.setGoodsList(orderGoodsService.listRel(orderGoodsParam));
-            order.setEquipmentGoods(equipmentOrderGoodsService.getOne(new LambdaQueryWrapper<EquipmentOrderGoods>().eq(EquipmentOrderGoods::getOrderId,order.getOrderId())));
-            order.setEquipment(equipmentService.getById(order.getEquipmentId()));
-          }
-          PageParam<Order, OrderParam> page = new PageParam<>(param);
-          return success(new PageResult<>(list, page.getTotal()));
-        }
-        // 贵港自然资源报餐
-        if(getTenantId().equals(10048) && getAppId() != null){
-          param.setUserId(getLoginUserId());
-          final Boolean agent = param.getAgent();
-          if (agent != null) {
-            final BcAgentParam bcAgentParam = new BcAgentParam();
-            bcAgentParam.setParentId(getLoginUserId());
-            bcAgentParam.setLimit(100L);
-            final PageResult<BcAgent> result = bcAgentService.pageRel(bcAgentParam);
-            final Set<Integer> collect = result.getList().stream().map(BcAgent::getUserId).collect(Collectors.toSet());
-            param.setUserId(null);
-            param.setUserIds(collect);
-          }
-          return success(orderService.pageRel(param));
-        }
-
-        // 使用关联查询
-        return success(orderService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("查询全部订单记录表")
-    @GetMapping()
-    public ApiResult<List<Order>> list(OrderParam param) {
-        // 使用关联查询
-      return success(orderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("按订单集查询")
-    @PostMapping("/listByIds")
-    public ApiResult<List<Order>> listByIds(@RequestBody List<Integer> orderIds) {
-      System.out.println("按订单集查询 = " + orderIds);
-      if(orderIds.size() > 0){
-        return success(orderService.listByIds(orderIds));
-      }
-      return fail("订单不存在",null);
-
-
-//
-//
-//      Integer userId = getLoginUserId();
-//      // 代报餐情况(未完成)
-//      final Order order = orderService.getById(orderIds.get(0));
-//      // 订单不存在
-//      if (order == null) {
-//        return fail("订单不存在",null);
-//      }
-//
-//      if (!order.getUserId().equals(userId)) {
-//        userId = order.getUserId();
-//        final List<Order> list1 = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderId,orderIds).eq(Order::getUserId, userId).eq(Order::getPayStatus,PAY_STATUS_NO_PAY));
-//        final Set<Integer> collect = list1.stream().map(Order::getOrderId).collect(Collectors.toSet());
-//        return success(orderService.listByIds(collect));
-//      }
-//
-//      final List<Order> list1 = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getUserId, userId).eq(Order::getPayStatus,PAY_STATUS_NO_PAY));
-//      final List<Integer> collect = list1.stream().map(Order::getOrderId).collect(Collectors.toList());
-//      if (CollectionUtils.isEmpty(collect)) {
-//        return fail("订单不存在2",null);
-//      }
-//      // 返回待支付订单
-//      return success(orderService.listByIds(collect));
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("临时报餐订单")
-    @PostMapping("/getByTemporary")
-    public ApiResult<List<Order>> getByTemporary(@RequestBody OrderParam order) {
-      final List<Order> list = orderService.listRel(order);
-
-      // 是否查询订单商品
-      if(order.getShowGoodsList()){
-        list.forEach(d->{
-            final OrderGoodsParam ogp = new OrderGoodsParam();
-            ogp.setOrderId(d.getOrderId());
-            ogp.setTemporary(1);
-            d.setGoodsList(orderGoodsService.listRel(ogp));
-        });
-      }
-      // 返回待支付订单
-      return success(list);
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("根据id查询订单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<Order> get(@PathVariable("id") Integer id) {
-      // 使用关联查询
-      Order order = orderService.getByIdRel(id);
-      // 云芯威关联设备查询
-      if (!order.getGoodsId().equals(0) || !order.getEquipmentId().equals(0)) {
-        order.setEquipmentGoods(equipmentOrderGoodsService.getOne(new LambdaQueryWrapper<EquipmentOrderGoods>().eq(EquipmentOrderGoods::getOrderId,order.getOrderId())));
-        order.setEquipment(equipmentService.getById(order.getEquipmentId()));
-      }
-      return success(order);
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:save')")
-    @ApiOperation("添加订单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody Order order) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          order.setUserId(loginUser.getUserId());
-        }
-        if (orderService.save(order)) {
-          // 云芯威BMS
-          if (order.getTenantId().equals(6)) {
-            final EquipmentGoods eg = equipmentGoodsService.getById(order.getOrderSourceId());
-            eg.setOrderId(order.getOrderId());
-            // 添加订单商品
-            final EquipmentOrderGoods oeg = new EquipmentOrderGoods();
-            oeg.setOrderId(order.getOrderId());
-            oeg.setGoodsName(eg.getGoodsName());
-            oeg.setEquipmentCategory(eg.getEquipmentCategory());
-            oeg.setImage(eg.getImage());
-            oeg.setCategoryId(eg.getCategoryId());
-            oeg.setBatteryModel(eg.getBatteryModel());
-            oeg.setSellingPoint(eg.getSellingPoint());
-            oeg.setStockTotal(eg.getStockTotal());
-            oeg.setContent(eg.getContent());
-            oeg.setBatteryPrice(eg.getBatteryPrice());
-            oeg.setBatteryRent(eg.getBatteryRent());
-            oeg.setBatteryInsurance(eg.getBatteryInsurance());
-            oeg.setBatteryDeposit(eg.getBatteryDeposit());
-            oeg.setDownPayment(eg.getDownPayment());
-            oeg.setPeriods(eg.getPeriods());
-            oeg.setRepayment(eg.getRepayment());
-            oeg.setServiceCharges(eg.getServiceCharges());
-            oeg.setPeriodsType(eg.getPeriodsType());
-            oeg.setUserId(eg.getUserId());
-            oeg.setComments(eg.getComments());
-            oeg.setStatus(eg.getStatus());
-            oeg.setMerchantCode(eg.getMerchantCode());
-            oeg.setTenantId(eg.getTenantId());
-
-            equipmentOrderGoodsService.saveOrUpdate(oeg);
-
-            // 添加推荐人关系
-            if (order.getDealerId() != null) {
-              final User dealer = userService.getById(order.getDealerId());
-              if(dealer == null){
-                return fail("推荐人的用户ID不存在");
-              }
-              final UserReferee referee = new UserReferee();
-              referee.setDealerId(order.getDealerId());
-              referee.setUserId(getLoginUserId());
-              userRefereeService.save(referee);
-            }
-          }
-          // 是否存入星期值(10048)
-          if(order.getDeliveryTime() != null){
-            order.setWeek(DateUtil.dayOfWeek(order.getDeliveryTime()) - 1);
-          }
-          return success("添加成功",order);
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:update')")
-    @ApiOperation("修改订单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody Order order) {
-        if (orderService.updateById(order)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:remove')")
-    @ApiOperation("删除订单记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:save')")
-    @ApiOperation("批量添加订单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<Order> list) {
-        if (orderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:update')")
-    @ApiOperation("批量修改订单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<Order> batchParam) {
-        if (batchParam.update(orderService, "order_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:remove')")
-    @ApiOperation("批量删除订单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @ApiOperation("支付成功")
-    @PostMapping("/setPayStatus")
-    public ApiResult<?> setPayStatus(@RequestBody Order order){
-      if (orderService.updateById(order)) {
-        return success("设置成功");
-      }
-      return fail("设置失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:order:list')")
-    @ApiOperation("生成核销付款码（二维码）")
-    @GetMapping("/generateQrCode")
-    public ApiResult<?> generateQrCode(OrderParam param) throws IOException {
-      // 查询当天的报餐信息
-      param.setUserId(getLoginUserId());
-      param.setDeliveryTime(DateUtil.beginOfDay(DateUtil.date()).toString());
-      param.setOrderStatus(ORDER_STATUS_DOING);
-      param.setPayStatus(PAY_STATUS_SUCCESS);
-      param.setDeleted(0);
-      final List<Order> list = orderService.listRel(param);
-      if(list.size() == 0){
-        return fail("今日无报餐记录");
-      }
-      final Order order = list.get(0);
-      // LOGO URL地址
-      String logoUrl = "https://file.wsdns.cn/20230430/6fa31aca3b0d47af98a149cf2dd26a4f.jpeg";
-      // 二维码生成图片保存路径
-      String filePath = "/www/wwwroot/file.ws/file/qrcode/" + getLoginUserId() + "/payQrCode.jpg";
-      // 二维码访问路径
-      String qrcodeUrl = "https://file.gxwebsoft.com/qrcode/" + getLoginUserId() + "/payQrCode.jpg" + "?v=" + DateUtil.current();
-      // 二维码内容
-      final String orderNo = order.getOrderNo().toString();
-      // 将URL转为BufferedImage
-      BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl));
-      // 生成二维码
-      QrConfig config = new QrConfig(300, 300);
-      // 设置边距，既二维码和背景之间的边距
-      config.setMargin(1);
-      // 附带小logo
-      config.setImg(bufferedImage);
-      QrCodeUtil.generate(orderNo, config, FileUtil.file(filePath));
-      return success("请求成功",qrcodeUrl);
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java
deleted file mode 100644
index 6b23024..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderGoodsController.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 订单商品记录表控制器
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-@Api(tags = "订单商品记录表管理")
-@RestController
-@RequestMapping("/api/shop/order-goods")
-public class OrderGoodsController extends BaseController {
-    @Resource
-    private OrderGoodsService orderGoodsService;
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
-    @ApiOperation("分页查询订单商品记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<OrderGoods>> page(OrderGoodsParam param) {
-        // 使用关联查询
-        return success(orderGoodsService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
-    @ApiOperation("查询全部订单商品记录表")
-    @GetMapping()
-    public ApiResult<List<OrderGoods>> list(OrderGoodsParam param) {
-        // 使用关联查询
-        return success(orderGoodsService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:list')")
-    @ApiOperation("根据id查询订单商品记录表")
-    @GetMapping("/{id}")
-    public ApiResult<OrderGoods> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(orderGoodsService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:save')")
-    @ApiOperation("添加订单商品记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody OrderGoods orderGoods) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          orderGoods.setUserId(loginUser.getUserId());
-          orderGoods.setMerchantCode(getMerchantCode());
-        }
-        if (orderGoodsService.save(orderGoods)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:update')")
-    @ApiOperation("修改订单商品记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody OrderGoods orderGoods) {
-        if (orderGoodsService.updateById(orderGoods)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
-    @ApiOperation("删除订单商品记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderGoodsService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:save')")
-    @ApiOperation("批量添加订单商品记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<OrderGoods> list) {
-        if (orderGoodsService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:update')")
-    @ApiOperation("批量修改订单商品记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderGoods> batchParam) {
-        if (batchParam.update(orderGoodsService, "order_goods_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderGoods:remove')")
-    @ApiOperation("批量删除订单商品记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderGoodsService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java
deleted file mode 100644
index b7499a0..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundAddressController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.OrderRefundAddressService;
-import com.gxwebsoft.shop.entity.OrderRefundAddress;
-import com.gxwebsoft.shop.param.OrderRefundAddressParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 售后单退货地址记录表控制器
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Api(tags = "售后单退货地址记录表管理")
-@RestController
-@RequestMapping("/api/shop/order-refund-address")
-public class OrderRefundAddressController extends BaseController {
-    @Resource
-    private OrderRefundAddressService orderRefundAddressService;
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:list')")
-    @ApiOperation("分页查询售后单退货地址记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<OrderRefundAddress>> page(OrderRefundAddressParam param) {
-        PageParam<OrderRefundAddress, OrderRefundAddressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(orderRefundAddressService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(orderRefundAddressService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:list')")
-    @ApiOperation("查询全部售后单退货地址记录表")
-    @GetMapping()
-    public ApiResult<List<OrderRefundAddress>> list(OrderRefundAddressParam param) {
-        PageParam<OrderRefundAddress, OrderRefundAddressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(orderRefundAddressService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(orderRefundAddressService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:list')")
-    @ApiOperation("根据id查询售后单退货地址记录表")
-    @GetMapping("/{id}")
-    public ApiResult<OrderRefundAddress> get(@PathVariable("id") Integer id) {
-        return success(orderRefundAddressService.getById(id));
-        // 使用关联查询
-        //return success(orderRefundAddressService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:save')")
-    @ApiOperation("添加售后单退货地址记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody OrderRefundAddress orderRefundAddress) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          orderRefundAddress.setUserId(loginUser.getUserId());
-        }
-        if (orderRefundAddressService.save(orderRefundAddress)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:update')")
-    @ApiOperation("修改售后单退货地址记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody OrderRefundAddress orderRefundAddress) {
-        if (orderRefundAddressService.updateById(orderRefundAddress)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:remove')")
-    @ApiOperation("删除售后单退货地址记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderRefundAddressService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:save')")
-    @ApiOperation("批量添加售后单退货地址记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<OrderRefundAddress> list) {
-        if (orderRefundAddressService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:update')")
-    @ApiOperation("批量修改售后单退货地址记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderRefundAddress> batchParam) {
-        if (batchParam.update(orderRefundAddressService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefundAddress:remove')")
-    @ApiOperation("批量删除售后单退货地址记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderRefundAddressService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
deleted file mode 100644
index 060cfd4..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.service.EquipmentService;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.service.OrderRefundService;
-import com.gxwebsoft.shop.entity.OrderRefund;
-import com.gxwebsoft.shop.param.OrderRefundParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.RECEIPT_STATUS_RETURN;
-
-/**
- * 售后单记录表控制器
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Api(tags = "售后单记录表管理")
-@RestController
-@RequestMapping("/api/shop/order-refund")
-public class OrderRefundController extends BaseController {
-    @Resource
-    private OrderRefundService orderRefundService;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private EquipmentService equipmentService;
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:list')")
-    @ApiOperation("分页查询售后单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<OrderRefund>> page(OrderRefundParam param) {
-        // 使用关联查询
-        return success(orderRefundService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:list')")
-    @ApiOperation("查询全部售后单记录表")
-    @GetMapping()
-    public ApiResult<List<OrderRefund>> list(OrderRefundParam param) {
-        // 使用关联查询
-        return success(orderRefundService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:list')")
-    @ApiOperation("根据id查询售后单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<OrderRefund> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(orderRefundService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:save')")
-    @ApiOperation("添加售后单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody OrderRefund orderRefund) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          orderRefund.setUserId(loginUser.getUserId());
-        }
-        if (orderRefundService.save(orderRefund)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:update')")
-    @ApiOperation("修改售后单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody OrderRefund orderRefund) {
-        if (orderRefundService.updateById(orderRefund)) {
-            if(orderRefund.getTenantId().equals(6)){
-              final Integer orderId = orderRefund.getOrderId();
-              final Order order = orderService.getById(orderId);
-              System.out.println("order = " + order);
-              order.setReceiptStatus(RECEIPT_STATUS_RETURN);
-              final Equipment equipment = equipmentService.getById(order.getEquipmentId());
-              equipment.setUserId(0);
-              equipmentService.updateById(equipment);
-            }
-            return success("操作成功");
-        }
-        return fail("退租失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:remove')")
-    @ApiOperation("删除售后单记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderRefundService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:save')")
-    @ApiOperation("批量添加售后单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<OrderRefund> list) {
-        if (orderRefundService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:update')")
-    @ApiOperation("批量修改售后单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderRefund> batchParam) {
-        if (batchParam.update(orderRefundService, "order_refund_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRefund:remove')")
-    @ApiOperation("批量删除售后单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderRefundService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java
deleted file mode 100644
index a2f6934..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderRenewController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.OrderRenewService;
-import com.gxwebsoft.shop.entity.OrderRenew;
-import com.gxwebsoft.shop.param.OrderRenewParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 续费订单记录表控制器
- *
- * @author 科技小王子
- * @since 2023-04-13 10:34:35
- */
-@Api(tags = "续费订单记录表管理")
-@RestController
-@RequestMapping("/api/shop/order-renew")
-public class OrderRenewController extends BaseController {
-    @Resource
-    private OrderRenewService orderRenewService;
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:list')")
-    @ApiOperation("分页查询续费订单记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<OrderRenew>> page(OrderRenewParam param) {
-        PageParam<OrderRenew, OrderRenewParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(orderRenewService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(orderRenewService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:list')")
-    @ApiOperation("查询全部续费订单记录表")
-    @GetMapping()
-    public ApiResult<List<OrderRenew>> list(OrderRenewParam param) {
-        PageParam<OrderRenew, OrderRenewParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(orderRenewService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(orderRenewService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:list')")
-    @ApiOperation("根据id查询续费订单记录表")
-    @GetMapping("/{id}")
-    public ApiResult<OrderRenew> get(@PathVariable("id") Integer id) {
-        return success(orderRenewService.getById(id));
-        // 使用关联查询
-        //return success(orderRenewService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:save')")
-    @ApiOperation("添加续费订单记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody OrderRenew orderRenew) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          orderRenew.setUserId(loginUser.getUserId());
-          orderRenew.setMerchantCode(getMerchantCode());
-        }
-        if (orderRenewService.save(orderRenew)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:update')")
-    @ApiOperation("修改续费订单记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody OrderRenew orderRenew) {
-        if (orderRenewService.updateById(orderRenew)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:remove')")
-    @ApiOperation("删除续费订单记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (orderRenewService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:save')")
-    @ApiOperation("批量添加续费订单记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<OrderRenew> list) {
-        if (orderRenewService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:update')")
-    @ApiOperation("批量修改续费订单记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<OrderRenew> batchParam) {
-        if (batchParam.update(orderRenewService, "order_renew_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:orderRenew:remove')")
-    @ApiOperation("批量删除续费订单记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (orderRenewService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
deleted file mode 100644
index 8721f97..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayConstants;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.internal.util.AlipayEncrypt;
-import com.alipay.api.internal.util.AlipaySignature;
-import com.alipay.api.request.AlipayTradeCreateRequest;
-import com.alipay.api.request.AlipayTradeQueryRequest;
-import com.alipay.api.response.AlipayTradeCreateResponse;
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.apps.entity.BcTemporary;
-import com.gxwebsoft.apps.param.BcTemporaryParam;
-import com.gxwebsoft.apps.service.BcTemporaryService;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.config.ConfigProperties;
-import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.AlipayConfigUtil;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.OperationRecordService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.Payment;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.PaymentParam;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.PaymentService;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
-import com.gxwebsoft.shop.service.UserOauthService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.core.env.Environment;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_USE;
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-
-/**
- * 商城支付方式记录表控制器
- *
- * @author 科技小王子
- * @since 2022-12-15 19:11:07
- */
-@Api(tags = "商城支付方式记录表管理")
-@RestController
-@RequestMapping("/api/shop/payment")
-public class PaymentController extends BaseController {
-  @Resource
-  private PaymentService paymentService;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private Environment config;
-  @Resource
-  private ConfigProperties pathConfig;
-  @Resource
-  private OperationRecordService operationRecordService;
-  @Resource
-  private UserOauthService userOauthService;
-  @Resource
-  private AlipayConfigUtil alipayConfig;
-  @Resource
-  private UserService userService;
-  @Resource
-  private UserBalanceLogService userBalanceLogService;
-  @Resource
-  private BcTemporaryService bcTemporaryService;
-
-  @PreAuthorize("hasAuthority('shop:payment:list')")
-  @ApiOperation("分页查询商城支付方式记录表")
-  @GetMapping("/page")
-  public ApiResult<PageResult<Payment>> page(PaymentParam param) {
-    PageParam<Payment, PaymentParam> page = new PageParam<>(param);
-    return success(paymentService.page(page, page.getWrapper()));
-    // 使用关联查询
-    //return success(paymentService.pageRel(param));
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:list')")
-  @ApiOperation("查询全部商城支付方式记录表")
-  @GetMapping()
-  public ApiResult<List<Payment>> list(PaymentParam param) {
-    PageParam<Payment, PaymentParam> page = new PageParam<>(param);
-    page.setDefaultOrder("create_time desc");
-    return success(paymentService.list(page.getOrderWrapper()));
-    // 使用关联查询
-    //return success(paymentService.listRel(param));
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:list')")
-  @ApiOperation("根据id查询商城支付方式记录表")
-  @GetMapping("/{id}")
-  public ApiResult<Payment> get(@PathVariable("id") Integer id) {
-    return success(paymentService.getById(id));
-    // 使用关联查询
-    //return success(paymentService.getByIdRel(id));
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:save')")
-  @ApiOperation("添加商城支付方式记录表")
-  @PostMapping()
-  public ApiResult<?> save(@RequestBody Payment payment) {
-    if (paymentService.count(new LambdaQueryWrapper<Payment>()
-      .eq(Payment::getMethod, payment.getMethod())) > 0) {
-      return fail("该支付方式已存在");
-    }
-    if (paymentService.save(payment)) {
-      return success("添加成功");
-    }
-    return fail("添加失败");
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:update')")
-  @OperationLog
-  @ApiOperation("修改商城支付方式记录表")
-  @PutMapping()
-  public ApiResult<?> update(@RequestBody Payment payment) {
-    if (paymentService.updateById(payment)) {
-      return success("修改成功");
-    }
-    return fail("修改失败");
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:remove')")
-  @OperationLog
-  @ApiOperation("删除商城支付方式记录表")
-  @DeleteMapping("/{id}")
-  public ApiResult<?> remove(@PathVariable("id") Integer id) {
-    if (paymentService.removeById(id)) {
-      return success("删除成功");
-    }
-    return fail("删除失败");
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:save')")
-  @OperationLog
-  @ApiOperation("批量添加商城支付方式记录表")
-  @PostMapping("/batch")
-  public ApiResult<?> saveBatch(@RequestBody List<Payment> list) {
-    if (paymentService.saveBatch(list)) {
-      return success("添加成功");
-    }
-    return fail("添加失败");
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:update')")
-  @OperationLog
-  @ApiOperation("批量修改商城支付方式记录表")
-  @PutMapping("/batch")
-  public ApiResult<?> removeBatch(@RequestBody BatchParam<Payment> batchParam) {
-    if (batchParam.update(paymentService, "payment_id")) {
-      return success("修改成功");
-    }
-    return fail("修改失败");
-  }
-
-  @PreAuthorize("hasAuthority('shop:payment:remove')")
-  @OperationLog
-  @ApiOperation("批量删除商城支付方式记录表")
-  @DeleteMapping("/batch")
-  public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-    if (paymentService.removeByIds(ids)) {
-      return success("删除成功");
-    }
-    return fail("删除失败");
-  }
-
-  @ApiOperation("支付宝手机号码")
-  @PostMapping("/getPhoneNumber")
-  public ApiResult<?> getPhoneNumber(@RequestBody Map<String, String> params) {
-    final String encryptedData = params.get("encryptedData");
-    final String tenantId = params.get("tenantId");
-    // 支付宝配置信息
-    JSONObject config = alipayConfig.payment(Integer.valueOf(tenantId));
-
-    //1. 获取验签和解密所需要的参数
-    JSONObject jsonObject =JSONObject.parseObject(encryptedData);
-    String content = jsonObject.getString("response");
-    String sign = jsonObject.getString("sign");
-    String signType = "RSA2";
-    String charset = "UTF-8";
-    String encryptType = "AES";
-    String alipayCertPublicKey = pathConfig.getUploadPath() + "file" + config.getString("alipayCertPublicKey");
-    boolean isDataEncrypted = !content.startsWith("{");
-    boolean signVerified = false;
-    //2. 验签
-    String signContent = content;
-    String signVeriKey = ""; // 支付宝公钥
-    String decryptKey = config.getString("decryptKey"); // 加解密密钥
-//    System.out.println("decryptKey = " + decryptKey);
-//    System.out.println(content);
-//    System.out.println(sign);
-//    System.out.println(alipayCertPublicKey);
-//    System.out.println(charset);
-//    System.out.println(signType);
-//    System.out.println(isDataEncrypted);
-    if (isDataEncrypted) {
-      signContent = "\"" + signContent + "\"";
-    } try {
-      //验签方法
-      signVerified = AlipaySignature.rsaCertCheck(signContent, sign, alipayCertPublicKey, charset, signType);
-    } catch (AlipayApiException e) {
-      // 验签异常, 日志
-    } if (!signVerified) {
-      //验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
-      return fail("验签失败");
-    }
-    //3. 解密
-    String plainData = null;
-    if (isDataEncrypted) {
-      try {
-        plainData = AlipayEncrypt.decryptContent(content, encryptType, decryptKey, charset);
-      } catch (AlipayApiException e) {
-        //解密异常, 记录日志
-        return fail("解密异常");
-      }} else {
-      plainData = content;
-    }
-    return success("获取成功",plainData);
-  }
-
-  @ApiModelProperty("支付宝小程序支付")
-  @GetMapping("/mp-alipay/{id}")
-  public ApiResult<?> mpAlipay(@PathVariable("id") Integer id) throws AlipayApiException {
-    // 验证签名
-    isCheckSign();
-    // 订单数据
-    Order order = orderService.getByIdRel(id);
-    // 实例化客户端
-    DefaultAlipayClient alipayClient = alipayConfig.alipayClient(order.getTenantId());
-    try {
-      AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
-      // 配置公共请求参数
-      request.setNotifyUrl(pathConfig.getServerUrl() + "/shop/payment/mp-alipay/notify");
-//      request.setNotifyUrl("https://454k72r798.goho.co/api/shop/payment/mp-alipay/notify");
-      request.setReturnUrl(null);
-      // 配置业务参数
-      JSONObject bizContent = new JSONObject();
-      System.out.println("bizContent = " + order);
-      bizContent.put("out_trade_no", order.getOrderNo());
-      bizContent.put("total_amount", order.getPayPrice());
-      bizContent.put("subject", order.getMerchantName());
-      // 拿不到手机号码？？
-      bizContent.put("buyer_id", userOauthService.getOauthIdByUserId(order.getUserId(), "MP-ALIPAY"));
-      request.setBizContent(bizContent.toString());
-      //SDK 已经封装掉了公共参数，这里只需要传入业务参数。
-      AlipayTradeCreateResponse response = alipayClient.certificateExecute(request);
-      String trade_no = response.getTradeNo();// 获取返回的tradeNO。
-      return success("支付成功", trade_no);
-    } catch (AlipayApiException e) {
-      e.printStackTrace();
-      throw new RuntimeException();
-    }
-  }
-
-  @ApiModelProperty("异步通知")
-  @OperationLog
-  @PostMapping("/mp-alipay/notify")
-  public String alipayNotify(@RequestParam Map<String, String> params) throws AlipayApiException {
-    System.out.println("异步处理>>>>");
-    System.out.println("params = " + params);
-    String outTradeNo = params.get("out_trade_no");
-    Order order = orderService.getByOutTradeNo(outTradeNo);
-    if(order == null){
-      throw new BusinessException("订单不存在");
-    }
-    final JSONObject config = alipayConfig.payment(order.getTenantId());
-    // 生成环境证书路径
-    String alipayCertPublicKey = pathConfig.getUploadPath() + "file" + config.getString("alipayCertPublicKey");
-    // TODO 验签成功后，按照支付结果异步通知中的描述，对支付结果中的业务内容进行二次校验，校验成功后在response中返回success并继续商户自身业务处理，校验失败返回failure
-    boolean flag = AlipaySignature.rsaCertCheckV1(params, alipayCertPublicKey, AlipayConstants.CHARSET_UTF8, AlipayConstants.SIGN_TYPE_RSA2);
-    System.out.println("flag>>>>>>>>>>>>>>>>>>>>>>>");
-    System.out.println(flag);
-    // 处理订单业务
-    if (flag) {
-      final String tradeStatus = params.get("trade_status");
-      final String receipt_amount = params.get("receipt_amount");
-      final String payPrice = order.getPayPrice().toString();
-      final String trade_no = params.get("trade_no");
-      final String subject = params.get("subject");
-
-      // 1. 验证appId是否一致
-      final String app_id = params.get("app_id");
-      if(!config.getString("alipayAppId").equals(app_id)){
-        System.out.println("支付宝appId不一致 = " + app_id);
-        throw new BusinessException("支付宝appId不一致");
-      }
-      // 2. 订单金额
-      if(!payPrice.equals(receipt_amount)){
-        System.out.println("订单金额是不一致 = " + receipt_amount);
-        throw new BusinessException("订单金额是不一致");
-      }
-      // 3. 判断交易状态
-      if(!"TRADE_SUCCESS".equals(tradeStatus)){
-        System.out.println("支付失败 = " + tradeStatus);
-        throw new BusinessException("支付失败");
-      }
-      // 4. 修改支付状态
-      order.setPayStatus(PAY_STATUS_SUCCESS);
-      order.setPayMethod(PAY_METHOD_ALIPAY);
-      order.setReceiptAmount(new BigDecimal(receipt_amount));
-      order.setPayTime(DateUtil.date());
-      order.setTradeId(trade_no);
-      order.setSubject(subject);
-      System.out.println("order2 = " + order);
-      final boolean b = orderService.updateByIdRel(order);
-      System.out.println("bsss = " + b);
-      return "success";
-    }
-    // TODO 验签失败则记录异常日志，并在response中返回failure.
-    return "failure";
-  }
-
-  @OperationLog
-  @ApiModelProperty("余额支付")
-  @GetMapping("/balance/{id}")
-  @Transactional(rollbackFor = {Exception.class})
-  public ApiResult<?> balance(@PathVariable("id") Integer id) throws AlipayApiException {
-    // 1. 验证签名
-    isCheckSign();
-    // 订单数据
-    Order order = orderService.getByIdRel(id);
-    // 当前登录用户id
-    User user = new User();
-    // 代付款情况
-    if(!order.getUserId().equals(getLoginUserId())){
-       user = userService.getById(order.getUserId());
-    }else{
-       user = getLoginUser();
-    }
-    final Integer userId = user.getUserId();
-    final BigDecimal balance = user.getBalance();
-    final BigDecimal payPrice = order.getPayPrice();
-    if(balance.compareTo(payPrice) < 0){
-      return fail("余额不足 = " + balance.compareTo(payPrice));
-    }
-    // 2. 扣除余额操作
-    BigDecimal subtract = balance.subtract(payPrice);
-    user.setBalance(subtract);
-    userService.updateById(user);
-    // 3. 记录余额明细
-    UserBalanceLog userBalanceLog = new UserBalanceLog();
-    userBalanceLog.setUserId(userId);
-    userBalanceLog.setScene(BALANCE_USE);
-    userBalanceLog.setMoney(payPrice);
-    userBalanceLog.setBalance(subtract);
-    userBalanceLog.setComments(order.getOrderNo().toString());
-    userBalanceLog.setMerchantCode(order.getMerchantCode());
-    userBalanceLogService.save(userBalanceLog);
-    // 4. 修改支付状态
-    order.setPayStatus(PAY_STATUS_SUCCESS);
-    order.setPayMethod(PAY_METHOD_BALANCE);
-    order.setReceiptAmount(payPrice);
-    order.setPayTime(DateUtil.date());
-    order.setSubject(order.getMerchantName());
-    orderService.updateByIdRel(order);
-    // 5. 续租订单
-    if(order.getRentOrderId() > 0){
-      // 主订单
-      Order parentOrder = orderService.getById(order.getRentOrderId());
-      // 更新过期时间延长一个月
-      Date expirationTime = parentOrder.getExpirationTime();
-      DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1);
-      parentOrder.setExpirationTime(nextMonthTime);
-      orderService.updateById(parentOrder);
-      // 保存续费订单状态
-      order.setDeliveryStatus(DELIVERY_STATUS_YES);
-      order.setReceiptStatus(RECEIPT_STATUS_YES);
-      order.setOrderStatus(ORDER_STATUS_COMPLETED);
-      order.setStartTime(expirationTime);
-      order.setExpirationTime(nextMonthTime);
-      orderService.updateById(order);
-    }
-    // 6. 是否是临时报餐
-    final BcTemporaryParam bcTemporaryParam = new BcTemporaryParam();
-    bcTemporaryParam.setUserId(getLoginUserId());
-    bcTemporaryParam.setApplyStatus(1);
-    final List<BcTemporary> bcTemporaries = bcTemporaryService.listRel(bcTemporaryParam);
-    bcTemporaries.forEach(b -> {
-      b.setStatus(1);
-      bcTemporaryService.updateById(b);
-    });
-    return success("支付成功",user);
-  }
-
-  @OperationLog
-  @ApiModelProperty("余额支付批量")
-  @PostMapping("/balanceBatch")
-  @Transactional(rollbackFor = {Exception.class})
-  public ApiResult<?> balanceBatch(@RequestBody List<Integer> orderIds) throws AlipayApiException {
-    // 1. 验证签名
-    isCheckSign();
-    // 订单数据
-    final List<Order> list = orderService.listByIds(orderIds);
-    final StringBuilder sb = new StringBuilder();
-
-    list.forEach(d -> {
-      // 当前登录用户id
-      User user = new User();
-      // 代付款情况
-      if(!d.getUserId().equals(getLoginUserId())){
-        user = userService.getById(d.getUserId());
-      }else{
-        user = getLoginUser();
-      }
-      final Integer userId = user.getUserId();
-      final BigDecimal balance = user.getBalance();
-      final BigDecimal payPrice = d.getPayPrice();
-      if(balance.compareTo(payPrice) < 0){
-        sb.append("下单失败：").append(user.getNickname()).append("余额不足");
-        throw new BusinessException("余额不足");
-      }
-      // 2. 扣除余额操作
-      BigDecimal subtract = balance.subtract(payPrice);
-      user.setBalance(subtract);
-      userService.updateById(user);
-      // 3. 记录余额明细
-      UserBalanceLog userBalanceLog = new UserBalanceLog();
-      userBalanceLog.setUserId(userId);
-      userBalanceLog.setScene(BALANCE_USE);
-      userBalanceLog.setMoney(payPrice);
-      userBalanceLog.setBalance(subtract);
-      userBalanceLog.setComments(d.getOrderNo().toString());
-      userBalanceLog.setMerchantCode(d.getMerchantCode());
-      userBalanceLogService.save(userBalanceLog);
-      // 4. 修改支付状态
-      d.setPayStatus(PAY_STATUS_SUCCESS);
-      d.setPayMethod(PAY_METHOD_BALANCE);
-      d.setReceiptAmount(payPrice);
-      d.setPayTime(DateUtil.date());
-      d.setSubject(d.getMerchantName());
-      orderService.updateByIdRel(d);
-      // 5. 续租订单
-      if(d.getRentOrderId() > 0){
-        // 主订单
-        Order parentOrder = orderService.getById(d.getRentOrderId());
-        // 更新过期时间延长一个月
-        Date expirationTime = parentOrder.getExpirationTime();
-        DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1);
-        parentOrder.setExpirationTime(nextMonthTime);
-        orderService.updateById(parentOrder);
-        // 保存续费订单状态
-        d.setDeliveryStatus(DELIVERY_STATUS_YES);
-        d.setReceiptStatus(RECEIPT_STATUS_YES);
-        d.setOrderStatus(ORDER_STATUS_COMPLETED);
-        d.setStartTime(expirationTime);
-        d.setExpirationTime(nextMonthTime);
-        orderService.updateById(d);
-      }
-      // 6. 是否是临时报餐
-      final BcTemporaryParam bcTemporaryParam = new BcTemporaryParam();
-      bcTemporaryParam.setUserId(getLoginUserId());
-      bcTemporaryParam.setApplyStatus(1);
-      final List<BcTemporary> bcTemporaries = bcTemporaryService.listRel(bcTemporaryParam);
-      bcTemporaries.forEach(b -> {
-        b.setStatus(1);
-        bcTemporaryService.updateById(b);
-      });
-    });
-    return success("支付成功",sb);
-  }
-
-  @ApiModelProperty("统一收单交易查询")
-  @GetMapping("/mp-alipay/query/{id}")
-  public ApiResult<?> query(@PathVariable("id") Integer id) throws AlipayApiException {
-    // 验证签名
-    isCheckSign();
-    // 订单数据
-    Order order = orderService.getByIdRel(id);
-    // 实例化客户端
-    DefaultAlipayClient alipayClient = alipayConfig.alipayClient(order.getTenantId());
-    AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
-    JSONObject bizContent = new JSONObject();
-    bizContent.put("out_trade_no", order.getOrderNo());
-    request.setBizContent(bizContent.toString());
-    AlipayTradeQueryResponse response = alipayClient.certificateExecute(request);
-    if(response.isSuccess()){
-      System.out.println("调用成功");
-      orderService.paySuccess(response);
-    } else {
-      System.out.println("调用失败");
-    }
-    return success("调用成功",response);
-  }
-
-  @ApiModelProperty("测试")
-  @GetMapping("/mp-alipay/test")
-  public String test() {
-    System.out.println("开始>>>>>");
-    Order order = orderService.getByOutTradeNo("2023213225911618");
-    System.out.println("order = " + order);
-    order.setPayPrice(new BigDecimal("0.11"));
-    order.setTotalPrice(new BigDecimal("0.11"));
-    order.setPayStatus(PAY_STATUS_SUCCESS);
-    final boolean b = orderService.updateByIdRel(order);
-    System.out.println("b = " + b);
-
-//    params.put("gmt_create", "2022-12-16 21:32:33");
-//    params.put("charset", "UTF-8");
-//    params.put("seller_email", "zhu115289@163.com");
-//    params.put("subject", "测试商品");
-//    params.put("buyer_id", "2088202959044205");
-//    params.put("invoice_amount", "0.01");
-//    params.put("notify_id", "2022121601222213308044201435873270");
-//    params.put("fund_bill_list", "");
-//    params.put("notify_type", "trade_status_sync");
-//    params.put("trade_status", "TRADE_SUCCESS");
-//    params.put("receipt_amount", "0.01");
-//    params.put("buyer_pay_amount", "0.01");
-//    params.put("app_id", "2021003156628508");
-//    params.put("seller_id", "2088431805524422");
-//    params.put("gmt_payment", "2022-12-16 21:33:07");
-//    params.put("notify_time", "2022-12-16 21:33:09");
-//    params.put("version", "1.0");
-//    params.put("out_trade_no", "20221116205303366");
-//    params.put("total_amount", "0.01");
-//    params.put("trade_no", "2022121622001444201411215463");
-//    params.put("auth_app_id", "2021003156628508");
-//    params.put("buyer_logon_id", "ip1***@163.com");
-//    params.put("point_amount", "0.00");
-//    // 处理订单业务
-//    orderService.paySuccess(params);
-    return "success";
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java
deleted file mode 100644
index f1c26f6..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/PaymentTemplateController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.PaymentTemplateService;
-import com.gxwebsoft.shop.entity.PaymentTemplate;
-import com.gxwebsoft.shop.param.PaymentTemplateParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商城支付模板记录表控制器
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Api(tags = "商城支付模板记录表管理")
-@RestController
-@RequestMapping("/api/shop/payment-template")
-public class PaymentTemplateController extends BaseController {
-    @Resource
-    private PaymentTemplateService paymentTemplateService;
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:list')")
-    @ApiOperation("分页查询商城支付模板记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<PaymentTemplate>> page(PaymentTemplateParam param) {
-        PageParam<PaymentTemplate, PaymentTemplateParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(paymentTemplateService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(paymentTemplateService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:list')")
-    @ApiOperation("查询全部商城支付模板记录表")
-    @GetMapping()
-    public ApiResult<List<PaymentTemplate>> list(PaymentTemplateParam param) {
-        PageParam<PaymentTemplate, PaymentTemplateParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(paymentTemplateService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(paymentTemplateService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:list')")
-    @ApiOperation("根据id查询商城支付模板记录表")
-    @GetMapping("/{id}")
-    public ApiResult<PaymentTemplate> get(@PathVariable("id") Integer id) {
-        return success(paymentTemplateService.getById(id));
-        // 使用关联查询
-        //return success(paymentTemplateService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:save')")
-    @ApiOperation("添加商城支付模板记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody PaymentTemplate paymentTemplate) {
-        if (paymentTemplateService.save(paymentTemplate)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:update')")
-    @ApiOperation("修改商城支付模板记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody PaymentTemplate paymentTemplate) {
-        if (paymentTemplateService.updateById(paymentTemplate)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:remove')")
-    @ApiOperation("删除商城支付模板记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (paymentTemplateService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:save')")
-    @ApiOperation("批量添加商城支付模板记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<PaymentTemplate> list) {
-        if (paymentTemplateService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:update')")
-    @ApiOperation("批量修改商城支付模板记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<PaymentTemplate> batchParam) {
-        if (batchParam.update(paymentTemplateService, "template_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTemplate:remove')")
-    @ApiOperation("批量删除商城支付模板记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (paymentTemplateService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java
deleted file mode 100644
index 9f4f8a0..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/PaymentTradeController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.PaymentTradeService;
-import com.gxwebsoft.shop.entity.PaymentTrade;
-import com.gxwebsoft.shop.param.PaymentTradeParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 第三方支付交易记录表控制器
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Api(tags = "第三方支付交易记录表管理")
-@RestController
-@RequestMapping("/api/shop/payment-trade")
-public class PaymentTradeController extends BaseController {
-    @Resource
-    private PaymentTradeService paymentTradeService;
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:list')")
-    @ApiOperation("分页查询第三方支付交易记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<PaymentTrade>> page(PaymentTradeParam param) {
-        PageParam<PaymentTrade, PaymentTradeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(paymentTradeService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(paymentTradeService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:list')")
-    @ApiOperation("查询全部第三方支付交易记录表")
-    @GetMapping()
-    public ApiResult<List<PaymentTrade>> list(PaymentTradeParam param) {
-        PageParam<PaymentTrade, PaymentTradeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(paymentTradeService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(paymentTradeService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:list')")
-    @ApiOperation("根据id查询第三方支付交易记录表")
-    @GetMapping("/{id}")
-    public ApiResult<PaymentTrade> get(@PathVariable("id") Integer id) {
-        return success(paymentTradeService.getById(id));
-        // 使用关联查询
-        //return success(paymentTradeService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:save')")
-    @ApiOperation("添加第三方支付交易记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody PaymentTrade paymentTrade) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          paymentTrade.setUserId(loginUser.getUserId());
-          paymentTrade.setMerchantCode(getMerchantCode());
-        }
-        if (paymentTradeService.save(paymentTrade)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:update')")
-    @ApiOperation("修改第三方支付交易记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody PaymentTrade paymentTrade) {
-        if (paymentTradeService.updateById(paymentTrade)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:remove')")
-    @ApiOperation("删除第三方支付交易记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (paymentTradeService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:save')")
-    @ApiOperation("批量添加第三方支付交易记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<PaymentTrade> list) {
-        if (paymentTradeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:update')")
-    @ApiOperation("批量修改第三方支付交易记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<PaymentTrade> batchParam) {
-        if (batchParam.update(paymentTradeService, "trade_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:paymentTrade:remove')")
-    @ApiOperation("批量删除第三方支付交易记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (paymentTradeService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java
deleted file mode 100644
index dc34c94..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderController.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import cn.hutool.core.util.IdUtil;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.RechargeOrder;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.RechargeOrderParam;
-import com.gxwebsoft.shop.service.RechargeOrderService;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN;
-
-/**
- * 会员充值订单表控制器
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Api(tags = "会员充值订单表管理")
-@RestController
-@RequestMapping("/api/shop/recharge-order")
-public class RechargeOrderController extends BaseController {
-    @Resource
-    private RechargeOrderService rechargeOrderService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserBalanceLogService userBalanceLogService;
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:save')")
-    @ApiOperation("会员充值")
-    @PostMapping("/recharge")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> recharge(@RequestBody RechargeOrder rechargeOrder) {
-      // 充值
-      User user = userService.getById(rechargeOrder.getUserId());
-      BigDecimal balance = user.getBalance().add(rechargeOrder.getPayPrice());
-      user.setBalance(balance);
-      userService.updateById(user);
-      // 保存充值记录
-      rechargeOrder.setOrderNo(IdUtil.getSnowflakeNextId());
-      rechargeOrder.setBalance(balance);
-      if (rechargeOrderService.save(rechargeOrder)) {
-        // 记录余额明细
-        UserBalanceLog userBalanceLog = new UserBalanceLog();
-        userBalanceLog.setUserId(rechargeOrder.getUserId());
-        userBalanceLog.setScene(BALANCE_ADMIN);
-        userBalanceLog.setMoney(rechargeOrder.getPayPrice());
-        userBalanceLog.setBalance(balance);
-        userBalanceLog.setComments("操作人：" + getLoginUser().getNickname());
-        userBalanceLog.setRemark(rechargeOrder.getComments());
-        userBalanceLog.setMerchantCode(rechargeOrder.getMerchantCode());
-        userBalanceLogService.save(userBalanceLog);
-        return success("充值成功", user);
-      }
-      return fail("充值失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:list')")
-    @ApiOperation("分页查询会员充值订单表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<RechargeOrder>> page(RechargeOrderParam param) {
-        // 使用关联查询
-        return success(rechargeOrderService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:list')")
-    @ApiOperation("查询全部会员充值订单表")
-    @GetMapping()
-    public ApiResult<List<RechargeOrder>> list(RechargeOrderParam param) {
-        // 使用关联查询
-      return success(rechargeOrderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:list')")
-    @ApiOperation("根据id查询会员充值订单表")
-    @GetMapping("/{id}")
-    public ApiResult<RechargeOrder> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(rechargeOrderService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:save')")
-    @ApiOperation("添加会员充值订单表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody RechargeOrder rechargeOrder) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          rechargeOrder.setUserId(loginUser.getUserId());
-          rechargeOrder.setMerchantCode(getMerchantCode());
-        }
-        if (rechargeOrderService.save(rechargeOrder)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:update')")
-    @ApiOperation("修改会员充值订单表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody RechargeOrder rechargeOrder) {
-        if (rechargeOrderService.updateById(rechargeOrder)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:remove')")
-    @ApiOperation("删除会员充值订单表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (rechargeOrderService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:save')")
-    @ApiOperation("批量充值")
-    @PostMapping("/batchRecharge")
-    @Transactional(rollbackFor = {Exception.class})
-    public ApiResult<?> batchRecharge(@RequestBody List<RechargeOrder> list) {
-      if (rechargeOrderService.saveBatch(list)) {
-          String nickname = getLoginUser().getNickname();
-          ArrayList<User> users = new ArrayList<>(list.size());
-          ArrayList<UserBalanceLog> logs = new ArrayList<>(list.size());
-
-          list.forEach(d -> {
-            User user = userService.getByIdRel(d.getUserId());
-            BigDecimal balance = user.getBalance().add(d.getPayPrice());
-            user.setBalance(balance);
-            users.add(user);
-            UserBalanceLog userBalanceLog = new UserBalanceLog();
-            userBalanceLog.setUserId(d.getUserId());
-            userBalanceLog.setScene(BALANCE_ADMIN);
-            userBalanceLog.setMoney(d.getPayPrice());
-            userBalanceLog.setBalance(balance);
-            userBalanceLog.setComments("操作人：" + nickname);
-            userBalanceLog.setRemark(d.getComments());
-            userBalanceLog.setMerchantCode(d.getMerchantCode());
-            logs.add(userBalanceLog);
-          });
-
-          // 批量充值
-          userService.updateBatchById(users);
-          // 记录余额明细
-          userBalanceLogService.saveBatch(logs);
-        return success("充值成功");
-      }
-      return fail("充值失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:update')")
-    @ApiOperation("批量修改会员充值订单表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<RechargeOrder> batchParam) {
-        if (batchParam.update(rechargeOrderService, "order_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrder:remove')")
-    @ApiOperation("批量删除会员充值订单表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (rechargeOrderService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java b/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java
deleted file mode 100644
index a743b32..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/RechargeOrderPlanController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.RechargeOrderPlanService;
-import com.gxwebsoft.shop.entity.RechargeOrderPlan;
-import com.gxwebsoft.shop.param.RechargeOrderPlanParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员充值订单套餐快照表控制器
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Api(tags = "会员充值订单套餐快照表管理")
-@RestController
-@RequestMapping("/api/shop/recharge-order-plan")
-public class RechargeOrderPlanController extends BaseController {
-    @Resource
-    private RechargeOrderPlanService rechargeOrderPlanService;
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:list')")
-    @ApiOperation("分页查询会员充值订单套餐快照表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<RechargeOrderPlan>> page(RechargeOrderPlanParam param) {
-        PageParam<RechargeOrderPlan, RechargeOrderPlanParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(rechargeOrderPlanService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(rechargeOrderPlanService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:list')")
-    @ApiOperation("查询全部会员充值订单套餐快照表")
-    @GetMapping()
-    public ApiResult<List<RechargeOrderPlan>> list(RechargeOrderPlanParam param) {
-        PageParam<RechargeOrderPlan, RechargeOrderPlanParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(rechargeOrderPlanService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(rechargeOrderPlanService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:list')")
-    @ApiOperation("根据id查询会员充值订单套餐快照表")
-    @GetMapping("/{id}")
-    public ApiResult<RechargeOrderPlan> get(@PathVariable("id") Integer id) {
-        return success(rechargeOrderPlanService.getById(id));
-        // 使用关联查询
-        //return success(rechargeOrderPlanService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:save')")
-    @ApiOperation("添加会员充值订单套餐快照表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody RechargeOrderPlan rechargeOrderPlan) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          rechargeOrderPlan.setUserId(loginUser.getUserId());
-          rechargeOrderPlan.setMerchantCode(getMerchantCode());
-        }
-        if (rechargeOrderPlanService.save(rechargeOrderPlan)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:update')")
-    @ApiOperation("修改会员充值订单套餐快照表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody RechargeOrderPlan rechargeOrderPlan) {
-        if (rechargeOrderPlanService.updateById(rechargeOrderPlan)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:remove')")
-    @ApiOperation("删除会员充值订单套餐快照表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (rechargeOrderPlanService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:save')")
-    @ApiOperation("批量添加会员充值订单套餐快照表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<RechargeOrderPlan> list) {
-        if (rechargeOrderPlanService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:update')")
-    @ApiOperation("批量修改会员充值订单套餐快照表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<RechargeOrderPlan> batchParam) {
-        if (batchParam.update(rechargeOrderPlanService, "order_plan_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargeOrderPlan:remove')")
-    @ApiOperation("批量删除会员充值订单套餐快照表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (rechargeOrderPlanService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java b/src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java
deleted file mode 100644
index 1cb2f35..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/RechargePlanController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.RechargePlanService;
-import com.gxwebsoft.shop.entity.RechargePlan;
-import com.gxwebsoft.shop.param.RechargePlanParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员充值套餐表控制器
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Api(tags = "会员充值套餐表管理")
-@RestController
-@RequestMapping("/api/shop/recharge-plan")
-public class RechargePlanController extends BaseController {
-    @Resource
-    private RechargePlanService rechargePlanService;
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:list')")
-    @ApiOperation("分页查询会员充值套餐表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<RechargePlan>> page(RechargePlanParam param) {
-        PageParam<RechargePlan, RechargePlanParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(rechargePlanService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(rechargePlanService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:list')")
-    @ApiOperation("查询全部会员充值套餐表")
-    @GetMapping()
-    public ApiResult<List<RechargePlan>> list(RechargePlanParam param) {
-        PageParam<RechargePlan, RechargePlanParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(rechargePlanService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(rechargePlanService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:list')")
-    @ApiOperation("根据id查询会员充值套餐表")
-    @GetMapping("/{id}")
-    public ApiResult<RechargePlan> get(@PathVariable("id") Integer id) {
-        return success(rechargePlanService.getById(id));
-        // 使用关联查询
-        //return success(rechargePlanService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:save')")
-    @ApiOperation("添加会员充值套餐表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody RechargePlan rechargePlan) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          rechargePlan.setUserId(loginUser.getUserId());
-          rechargePlan.setMerchantCode(getMerchantCode());
-        }
-        if (rechargePlanService.save(rechargePlan)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:update')")
-    @ApiOperation("修改会员充值套餐表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody RechargePlan rechargePlan) {
-        if (rechargePlanService.updateById(rechargePlan)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:remove')")
-    @ApiOperation("删除会员充值套餐表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (rechargePlanService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:save')")
-    @ApiOperation("批量添加会员充值套餐表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<RechargePlan> list) {
-        if (rechargePlanService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:update')")
-    @ApiOperation("批量修改会员充值套餐表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<RechargePlan> batchParam) {
-        if (batchParam.update(rechargePlanService, "plan_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:rechargePlan:remove')")
-    @ApiOperation("批量删除会员充值套餐表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (rechargePlanService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java b/src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java
deleted file mode 100644
index 65fd49f..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/SfExpressController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.config.ExpressConfig;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-public class SfExpressController extends BaseController {
-
-  @Resource
-  ExpressConfig expressConfig;
-
-  public ApiResult<?> createOrder(){
-    String sign = "";
-    String serverHost = expressConfig.getServerHost().concat("/open/api/external/createorder?sign=").concat(sign);
-    return success("成功",serverHost);
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/TestController.java b/src/main/java/com/gxwebsoft/shop/controller/TestController.java
deleted file mode 100644
index fc3c8d0..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/TestController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.constants.RedisConstants;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@Api(tags = "测试控制器")
-@RequestMapping("/api/shop/test")
-public class TestController extends BaseController {
-
-  @GetMapping()
-  @OperationLog
-  @ApiOperation("测试方法")
-  public ApiResult<?> test(){
-    return null;
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java
deleted file mode 100644
index cd5501b..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserAddressController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.UserAddressService;
-import com.gxwebsoft.shop.entity.UserAddress;
-import com.gxwebsoft.shop.param.UserAddressParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户收货地址表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "用户收货地址表管理")
-@RestController
-@RequestMapping("/api/shop/user-address")
-public class UserAddressController extends BaseController {
-    @Resource
-    private UserAddressService userAddressService;
-
-    @PreAuthorize("hasAuthority('shop:userAddress:list')")
-    @ApiOperation("分页查询用户收货地址表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserAddress>> page(UserAddressParam param) {
-        PageParam<UserAddress, UserAddressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userAddressService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(userAddressService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:list')")
-    @ApiOperation("查询全部用户收货地址表")
-    @GetMapping()
-    public ApiResult<List<UserAddress>> list(UserAddressParam param) {
-        PageParam<UserAddress, UserAddressParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userAddressService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(userAddressService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:list')")
-    @ApiOperation("根据id查询用户收货地址表")
-    @GetMapping("/{id}")
-    public ApiResult<UserAddress> get(@PathVariable("id") Integer id) {
-        return success(userAddressService.getById(id));
-        // 使用关联查询
-        //return success(userAddressService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:save')")
-    @ApiOperation("添加用户收货地址表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserAddress userAddress) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userAddress.setUserId(loginUser.getUserId());
-        }
-        if (userAddressService.save(userAddress)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:update')")
-    @ApiOperation("修改用户收货地址表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserAddress userAddress) {
-        if (userAddressService.updateById(userAddress)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:remove')")
-    @ApiOperation("删除用户收货地址表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userAddressService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:save')")
-    @ApiOperation("批量添加用户收货地址表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserAddress> list) {
-        if (userAddressService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:update')")
-    @ApiOperation("批量修改用户收货地址表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserAddress> batchParam) {
-        if (batchParam.update(userAddressService, "address_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userAddress:remove')")
-    @ApiOperation("批量删除用户收货地址表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userAddressService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java
deleted file mode 100644
index cff3a6a..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserBalanceLogController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.UserBalanceLogParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户余额变动明细表控制器
- *
- * @author 科技小王子
- * @since 2023-04-21 15:59:09
- */
-@Api(tags = "用户余额变动明细表管理")
-@RestController
-@RequestMapping("/api/shop/user-balance-log")
-public class UserBalanceLogController extends BaseController {
-    @Resource
-    private UserBalanceLogService userBalanceLogService;
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:list')")
-    @ApiOperation("分页查询用户余额变动明细表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserBalanceLog>> page(UserBalanceLogParam param) {
-        // 使用关联查询
-        return success(userBalanceLogService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:list')")
-    @ApiOperation("查询全部用户余额变动明细表")
-    @GetMapping()
-    public ApiResult<List<UserBalanceLog>> list(UserBalanceLogParam param) {
-        PageParam<UserBalanceLog, UserBalanceLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userBalanceLogService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(userBalanceLogService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:list')")
-    @ApiOperation("根据id查询用户余额变动明细表")
-    @GetMapping("/{id}")
-    public ApiResult<UserBalanceLog> get(@PathVariable("id") Integer id) {
-        return success(userBalanceLogService.getById(id));
-        // 使用关联查询
-        //return success(userBalanceLogService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:save')")
-    @ApiOperation("添加用户余额变动明细表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserBalanceLog userBalanceLog) {
-        // 记录当前登录用户id、租户id、商户编号
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userBalanceLog.setUserId(loginUser.getUserId());
-          userBalanceLog.setMerchantCode(getMerchantCode());
-        }
-        if (userBalanceLogService.save(userBalanceLog)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:update')")
-    @ApiOperation("修改用户余额变动明细表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserBalanceLog userBalanceLog) {
-        if (userBalanceLogService.updateById(userBalanceLog)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:remove')")
-    @ApiOperation("删除用户余额变动明细表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userBalanceLogService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:save')")
-    @ApiOperation("批量添加用户余额变动明细表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserBalanceLog> list) {
-        if (userBalanceLogService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:update')")
-    @ApiOperation("批量修改用户余额变动明细表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserBalanceLog> batchParam) {
-        if (batchParam.update(userBalanceLogService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userBalanceLog:remove')")
-    @ApiOperation("批量删除用户余额变动明细表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userBalanceLogService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java b/src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java
deleted file mode 100644
index e54c4c6..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserCommentController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.UserComment;
-import com.gxwebsoft.shop.param.UserCommentParam;
-import com.gxwebsoft.shop.service.UserCommentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户评价记录表控制器
- *
- * @author 科技小王子
- * @since 2023-07-06 13:55:16
- */
-@Api(tags = "用户评价记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-comment")
-public class UserCommentController extends BaseController {
-    @Resource
-    private UserCommentService userCommentService;
-    @Resource
-    private UserService userService;
-
-    @ApiOperation("分页查询用户评价记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserComment>> page(UserCommentParam param) {
-        User loginUser = getLoginUser();
-        // 使用关联查询
-        if(loginUser != null){
-          param.setLoginUserId(getLoginUserId());
-        }
-        return success(userCommentService.pageRel(param));
-    }
-
-    @ApiOperation("查询全部用户评价记录表")
-    @GetMapping()
-    public ApiResult<List<UserComment>> list(UserCommentParam param) {
-        // 使用关联查询
-        return success(userCommentService.listRel(param));
-    }
-
-    @ApiOperation("根据id查询用户评价记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserComment> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userCommentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userComment:save')")
-    @ApiOperation("添加用户评价记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserComment userComment) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userComment.setUserId(loginUser.getUserId());
-        }
-        if (userCommentService.save(userComment)) {
-            // 追加评论数
-          final User toUser = userService.getById(userComment.getToUserId());
-          toUser.setCommentNumbers(toUser.getCommentNumbers() + 1);
-          userService.updateById(toUser);
-          return success("发表成功",toUser);
-        }
-        return fail("发表失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userComment:update')")
-    @ApiOperation("修改用户评价记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserComment userComment) {
-        if (userCommentService.updateById(userComment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userComment:remove')")
-    @ApiOperation("删除用户评价记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userCommentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userComment:save')")
-    @ApiOperation("批量添加用户评价记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserComment> list) {
-        if (userCommentService.saveBatch(list)) {
-            return success("发表成功");
-        }
-        return fail("发表失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userComment:update')")
-    @ApiOperation("批量修改用户评价记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserComment> batchParam) {
-        if (batchParam.update(userCommentService, "comment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userComment:remove')")
-    @ApiOperation("批量删除用户评价记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userCommentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java b/src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java
deleted file mode 100644
index cda9cc6..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserCouponController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.UserCouponService;
-import com.gxwebsoft.shop.entity.UserCoupon;
-import com.gxwebsoft.shop.param.UserCouponParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户优惠券记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "用户优惠券记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-coupon")
-public class UserCouponController extends BaseController {
-    @Resource
-    private UserCouponService userCouponService;
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:list')")
-    @ApiOperation("分页查询用户优惠券记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserCoupon>> page(UserCouponParam param) {
-        PageParam<UserCoupon, UserCouponParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userCouponService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(userCouponService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:list')")
-    @ApiOperation("查询全部用户优惠券记录表")
-    @GetMapping()
-    public ApiResult<List<UserCoupon>> list(UserCouponParam param) {
-        PageParam<UserCoupon, UserCouponParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userCouponService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(userCouponService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:list')")
-    @ApiOperation("根据id查询用户优惠券记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserCoupon> get(@PathVariable("id") Integer id) {
-        return success(userCouponService.getById(id));
-        // 使用关联查询
-        //return success(userCouponService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:save')")
-    @ApiOperation("添加用户优惠券记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserCoupon userCoupon) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userCoupon.setUserId(loginUser.getUserId());
-        }
-        if (userCouponService.save(userCoupon)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:update')")
-    @ApiOperation("修改用户优惠券记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserCoupon userCoupon) {
-        if (userCouponService.updateById(userCoupon)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:remove')")
-    @ApiOperation("删除用户优惠券记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userCouponService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:save')")
-    @ApiOperation("批量添加用户优惠券记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserCoupon> list) {
-        if (userCouponService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:update')")
-    @ApiOperation("批量修改用户优惠券记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserCoupon> batchParam) {
-        if (batchParam.update(userCouponService, "user_coupon_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userCoupon:remove')")
-    @ApiOperation("批量删除用户优惠券记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userCouponService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java b/src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java
deleted file mode 100644
index f566a97..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserFeedbackController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.UserFeedbackService;
-import com.gxwebsoft.shop.entity.UserFeedback;
-import com.gxwebsoft.shop.param.UserFeedbackParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 意见反馈记录表控制器
- *
- * @author 科技小王子
- * @since 2023-07-16 22:24:55
- */
-@Api(tags = "意见反馈记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-feedback")
-public class UserFeedbackController extends BaseController {
-    @Resource
-    private UserFeedbackService userFeedbackService;
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:list')")
-    @ApiOperation("分页查询意见反馈记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserFeedback>> page(UserFeedbackParam param) {
-        // 使用关联查询
-        return success(userFeedbackService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:list')")
-    @ApiOperation("查询全部意见反馈记录表")
-    @GetMapping()
-    public ApiResult<List<UserFeedback>> list(UserFeedbackParam param) {
-        // 使用关联查询
-        return success(userFeedbackService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:list')")
-    @ApiOperation("根据id查询意见反馈记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserFeedback> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userFeedbackService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:save')")
-    @ApiOperation("添加意见反馈记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserFeedback userFeedback) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userFeedback.setUserId(loginUser.getUserId());
-        }
-        if (userFeedbackService.save(userFeedback)) {
-            return success("已收到您的宝贵意见");
-        }
-        return fail("提交失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:update')")
-    @ApiOperation("修改意见反馈记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserFeedback userFeedback) {
-        if (userFeedbackService.updateById(userFeedback)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:remove')")
-    @ApiOperation("删除意见反馈记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userFeedbackService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:save')")
-    @ApiOperation("批量添加意见反馈记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserFeedback> list) {
-        if (userFeedbackService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:update')")
-    @ApiOperation("批量修改意见反馈记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserFeedback> batchParam) {
-        if (batchParam.update(userFeedbackService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFeedback:remove')")
-    @ApiOperation("批量删除意见反馈记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userFeedbackService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java b/src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java
deleted file mode 100644
index 97db405..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserFollowController.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.UserFollow;
-import com.gxwebsoft.shop.param.UserFollowParam;
-import com.gxwebsoft.shop.service.UserFollowService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 关注记录表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "关注记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-follow")
-public class UserFollowController extends BaseController {
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserFollowService userFollowService;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    private static final String SPLIT = ":";
-    private static final String PREFIX_ENTITY_LIKE = "follow:user";
-    private static final String PREFIX_USER_LIKE = "like:user";
-    private static final String PREFIX_FOLLOWEE = "followee";
-    private static final String PREFIX_FOLLOWER = "follower";
-
-    @PreAuthorize("hasAuthority('shop:userFollow:list')")
-    @ApiOperation("分页查询关注记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserFollow>> page(UserFollowParam param) {
-        // 使用关联查询
-        return success(userFollowService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:list')")
-    @ApiOperation("查询全部关注记录表")
-    @GetMapping()
-    public ApiResult<List<UserFollow>> list(UserFollowParam param) {
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          param.setLoginUserId(getLoginUserId());
-        }
-        return success(userFollowService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:list')")
-    @ApiOperation("根据id查询关注记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserFollow> get(@PathVariable("id") Integer id) {
-        return success(userFollowService.getById(id));
-        // 使用关联查询
-        //return success(userFollowService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:save')")
-    @Transactional(rollbackFor = {Exception.class})
-    @ApiOperation("添加关注记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserFollow userFollow) {
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          User toUser = userService.getById(userFollow.getShopId());
-          final Integer userId = loginUser.getUserId();
-          userFollow.setUserId(userId);
-          // 取消关注
-          if(userFollowService.count(new LambdaQueryWrapper<UserFollow>().eq(UserFollow::getShopId,userFollow.getShopId()).eq(UserFollow::getUserId,userId)) > 0){
-            userFollowService.remove(new LambdaQueryWrapper<UserFollow>().eq(UserFollow::getShopId,userFollow.getShopId()).eq(UserFollow::getUserId,userId));
-            // 从Redis集合中移除
-            stringRedisTemplate.opsForZSet().remove(getFollowKey(userFollow.getShopId()),userId.toString());
-            // 更新粉丝数
-            if(toUser.getFans() > 0){
-              toUser.setFans(toUser.getFans() - 1);
-            }
-            userService.updateById(toUser);
-            // 更新关注数
-            if(loginUser.getFollowers() > 0){
-              loginUser.setFollowers(loginUser.getFollowers() - 1);
-            }
-            userService.updateById(loginUser);
-            return success("已取消关注");
-          }
-          userFollowService.save(userFollow);
-          // 更新粉丝数
-          toUser.setFans(toUser.getFans() + 1);
-          userService.updateById(toUser);
-          // 更新关注数
-          loginUser.setFollowers(toUser.getFollowers() + 1);
-          userService.updateById(loginUser);
-          // 放入redis的set集合
-          stringRedisTemplate.opsForZSet().add(getFollowKey(userFollow.getShopId()),userId.toString(),1);
-          return success("关注成功");
-        }
-        return fail("操作失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:update')")
-    @ApiOperation("修改关注记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserFollow userFollow) {
-        if (userFollowService.updateById(userFollow)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:remove')")
-    @ApiOperation("删除关注记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userFollowService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:save')")
-    @ApiOperation("批量添加关注记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserFollow> list) {
-        if (userFollowService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:update')")
-    @ApiOperation("批量修改关注记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserFollow> batchParam) {
-        if (batchParam.update(userFollowService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userFollow:remove')")
-    @ApiOperation("批量删除关注记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userFollowService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    /**
-     * 某个用户的关注数
-     * @return like:entity:[entityId] ->set(userId)
-     */
-    public static String getFollowKey(Integer userId) {
-      return PREFIX_ENTITY_LIKE + SPLIT + userId;
-    }
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java b/src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java
deleted file mode 100644
index 3329af3..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserGradeController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserGrade;
-import com.gxwebsoft.shop.param.UserGradeParam;
-import com.gxwebsoft.shop.service.UserGradeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户会员等级表控制器
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Api(tags = "用户会员等级表管理")
-@RestController
-@RequestMapping("/api/shop/user-grade")
-public class UserGradeController extends BaseController {
-    @Resource
-    private UserGradeService userGradeService;
-
-    @PreAuthorize("hasAuthority('shop:userGrade:list')")
-    @ApiOperation("分页查询用户会员等级表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserGrade>> page(UserGradeParam param) {
-        // 使用关联查询
-        return success(userGradeService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:list')")
-    @ApiOperation("查询全部用户会员等级表")
-    @GetMapping()
-    public ApiResult<List<UserGrade>> list(UserGradeParam param) {
-        // 使用关联查询
-        return success(userGradeService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:list')")
-    @ApiOperation("根据id查询用户会员等级表")
-    @GetMapping("/{id}")
-    public ApiResult<UserGrade> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userGradeService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:save')")
-    @ApiOperation("添加用户会员等级表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserGrade userGrade) {
-        if (userGradeService.save(userGrade)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:update')")
-    @ApiOperation("修改用户会员等级表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserGrade userGrade) {
-        if (userGradeService.updateById(userGrade)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:remove')")
-    @ApiOperation("删除用户会员等级表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userGradeService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:save')")
-    @ApiOperation("批量添加用户会员等级表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserGrade> list) {
-        if (userGradeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:update')")
-    @ApiOperation("批量修改用户会员等级表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserGrade> batchParam) {
-        if (batchParam.update(userGradeService, "grade_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGrade:remove')")
-    @ApiOperation("批量删除用户会员等级表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userGradeService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java
deleted file mode 100644
index 01d34f1..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserGradeLogController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.shop.entity.UserGradeLog;
-import com.gxwebsoft.shop.param.UserGradeLogParam;
-import com.gxwebsoft.shop.service.UserGradeLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户会员等级变更记录表控制器
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Api(tags = "用户会员等级变更记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-grade-log")
-public class UserGradeLogController extends BaseController {
-    @Resource
-    private UserGradeLogService userGradeLogService;
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:list')")
-    @ApiOperation("分页查询用户会员等级变更记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserGradeLog>> page(UserGradeLogParam param) {
-        // 使用关联查询
-        return success(userGradeLogService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:list')")
-    @ApiOperation("查询全部用户会员等级变更记录表")
-    @GetMapping()
-    public ApiResult<List<UserGradeLog>> list(UserGradeLogParam param) {
-        // 使用关联查询
-        return success(userGradeLogService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:list')")
-    @ApiOperation("根据id查询用户会员等级变更记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserGradeLog> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userGradeLogService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:save')")
-    @ApiOperation("添加用户会员等级变更记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserGradeLog userGradeLog) {
-        if (userGradeLogService.save(userGradeLog)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:update')")
-    @ApiOperation("修改用户会员等级变更记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserGradeLog userGradeLog) {
-        if (userGradeLogService.updateById(userGradeLog)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:remove')")
-    @ApiOperation("删除用户会员等级变更记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userGradeLogService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:save')")
-    @ApiOperation("批量添加用户会员等级变更记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserGradeLog> list) {
-        if (userGradeLogService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:update')")
-    @ApiOperation("批量修改用户会员等级变更记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserGradeLog> batchParam) {
-        if (batchParam.update(userGradeLogService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userGradeLog:remove')")
-    @ApiOperation("批量删除用户会员等级变更记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userGradeLogService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java b/src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java
deleted file mode 100644
index e233aed..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserLikeController.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import com.gxwebsoft.shop.entity.UserLike;
-import com.gxwebsoft.shop.param.UserLikeParam;
-import com.gxwebsoft.shop.service.UserLikeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 点赞记录表控制器
- *
- * @author 科技小王子
- * @since 2023-07-06 17:51:04
- */
-@Api(tags = "点赞记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-like")
-public class UserLikeController extends BaseController {
-    @Resource
-    private UserLikeService userLikeService;
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private ClientCache clientCache;
-
-    @PreAuthorize("hasAuthority('shop:userLike:list')")
-    @ApiOperation("分页查询点赞记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserLike>> page(UserLikeParam param) {
-        User loginUser = getLoginUser();
-        if(loginUser != null){
-            param.setLoginUserId(getLoginUserId());
-        }
-
-        PageResult<UserLike> result = userLikeService.pageRel(param);
-        // 标记已读
-        if(param.getToUserId() != null && param.getToUserId().equals(loginUser.getUserId())){
-            Set<Integer> logIds = result.getList().stream().map(UserLike::getLogId).collect(Collectors.toSet());
-            if(!CollectionUtils.isEmpty(logIds)){
-                LambdaUpdateWrapper<UserLike> updateWrapper = new LambdaUpdateWrapper<UserLike>()
-                        .in(UserLike::getLogId, logIds)
-                        .set(UserLike::getStatus, 1);
-                userLikeService.getBaseMapper().update(null, updateWrapper);
-            }
-        }
-        // 使用关联查询
-        return success(result);
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:list')")
-    @ApiOperation("查询全部点赞记录表")
-    @GetMapping()
-    public ApiResult<List<UserLike>> list(UserLikeParam param) {
-        // 使用关联查询
-        return success(userLikeService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:list')")
-    @ApiOperation("根据id查询点赞记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserLike> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userLikeService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:save')")
-    @Transactional(rollbackFor = {Exception.class})
-    @ApiOperation("添加点赞记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserLike userLike) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userLike.setUserId(loginUser.getUserId());
-          final UserLikeParam param = new UserLikeParam();
-          param.setUserId(loginUser.getUserId());
-          param.setToUserId(userLike.getToUserId());
-          final List<UserLike> userLikes = userLikeService.listRel(param);
-          System.out.println("userLikes = " + userLikes.size());
-
-          // 点赞操作
-          if (userLikes.size() == 0) {
-            final UserLike add = new UserLike();
-            add.setUserId(loginUser.getUserId());
-            add.setToUserId(userLike.getToUserId());
-            userLikeService.save(add);
-            // 更新点赞数量
-            final User modify = userService.getById(userLike.getToUserId());
-            modify.setLikes(modify.getLikes() + 1);
-            userService.updateById(modify);
-            clientCache.sendUserEvent(userLike.getToUserId() + "","likeme", 1);
-            return success("已喜欢", modify.getLikes());
-          }
-
-          // 取消点赞
-          final UserLike like = userLikes.get(0);
-          userLikeService.removeById(like.getLogId());
-          // 更新点赞数量
-          final User modify = userService.getById(userLike.getToUserId());
-          modify.setLikes(modify.getLikes() - 1);
-          userService.updateById(modify);
-          clientCache.sendUserEvent(userLike.getToUserId() + "","likeme", -1);
-          return success("取消喜欢",modify.getLikes());
-        }
-       return fail("操作失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:update')")
-    @ApiOperation("修改点赞记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserLike userLike) {
-        if (userLikeService.updateById(userLike)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:remove')")
-    @ApiOperation("删除点赞记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userLikeService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:save')")
-    @ApiOperation("批量添加点赞记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserLike> list) {
-        if (userLikeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:update')")
-    @ApiOperation("批量修改点赞记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserLike> batchParam) {
-        if (batchParam.update(userLikeService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLike:remove')")
-    @ApiOperation("批量删除点赞记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userLikeService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserLookController.java b/src/main/java/com/gxwebsoft/shop/controller/UserLookController.java
deleted file mode 100644
index eaeb0ce..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserLookController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.love.socketio.cache.ClientCache;
-import com.gxwebsoft.shop.entity.UserLook;
-import com.gxwebsoft.shop.param.UserLookParam;
-import com.gxwebsoft.shop.service.UserLookService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 访客记录表控制器
- *
- * @author 科技小王子
- * @since 2023-07-13 23:10:38
- */
-@Api(tags = "访客记录表管理")
-@RestController
-@RequestMapping("/api/shop/user-look")
-public class UserLookController extends BaseController {
-    @Resource
-    private UserLookService userLookService;
-
-    @Resource
-    private ClientCache clientCache;
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("分页查询访客记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserLook>> page(UserLookParam param) {
-        User loginUser = getLoginUser();
-        if(loginUser != null){
-            param.setLoginUserId(getLoginUserId());
-        }
-        PageResult<UserLook> result = userLookService.pageRel(param);
-        // 标记已读
-        if(param.getToUserId() != null && param.getToUserId().equals(loginUser.getUserId())){
-            Set<Integer> logIds = result.getList().stream().map(UserLook::getLogId).collect(Collectors.toSet());
-            if(!CollectionUtils.isEmpty(logIds)){
-                LambdaUpdateWrapper<UserLook> updateWrapper = new LambdaUpdateWrapper<UserLook>()
-                        .in(UserLook::getLogId, logIds)
-                        .set(UserLook::getStatus, 1);
-                userLookService.getBaseMapper().update(null, updateWrapper);
-
-            }
-
-        }
-        // 使用关联查询
-        return success(result);
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("查询全部访客记录表")
-    @GetMapping()
-    public ApiResult<List<UserLook>> list(UserLookParam param) {
-        // 使用关联查询
-        return success(userLookService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("根据id查询访客记录表")
-    @GetMapping("/{id}")
-    public ApiResult<UserLook> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userLookService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("添加访客记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserLook userLook) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userLook.setUserId(loginUser.getUserId());
-        }
-        if(loginUser.getUserId().equals(userLook.getToUserId())){
-            return success("无事发生");
-        }
-        if (userLookService.save(userLook)) {
-            clientCache.sendUserEvent(userLook.getToUserId() + "","look", 1);
-            return success("添加成功");
-
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("修改访客记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserLook userLook) {
-        if (userLookService.updateById(userLook)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("删除访客记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userLookService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("批量添加访客记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserLook> list) {
-        if (userLookService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("批量修改访客记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserLook> batchParam) {
-        if (batchParam.update(userLookService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userLook:list')")
-    @ApiOperation("批量删除访客记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userLookService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java b/src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java
deleted file mode 100644
index 724bc90..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserOauthController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.UserOauthService;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 第三方用户信息表控制器
- *
- * @author 科技小王子
- * @since 2022-12-15 08:33:13
- */
-@Api(tags = "第三方用户信息表管理")
-@RestController
-@RequestMapping("/api/shop/user-oauth")
-public class UserOauthController extends BaseController {
-    @Resource
-    private UserOauthService userOauthService;
-
-    @PreAuthorize("hasAuthority('shop:userOauth:list')")
-    @ApiOperation("分页查询第三方用户信息表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserOauth>> page(UserOauthParam param) {
-        // 使用关联查询
-        return success(userOauthService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:list')")
-    @ApiOperation("查询全部第三方用户信息表")
-    @GetMapping()
-    public ApiResult<List<UserOauth>> list(UserOauthParam param) {
-        // 使用关联查询
-        return success(userOauthService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:list')")
-    @ApiOperation("根据id查询第三方用户信息表")
-    @GetMapping("/{id}")
-    public ApiResult<UserOauth> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(userOauthService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:save')")
-    @ApiOperation("添加第三方用户信息表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserOauth userOauth) {
-        if (userOauthService.save(userOauth)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:update')")
-    @ApiOperation("修改第三方用户信息表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserOauth userOauth) {
-        if (userOauthService.updateById(userOauth)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:remove')")
-    @ApiOperation("删除第三方用户信息表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userOauthService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:save')")
-    @ApiOperation("批量添加第三方用户信息表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserOauth> list) {
-        if (userOauthService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:update')")
-    @ApiOperation("批量修改第三方用户信息表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserOauth> batchParam) {
-        if (batchParam.update(userOauthService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userOauth:remove')")
-    @ApiOperation("批量删除第三方用户信息表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-      if (userOauthService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java b/src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java
deleted file mode 100644
index ce4ecb1..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserPointsLogController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.service.UserPointsLogService;
-import com.gxwebsoft.shop.entity.UserPointsLog;
-import com.gxwebsoft.shop.param.UserPointsLogParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户积分变动明细表控制器
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Api(tags = "用户积分变动明细表管理")
-@RestController
-@RequestMapping("/api/shop/user-points-log")
-public class UserPointsLogController extends BaseController {
-    @Resource
-    private UserPointsLogService userPointsLogService;
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:list')")
-    @ApiOperation("分页查询用户积分变动明细表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserPointsLog>> page(UserPointsLogParam param) {
-        PageParam<UserPointsLog, UserPointsLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userPointsLogService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(userPointsLogService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:list')")
-    @ApiOperation("查询全部用户积分变动明细表")
-    @GetMapping()
-    public ApiResult<List<UserPointsLog>> list(UserPointsLogParam param) {
-        PageParam<UserPointsLog, UserPointsLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(userPointsLogService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(userPointsLogService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:list')")
-    @ApiOperation("根据id查询用户积分变动明细表")
-    @GetMapping("/{id}")
-    public ApiResult<UserPointsLog> get(@PathVariable("id") Integer id) {
-        return success(userPointsLogService.getById(id));
-        // 使用关联查询
-        //return success(userPointsLogService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:save')")
-    @ApiOperation("添加用户积分变动明细表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserPointsLog userPointsLog) {
-        // 记录当前登录用户id、租户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          userPointsLog.setUserId(loginUser.getUserId());
-        }
-        if (userPointsLogService.save(userPointsLog)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:update')")
-    @ApiOperation("修改用户积分变动明细表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserPointsLog userPointsLog) {
-        if (userPointsLogService.updateById(userPointsLog)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:remove')")
-    @ApiOperation("删除用户积分变动明细表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userPointsLogService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:save')")
-    @ApiOperation("批量添加用户积分变动明细表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserPointsLog> list) {
-        if (userPointsLogService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:update')")
-    @ApiOperation("批量修改用户积分变动明细表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserPointsLog> batchParam) {
-        if (batchParam.update(userPointsLogService, "log_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userPointsLog:remove')")
-    @ApiOperation("批量删除用户积分变动明细表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userPointsLogService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java b/src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java
deleted file mode 100644
index 19ab367..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/UserRefereeController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.UserRefereeParam;
-import com.gxwebsoft.shop.service.UserRefereeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户推荐关系表控制器
- *
- * @author 科技小王子
- * @since 2023-04-28 14:07:29
- */
-@Api(tags = "用户推荐关系表管理")
-@RestController
-@RequestMapping("/api/shop/user-referee")
-public class UserRefereeController extends BaseController {
-    @Resource
-    private UserRefereeService userRefereeService;
-
-    @PreAuthorize("hasAuthority('shop:userReferee:list')")
-    @ApiOperation("分页查询用户推荐关系表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<UserReferee>> page(UserRefereeParam param) {
-//        PageParam<UserReferee, UserRefereeParam> page = new PageParam<>(param);
-//        page.setDefaultOrder("create_time desc");
-//        return success(userRefereeService.page(page, page.getWrapper()));
-        // 使用关联查询
-        return success(userRefereeService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:list')")
-    @ApiOperation("查询全部用户推荐关系表")
-    @GetMapping()
-    public ApiResult<List<UserReferee>> list(UserRefereeParam param) {
-        // 贵港自然资源局定制
-        if(getTenantId().equals(10048)){
-          final List<UserReferee> userRefereeList = userRefereeService.listRel(param);
-          final User user = getLoginUser();
-          final UserReferee userReferee = new UserReferee();
-          userReferee.setNickname(user.getNickname());
-          userRefereeList.add(userReferee);
-          return success(userRefereeList);
-        }
-        // 使用关联查询
-        return success(userRefereeService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:list')")
-    @ApiOperation("根据id查询用户推荐关系表")
-    @GetMapping("/{id}")
-    public ApiResult<UserReferee> get(@PathVariable("id") Integer id) {
-//        return success(userRefereeService.getById(id));
-        // 使用关联查询
-        return success(userRefereeService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:save')")
-    @ApiOperation("添加用户推荐关系表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody UserReferee userReferee) {
-//        if(userReferee.getDealerId().equals(userReferee.getUserId())){
-//          return fail("不能邀请自己");
-//        }
-        final int count = userRefereeService.count(new LambdaQueryWrapper<UserReferee>()
-          .eq(UserReferee::getUserId, userReferee.getUserId())
-          .eq(UserReferee::getDealerId,userReferee.getDealerId())
-        );
-        if(count > 0){
-          return fail("关系已存在");
-        }
-        if (userRefereeService.save(userReferee)) {
-              return success("添加成功");
-          }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:update')")
-    @ApiOperation("修改用户推荐关系表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody UserReferee userReferee) {
-        if (userRefereeService.updateById(userReferee)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:remove')")
-    @ApiOperation("删除用户推荐关系表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (userRefereeService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:save')")
-    @ApiOperation("批量添加用户推荐关系表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<UserReferee> list) {
-        if (userRefereeService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:update')")
-    @ApiOperation("批量修改用户推荐关系表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<UserReferee> batchParam) {
-        if (batchParam.update(userRefereeService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('shop:userReferee:remove')")
-    @ApiOperation("批量删除用户推荐关系表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (userRefereeService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java b/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java
deleted file mode 100644
index 32f0f1f..0000000
--- a/src/main/java/com/gxwebsoft/shop/controller/WxPayController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gxwebsoft.shop.controller;
-
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.service.OrderService;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/api/shop/wx-pay")
-@Api(tags = "微信支付API")
-public class WxPayController extends BaseController
-{
-  @Resource
-  private OrderService orderService;
-
-  public ApiResult<?> nativePay(@PathVariable String orderId){
-      return success("支付成功");
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Cart.java b/src/main/java/com/gxwebsoft/shop/entity/Cart.java
deleted file mode 100644
index a7c507f..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Cart.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 购物车记录表
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Cart对象", description = "购物车记录表")
-@TableName("shop_cart")
-public class Cart implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品sku唯一标识")
-    private String goodsSkuId;
-
-    @ApiModelProperty(value = "商品数量")
-    private Integer goodsNum;
-
-    @ApiModelProperty(value = "商品价格")
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Category.java b/src/main/java/com/gxwebsoft/shop/entity/Category.java
deleted file mode 100644
index 7e4c3a8..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Category.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商品分类表
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Category对象", description = "商品分类表")
-@TableName("shop_category")
-public class Category implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品分类ID")
-    @TableId(value = "category_id", type = IdType.AUTO)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "分类名称")
-    private String title;
-
-    @ApiModelProperty(value = "上级分类ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "分类索引图")
-    private String image;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Comment.java b/src/main/java/com/gxwebsoft/shop/entity/Comment.java
deleted file mode 100644
index 8722f2d..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Comment.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商品评价记录表
- *
- * @author 科技小王子
- * @since 2022-11-23 21:18:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Comment对象", description = "商品评价记录表")
-@TableName("shop_comment")
-public class Comment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "评价ID")
-    @TableId(value = "comment_id", type = IdType.AUTO)
-    private Integer commentId;
-
-    @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
-    private Integer score;
-
-    @ApiModelProperty(value = "评价内容")
-    private String content;
-
-    @ApiModelProperty(value = "是否为图片评价")
-    private Integer isPicture;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "订单商品ID")
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Coupon.java b/src/main/java/com/gxwebsoft/shop/entity/Coupon.java
deleted file mode 100644
index e9cf655..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Coupon.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 优惠券记录表
- *
- * @author 科技小王子
- * @since 2022-11-28 18:26:05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Coupon对象", description = "优惠券记录表")
-@TableName("shop_coupon")
-public class Coupon implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "优惠券ID")
-    @TableId(value = "coupon_id", type = IdType.AUTO)
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券名称")
-    private String name;
-
-    @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)")
-    private Integer couponType;
-
-    @ApiModelProperty(value = "满减券-减免金额")
-    private BigDecimal reducePrice;
-
-    @ApiModelProperty(value = "折扣券-折扣率(0-100)")
-    private Integer discount;
-
-    @ApiModelProperty(value = "最低消费金额")
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)")
-    private Integer expireType;
-
-    @ApiModelProperty(value = "领取后生效-有效天数")
-    private Integer expireDay;
-
-    @ApiModelProperty(value = "固定时间-开始时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "固定时间-结束时间")
-    private Integer endTime;
-
-    @ApiModelProperty(value = "适用范围(10全部商品 20指定商品 30排除商品)")
-    private Integer applyRange;
-
-    @ApiModelProperty(value = "适用范围配置(json格式)")
-    private String applyRangeConfig;
-
-    @ApiModelProperty(value = "发放总数量(-1为不限制)")
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "已领取数量")
-    private Integer receiveNum;
-
-    @ApiModelProperty(value = "优惠券描述")
-    private String describe;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Express.java b/src/main/java/com/gxwebsoft/shop/entity/Express.java
deleted file mode 100644
index 76e0bdf..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Express.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 物流公司记录表
- *
- * @author 科技小王子
- * @since 2022-11-22 00:21:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Express对象", description = "物流公司记录表")
-@TableName("shop_express")
-public class Express implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "物流公司ID")
-    @TableId(value = "express_id", type = IdType.AUTO)
-    private Integer expressId;
-
-    @ApiModelProperty(value = "物流公司名称")
-    private String expressName;
-
-    @ApiModelProperty(value = "物流公司编码 (快递100)")
-    private String kuaidi100Code;
-
-    @ApiModelProperty(value = "物流公司编码 (快递鸟)")
-    private String kdniaoCode;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Goods.java b/src/main/java/com/gxwebsoft/shop/entity/Goods.java
deleted file mode 100644
index 690a73a..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Goods.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 商品记录表
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Goods对象", description = "商品记录表")
-@TableName("shop_goods")
-public class Goods implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品ID")
-    @TableId(value = "goods_id", type = IdType.AUTO)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品编码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "商品规格(10单规格 20多规格)")
-    private Integer goodsType;
-
-    @ApiModelProperty(value = "商品分类ID")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "分类名称")
-    @TableField(exist = false)
-    private String categoryName;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "上传的文件")
-    private String files;
-
-    @ApiModelProperty(value = "主图视频路径")
-    private String videoUrl;
-
-    @ApiModelProperty(value = "商品卖点")
-    private String sellingPoint;
-
-    @ApiModelProperty(value = "商品规格(10单规格 20多规格)")
-    private Integer specType;
-
-    @ApiModelProperty(value = "商品价格(最低)")
-    private BigDecimal goodsPriceMin;
-
-    @ApiModelProperty(value = "商品价格(最高)")
-    private BigDecimal goodsPriceMax;
-
-    @ApiModelProperty(value = "划线价格(最低)")
-    private BigDecimal linePriceMin;
-
-    @ApiModelProperty(value = "划线价格(最高)")
-    private BigDecimal linePriceMax;
-
-    @ApiModelProperty(value = "库存总量(包含所有sku)")
-    private Integer stockTotal;
-
-    @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)")
-    private Integer deductStockType;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "初始销量")
-    private Integer salesInitial;
-
-    @ApiModelProperty(value = "实际销量")
-    private Integer salesActual;
-
-    @ApiModelProperty(value = "配送方式")
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "配送模板ID")
-    private Integer deliveryId;
-
-    @ApiModelProperty(value = "是否开启积分赠送(1开启 0关闭)")
-    private Integer isPointsGift;
-
-    @ApiModelProperty(value = "是否允许使用积分抵扣(1允许 0不允许)")
-    private Integer isPointsDiscount;
-
-    @ApiModelProperty(value = "积分抵扣设置(0默认抵扣 1单独设置抵扣)")
-    private Integer isAlonePointsDiscount;
-
-    @ApiModelProperty(value = "单独设置积分抵扣的配置")
-    private String pointsDiscountConfig;
-
-    @ApiModelProperty(value = "是否开启会员折扣(1开启 0关闭)")
-    private Integer isEnableGrade;
-
-    @ApiModelProperty(value = "会员折扣设置(0默认等级折扣 1单独设置折扣)")
-    private Integer isAloneGrade;
-
-    @ApiModelProperty(value = "单独设置折扣的配置")
-    private String aloneGradeEquity;
-
-    @ApiModelProperty(value = "是否推荐")
-    private Integer isHot;
-
-    @ApiModelProperty(value = "规格单位")
-    private String unit;
-
-    @ApiModelProperty(value = "餐段")
-    private String period;
-
-    @ApiModelProperty(value = "档口")
-    private Integer gear;
-
-    @ApiModelProperty(value = "商品重量")
-    private Double goodsWeight;
-
-    @ApiModelProperty(value = "商品优惠属性: 0无 1限时特惠 2特惠专区")
-    private Integer attribute;
-
-    @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)")
-    private Integer isIndDealer;
-
-    @ApiModelProperty(value = "是否开启限购")
-    private Integer purchaseLimit;
-
-    @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)")
-    private Integer dealerMoneyType;
-
-    @ApiModelProperty(value = "分销佣金(一级)")
-    private BigDecimal firstMoney;
-
-    @ApiModelProperty(value = "分销佣金(二级)")
-    private BigDecimal secondMoney;
-
-    @ApiModelProperty(value = "分销佣金(三级)")
-    private BigDecimal thirdMoney;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0上架, 1下架")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "购物车购买数量")
-    @TableField(exist = false)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "已预定份数")
-    @TableField(exist = false)
-    private Integer deliveryTimes;
-
-    @ApiModelProperty(value = "未领取份数")
-    @TableField(exist = false)
-    private Integer noDeliveryTimes;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/GoodsService.java b/src/main/java/com/gxwebsoft/shop/entity/GoodsService.java
deleted file mode 100644
index 6dcf75b..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/GoodsService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商品服务与承诺记录表
- *
- * @author 科技小王子
- * @since 2022-11-23 21:57:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "GoodsService对象", description = "商品服务与承诺记录表")
-@TableName("shop_goods_service")
-public class GoodsService implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品服务ID")
-    @TableId(value = "service_id", type = IdType.AUTO)
-    private Integer serviceId;
-
-    @ApiModelProperty(value = "服务名称")
-    private String name;
-
-    @ApiModelProperty(value = "概述")
-    private String summary;
-
-    @ApiModelProperty(value = "是否默认(新增商品时)")
-    private Integer isDefault;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Member.java b/src/main/java/com/gxwebsoft/shop/entity/Member.java
deleted file mode 100644
index 7dc3ec2..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Member.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商城会员
- *
- * @author 科技小王子
- * @since 2022-11-25 14:02:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Member对象", description = "商城会员")
-@TableName("shop_member")
-public class Member implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "member_id", type = IdType.AUTO)
-    private Integer memberId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty("登录账号")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty("用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty("用户信息")
-    @TableField(exist = false)
-    private User user;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Merchant.java b/src/main/java/com/gxwebsoft/shop/entity/Merchant.java
deleted file mode 100644
index b7402ee..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Merchant.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 商户管理
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Merchant对象", description = "商户管理")
-@TableName("shop_merchant")
-public class Merchant implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商户ID")
-    @TableId(value = "merchant_id", type = IdType.AUTO)
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String merchantName;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户类型")
-    private String merchantType;
-
-    @ApiModelProperty(value = "当前可提现金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "已冻结金额")
-    private BigDecimal freezeMoney;
-
-    @ApiModelProperty(value = "累积提现金额")
-    private BigDecimal totalMoney;
-
-    @ApiModelProperty(value = "今日收益")
-    private BigDecimal todayMoney;
-
-    @ApiModelProperty(value = "本月收益")
-    private BigDecimal monthMoney;
-
-    @ApiModelProperty(value = "推荐收益比率")
-    private BigDecimal firstRatio;
-
-    @ApiModelProperty(value = "本月收益")
-    private BigDecimal secondRatio;
-
-    @ApiModelProperty(value = "门店收益")
-    private BigDecimal shopRatio;
-
-    @ApiModelProperty(value = "区县收益")
-    private BigDecimal regionRatio;
-
-    @ApiModelProperty(value = "市级收益")
-    private BigDecimal cityRatio;
-
-    @ApiModelProperty(value = "省级收益")
-    private BigDecimal provinceRatio;
-
-    @ApiModelProperty(value = "线上会员收益")
-    private BigDecimal onlineRatio;
-
-    @ApiModelProperty(value = "线下会员收益")
-    private BigDecimal offlineRatio;
-
-    @ApiModelProperty(value = "服务费")
-    private BigDecimal serverRatio;
-
-    @ApiModelProperty(value = "商户logo")
-    private String logo;
-
-    @ApiModelProperty(value = "商户背景图片")
-    private String background;
-
-    @ApiModelProperty(value = "营业时间")
-    private String merchantHours;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "商户详情")
-    private String content;
-
-    @ApiModelProperty(value = "商户坐标经纬度")
-    private String lngAndLat;
-
-    @ApiModelProperty(value = "geohash")
-    private String geohash;
-
-    @ApiModelProperty(value = "商户简介")
-    private String summary;
-
-    @ApiModelProperty(value = "打款方式 (10微信 20支付宝 30银行卡)")
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付宝姓名")
-    private String alipayName;
-
-    @ApiModelProperty(value = "支付宝账号")
-    private String alipayAccount;
-
-    @ApiModelProperty(value = "开户行名称")
-    private String bankName;
-
-    @ApiModelProperty(value = "银行开户名")
-    private String bankAccount;
-
-    @ApiModelProperty(value = "银行卡号")
-    private String bankCard;
-
-    @ApiModelProperty(value = "是否可编辑 0 商户可编辑 1 管理员可编辑")
-    private Integer isEdit;
-
-    @ApiModelProperty(value = "是否支持自提核销(0否 1支持)")
-    private Integer isCheck;
-
-    @ApiModelProperty(value = "店主")
-    private Integer merchantOwner;
-
-    @ApiModelProperty(value = "门店联系电话")
-    private String merchantPhone;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "客户ID")
-    private Integer customerId;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty("登录账号")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty("用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty("用户等级")
-    @TableField(exist = false)
-    private Integer gradeId;
-
-    @ApiModelProperty("用户等级")
-    @TableField(exist = false)
-    private String gradeName;
-
-    @ApiModelProperty(value = "联系电话")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "距离")
-    @TableField(exist = false)
-    private Double distance;
-
-    @ApiModelProperty(value = "店铺ID")
-    @TableField(exist = false)
-    private Long shopId;
-
-    @ApiModelProperty(value = "哗啦啦店铺信息")
-    @TableField(exist = false)
-    private Object shopInfo;
-
-    @ApiModelProperty(value = "提现金额")
-    @TableField(exist = false)
-    private BigDecimal amount;
-
-    public Long getShopId(){
-      if(NumberUtil.isLong(this.merchantCode)){
-        return Long.parseLong(merchantCode);
-      }
-      return null;
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java b/src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java
deleted file mode 100644
index e215fc6..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/MerchantClerk.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商家门店店员表
- *
- * @author 科技小王子
- * @since 2022-11-30 16:32:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "MerchantClerk对象", description = "商家门店店员表")
-@TableName("shop_merchant_clerk")
-public class MerchantClerk implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商户人员ID")
-    @TableId(value = "clerk_id", type = IdType.AUTO)
-    private Integer clerkId;
-
-    @ApiModelProperty(value = "关联商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "关联商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否为商户主")
-    private Integer isOwner;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty("用户信息")
-    @TableField(exist = false)
-    private User user;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java b/src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java
deleted file mode 100644
index 4da10c1..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/MerchantWithdraw.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商户提现记录
- *
- * @author 科技小王子
- * @since 2022-12-02 00:41:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "MerchantWithdraw对象", description = "商户提现记录")
-@TableName("shop_merchant_withdraw")
-public class MerchantWithdraw implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "提现单号")
-    private String withdrawCode;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "提现金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "打款方式 (10微信 20支付宝 30银行卡)")
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付宝姓名")
-    private String alipayName;
-
-    @ApiModelProperty(value = "支付宝账号")
-    private String alipayAccount;
-
-    @ApiModelProperty(value = "开户行名称")
-    private String bankName;
-
-    @ApiModelProperty(value = "银行开户名")
-    private String bankAccount;
-
-    @ApiModelProperty(value = "银行卡号")
-    private String bankCard;
-
-    @ApiModelProperty(value = "申请状态 (10待审核 20审核通过 30驳回 40已打款)")
-    private Integer applyStatus;
-
-    @ApiModelProperty(value = "驳回原因")
-    private String rejectReason;
-
-    @ApiModelProperty(value = "来源客户端(APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "关联商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "评论者昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "评论者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "真实姓名")
-    @TableField(exist = false)
-    private String realName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java
deleted file mode 100644
index 77e2914..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Order.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 订单记录表
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Order对象", description = "订单记录表")
-@TableName("shop_order")
-public class Order implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单ID")
-    @TableId(value = "order_id", type = IdType.AUTO)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单标题")
-    private String subject;
-
-    @ApiModelProperty(value = "订单号")
-    private Long orderNo;
-
-    @ApiModelProperty(value = "商品总金额(不含优惠折扣)")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "订单金额(含优惠折扣)")
-    private BigDecimal orderPrice;
-
-    @ApiModelProperty(value = "优惠券ID")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券抵扣金额")
-    private BigDecimal couponMoney;
-
-    @ApiModelProperty(value = "积分抵扣金额")
-    private BigDecimal pointsMoney;
-
-    @ApiModelProperty(value = "积分抵扣数量")
-    private Integer pointsNum;
-
-    @ApiModelProperty(value = "实际付款金额(包含运费)")
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "第三方支付实收金额")
-    private BigDecimal receiptAmount;
-
-    @ApiModelProperty(value = "后台修改的订单金额(差价)")
-    private BigDecimal updatePrice;
-
-    @ApiModelProperty(value = "买家留言")
-    private String buyerRemark;
-
-    @ApiModelProperty(value = "支付方式(废弃)")
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付方式（余额/微信/支付宝）")
-    private String payMethod;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "付款时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "服务开始时间")
-    private Date startTime;
-
-    @ApiModelProperty(value = "服务到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "购买月份数量")
-    private Integer month;
-
-    @ApiModelProperty(value = "0星期日 1星期一 2星期二 3星期三 4星期四 5星期五 6星期六")
-    private Integer week;
-
-    @ApiModelProperty(value = "第三方交易记录ID")
-    private String tradeId;
-
-    @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)")
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "自提门店ID")
-    private Integer extractShopId;
-
-    @ApiModelProperty(value = "核销店员ID")
-    private Integer extractClerkId;
-
-    @ApiModelProperty(value = "运费金额")
-    private BigDecimal expressPrice;
-
-    @ApiModelProperty(value = "物流公司ID (废弃)")
-    private Integer expressId;
-
-    @ApiModelProperty(value = "物流单号 (废弃)")
-    private String expressNo;
-
-    @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)")
-    private Integer deliveryStatus;
-
-    @ApiModelProperty(value = "发货时间")
-    private Date deliveryTime;
-
-    @ApiModelProperty(value = "收货状态(10未收货 20已收货)")
-    private Integer receiptStatus;
-
-    @ApiModelProperty(value = "收货时间")
-    private Date receiptTime;
-
-    @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)")
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "赠送的积分数量")
-    private Integer pointsBonus;
-
-    @ApiModelProperty(value = "商家备注")
-    private String merchantRemark;
-
-    @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)")
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "最后结算时间")
-    private Date settledTime;
-
-    @ApiModelProperty(value = "续租订单的关联单号")
-    private Integer rentOrderId;
-
-    @ApiModelProperty(value = "微信支付交易号(废弃)")
-    private String transactionId;
-
-    @ApiModelProperty(value = "是否已评价(0否 1是)")
-    private Integer isComment;
-
-    @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)")
-    private Integer orderSource;
-
-    @ApiModelProperty(value = "来源记录ID")
-    private Integer orderSourceId;
-
-    @ApiModelProperty(value = "来源记录的参数 (json格式)")
-    private String orderSourceData;
-
-    @ApiModelProperty(value = "电池租金")
-    private BigDecimal batteryRent;
-
-    @ApiModelProperty(value = "电池押金")
-    private BigDecimal batteryDeposit;
-
-    @ApiModelProperty(value = "保险")
-    private BigDecimal batteryInsurance;
-
-    @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "是否续费订单")
-    private Integer isRenew;
-
-    @ApiModelProperty(value = "是否临时报餐")
-    private Integer isTemporary;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty("账号")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty("用户别名")
-    @TableField(exist = false)
-    private String alias;
-
-    @ApiModelProperty("用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "联系电话")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "所属部门")
-    @TableField(exist = false)
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String organizationName;
-
-    @ApiModelProperty("商品列表")
-    @TableField(exist = false)
-    private List<OrderGoods> goodsList;
-
-    @ApiModelProperty("管理电池商品")
-    @TableField(exist = false)
-    private EquipmentOrderGoods equipmentGoods;
-
-    @ApiModelProperty("设备")
-    @TableField(exist = false)
-    private Equipment equipment;
-
-    @ApiModelProperty("推荐人ID")
-    @TableField(exist = false)
-    private Integer dealerId;
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java b/src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java
deleted file mode 100644
index 68f1202..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderAddress.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 订单收货地址记录表
- *
- * @author 科技小王子
- * @since 2022-12-02 21:21:10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "OrderAddress对象", description = "订单收货地址记录表")
-@TableName("shop_order_address")
-public class OrderAddress implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "地址ID")
-    @TableId(value = "order_address_id", type = IdType.AUTO)
-    private Integer orderAddressId;
-
-    @ApiModelProperty(value = "收货人姓名")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "省份ID")
-    private Integer provinceId;
-
-    @ApiModelProperty(value = "城市ID")
-    private Integer cityId;
-
-    @ApiModelProperty(value = "区/县ID")
-    private Integer regionId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String detail;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "关联商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java b/src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java
deleted file mode 100644
index 6163cd9..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderGoods.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 订单商品记录表
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "OrderGoods对象", description = "订单商品记录表")
-@TableName("shop_order_goods")
-public class OrderGoods implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单商品ID")
-    @TableId(value = "order_goods_id", type = IdType.AUTO)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品分类ID")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "分类名称")
-    @TableField(exist = false)
-    private String categoryName;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String imageUrl;
-
-    @ApiModelProperty(value = "商品封面图ID")
-    private Integer imageId;
-
-    @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)")
-    private Integer deductStockType;
-
-    @ApiModelProperty(value = "规格类型(10单规格 20多规格)")
-    private Integer specType;
-
-    @ApiModelProperty(value = "商品sku唯一标识")
-    private String goodsSkuId;
-
-    @ApiModelProperty(value = "SKU的规格属性(json格式)")
-    private String goodsProps;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "商品编码")
-    private String goodsNo;
-
-    @ApiModelProperty(value = "商品价格(单价)")
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "商品划线价")
-    private BigDecimal linePrice;
-
-    @ApiModelProperty(value = "商品重量(Kg)")
-    private Double goodsWeight;
-
-    @ApiModelProperty(value = "是否存在会员等级折扣")
-    private Integer isUserGrade;
-
-    @ApiModelProperty(value = "会员折扣比例(0-10)")
-    private Integer gradeRatio;
-
-    @ApiModelProperty(value = "会员折扣的商品单价")
-    private BigDecimal gradeGoodsPrice;
-
-    @ApiModelProperty(value = "会员折扣的总额差")
-    private BigDecimal gradeTotalMoney;
-
-    @ApiModelProperty(value = "优惠券折扣金额")
-    private BigDecimal couponMoney;
-
-    @ApiModelProperty(value = "积分金额")
-    private BigDecimal pointsMoney;
-
-    @ApiModelProperty(value = "积分抵扣数量")
-    private Integer pointsNum;
-
-    @ApiModelProperty(value = "赠送的积分数量")
-    private Integer pointsBonus;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    @TableField(exist = false)
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "购买数量")
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "商品总价(数量×单价)")
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "实际付款价(折扣和优惠后)")
-    private BigDecimal totalPayPrice;
-
-    @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)")
-    private Integer deliveryStatus;
-
-    @ApiModelProperty(value = "发货时间")
-    @TableField(exist = false)
-    private Date deliveryTime;
-
-    @ApiModelProperty(value = "0星期日 1星期一 2星期二 3星期三 4星期四 5星期五 6星期六")
-    @TableField(exist = false)
-    private Integer week;
-
-    @ApiModelProperty(value = "已发货数量")
-    private Integer deliveryNum;
-
-    @ApiModelProperty(value = "所属档口")
-    private Integer gear;
-
-    @ApiModelProperty(value = "是否临时报餐")
-    private Integer temporary;
-
-    @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)")
-    private Integer isIndDealer;
-
-    @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)")
-    private Integer dealerMoneyType;
-
-    @ApiModelProperty(value = "分销佣金(一级)")
-    private BigDecimal firstMoney;
-
-    @ApiModelProperty(value = "分销佣金(二级)")
-    private BigDecimal secondMoney;
-
-    @ApiModelProperty(value = "分销佣金(三级)")
-    private BigDecimal thirdMoney;
-
-    @ApiModelProperty(value = "是否已评价(0否 1是)")
-    private Integer isComment;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "来源记录ID")
-    private Integer goodsSourceId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "订单状态")
-    @TableField(exist = false)
-    private Integer orderStatus;
-
-    @ApiModelProperty("是否允许取消")
-    @TableField(exist = false)
-    private Boolean isCancel;
-
-    @ApiModelProperty("导出数据")
-    @TableField(exist = false)
-    private Object exportData;
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java
deleted file mode 100644
index 67400a9..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 售后单记录表
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "OrderRefund对象", description = "售后单记录表")
-@TableName("shop_order_refund")
-public class OrderRefund implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "售后单ID")
-    @TableId(value = "order_refund_id", type = IdType.AUTO)
-    private Integer orderRefundId;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单商品ID")
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "售后类型(10退货退款 20换货)")
-    private Integer type;
-
-    @ApiModelProperty(value = "用户申请原因(说明)")
-    private String applyDesc;
-
-    @ApiModelProperty(value = "商家审核状态(0待审核 10已同意 20已拒绝)")
-    private Integer auditStatus;
-
-    @ApiModelProperty(value = "商家拒绝原因(说明)")
-    private String refuseDesc;
-
-    @ApiModelProperty(value = "实际退款金额")
-    private BigDecimal refundMoney;
-
-    @ApiModelProperty(value = "用户是否发货(0未发货 1已发货)")
-    private Integer isUserSend;
-
-    @ApiModelProperty(value = "用户发货时间")
-    private Integer sendTime;
-
-    @ApiModelProperty(value = "用户发货物流公司ID")
-    private String expressId;
-
-    @ApiModelProperty(value = "用户发货物流单号")
-    private String expressNo;
-
-    @ApiModelProperty(value = "商家收货状态(0未收货 1已收货)")
-    private Integer isReceipt;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "设备编号")
-    @TableField(exist = false)
-    private String equipmentCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @TableField(exist = false)
-    private String merchantName;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java
deleted file mode 100644
index 2bff36d..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderRefundAddress.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 售后单退货地址记录表
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "OrderRefundAddress对象", description = "售后单退货地址记录表")
-@TableName("shop_order_refund_address")
-public class OrderRefundAddress implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "售后单ID")
-    private Integer orderRefundId;
-
-    @ApiModelProperty(value = "收货人姓名")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "所在省份ID")
-    private Integer provinceId;
-
-    @ApiModelProperty(value = "所在城市ID")
-    private Integer cityId;
-
-    @ApiModelProperty(value = "所在区/县ID")
-    private Integer regionId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String detail;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java
deleted file mode 100644
index 450572b..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/OrderRenew.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 续费订单记录表
- *
- * @author 科技小王子
- * @since 2023-04-13 10:34:35
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "OrderRenew对象", description = "续费订单记录表")
-@TableName("shop_order_renew")
-public class OrderRenew implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "续费单ID")
-    @TableId(value = "order_renew_id", type = IdType.AUTO)
-    private Integer orderRenewId;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单商品ID")
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "类型(10续费订单)")
-    private Integer type;
-
-    @ApiModelProperty(value = "实际续费金额")
-    private BigDecimal renewMoney;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Payment.java b/src/main/java/com/gxwebsoft/shop/entity/Payment.java
deleted file mode 100644
index 3e21235..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/Payment.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 商城支付方式记录表
- *
- * @author 科技小王子
- * @since 2022-12-15 19:11:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Payment对象", description = "商城支付方式记录表")
-@TableName("shop_payment")
-public class Payment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "支付方式ID")
-    @TableId(value = "payment_id", type = IdType.AUTO)
-    private Integer paymentId;
-
-    @ApiModelProperty(value = "支付方式(微信、支付宝、余额)")
-    private String method;
-
-    @ApiModelProperty(value = "编码")
-    private String paymentCode;
-
-    @ApiModelProperty(value = "支付配置(json格式)")
-    private String config;
-
-    @ApiModelProperty(value = "是否为默认支付方式")
-    private Integer isDefault;
-
-    @ApiModelProperty(value = "是否启用")
-    private Integer isEnable;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java b/src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java
deleted file mode 100644
index 64a9eb3..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/PaymentTemplate.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 商城支付模板记录表
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "PaymentTemplate对象", description = "商城支付模板记录表")
-@TableName("shop_payment_template")
-public class PaymentTemplate implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "支付模板ID")
-    @TableId(value = "template_id", type = IdType.AUTO)
-    private Integer templateId;
-
-    @ApiModelProperty(value = "支付模板名称")
-    private String name;
-
-    @ApiModelProperty(value = "支付方式(微信、支付宝、余额)")
-    private String method;
-
-    @ApiModelProperty(value = "支付配置(json格式)")
-    private String config;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remarks;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java b/src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java
deleted file mode 100644
index 729eead..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/PaymentTrade.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 第三方支付交易记录表
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "PaymentTrade对象", description = "第三方支付交易记录表")
-@TableName("shop_payment_trade")
-public class PaymentTrade implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "交易记录ID")
-    @TableId(value = "trade_id", type = IdType.AUTO)
-    private Integer tradeId;
-
-    @ApiModelProperty(value = "交易订单号(全局唯一)")
-    private String outTradeNo;
-
-    @ApiModelProperty(value = "发起客户端(H5、小程序、APP)")
-    private String client;
-
-    @ApiModelProperty(value = "支付方式(微信、支付宝)")
-    private String payMethod;
-
-    @ApiModelProperty(value = "订单类型(10商城订单 100余额充值订单)")
-    private Integer orderType;
-
-    @ApiModelProperty(value = "订单ID(商城订单、充值订单)")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "商城订单号(商城订单、充值订单)")
-    private String orderNo;
-
-    @ApiModelProperty(value = "第三方交易流水号")
-    private String tradeNo;
-
-    @ApiModelProperty(value = "预支付交易会话ID(微信支付)")
-    private String prepayId;
-
-    @ApiModelProperty(value = "交易状态")
-    private Integer tradeState;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java b/src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java
deleted file mode 100644
index 3cb2268..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/RechargeOrder.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 会员充值订单表
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "RechargeOrder对象", description = "会员充值订单表")
-@TableName("shop_recharge_order")
-public class RechargeOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单ID")
-    @TableId(value = "order_id", type = IdType.AUTO)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单号")
-    private Long orderNo;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "部门ID")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String organizationName;
-
-    @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)")
-    private Integer rechargeType;
-
-    @ApiModelProperty(value = "充值套餐ID")
-    private Integer planId;
-
-    @ApiModelProperty(value = "用户支付金额")
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "赠送金额")
-    private BigDecimal giftMoney;
-
-    @ApiModelProperty(value = "实际到账金额")
-    private BigDecimal actualMoney;
-
-    @ApiModelProperty(value = "用户余额")
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "支付方式（微信/支付宝）")
-    private String payMethod;
-
-    @ApiModelProperty(value = "支付状态(10待支付 20已支付)")
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "付款时间")
-    private Integer payTime;
-
-    @ApiModelProperty(value = "第三方交易记录ID")
-    private Integer tradeId;
-
-    @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java b/src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java
deleted file mode 100644
index f042503..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/RechargeOrderPlan.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员充值订单套餐快照表
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "RechargeOrderPlan对象", description = "会员充值订单套餐快照表")
-@TableName("shop_recharge_order_plan")
-public class RechargeOrderPlan implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "order_plan_id", type = IdType.AUTO)
-    private Integer orderPlanId;
-
-    @ApiModelProperty(value = "订单ID")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "主键ID")
-    private Integer planId;
-
-    @ApiModelProperty(value = "方案名称")
-    private String planName;
-
-    @ApiModelProperty(value = "充值金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "赠送金额")
-    private BigDecimal giftMoney;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java b/src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java
deleted file mode 100644
index b1992f2..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/RechargePlan.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 会员充值套餐表
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "RechargePlan对象", description = "会员充值套餐表")
-@TableName("shop_recharge_plan")
-public class RechargePlan implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "plan_id", type = IdType.AUTO)
-    private Integer planId;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String planName;
-
-    @ApiModelProperty(value = "充值金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "赠送金额")
-    private BigDecimal giftMoney;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserAddress.java b/src/main/java/com/gxwebsoft/shop/entity/UserAddress.java
deleted file mode 100644
index 184b276..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserAddress.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户收货地址表
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserAddress对象", description = "用户收货地址表")
-@TableName("shop_user_address")
-public class UserAddress implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "address_id", type = IdType.AUTO)
-    private Integer addressId;
-
-    @ApiModelProperty(value = "收货人姓名")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "省份ID")
-    private Integer provinceId;
-
-    @ApiModelProperty(value = "城市ID")
-    private Integer cityId;
-
-    @ApiModelProperty(value = "区/县ID")
-    private Integer regionId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String detail;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java
deleted file mode 100644
index 792e3cd..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户余额变动明细表
- *
- * @author 科技小王子
- * @since 2023-04-21 15:59:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserBalanceLog对象", description = "用户余额变动明细表")
-@TableName("shop_user_balance_log")
-public class UserBalanceLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)")
-    private Integer scene;
-
-    @ApiModelProperty(value = "变动金额")
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "变动后余额")
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserComment.java b/src/main/java/com/gxwebsoft/shop/entity/UserComment.java
deleted file mode 100644
index 3938ece..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserComment.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户评价记录表
- *
- * @author 科技小王子
- * @since 2023-07-06 13:55:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserComment对象", description = "用户评价记录表")
-@TableName("shop_user_comment")
-public class UserComment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "评价ID")
-    @TableId(value = "comment_id", type = IdType.AUTO)
-    private Integer commentId;
-
-    @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
-    private Integer score;
-
-    @ApiModelProperty(value = "评价内容")
-    private String content;
-
-    @ApiModelProperty(value = "是否为图片评价")
-    private Integer isPicture;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "被评论者ID")
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "回复的评论ID")
-    private Integer replyCommentId;
-
-    @ApiModelProperty(value = "回复者ID")
-    private Integer replyUserId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "评论者昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "评论者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "评论者粉丝数")
-    @TableField(exist = false)
-    private Integer fans;
-
-    @ApiModelProperty(value = "是否已点赞")
-    @TableField(exist = false)
-    private Integer liked;
-
-    @ApiModelProperty(value = "评论者获赞数")
-    @TableField(exist = false)
-    private Boolean likes;
-
-    @ApiModelProperty(value = "评论者所在省份")
-    @TableField(exist = false)
-    private String province;
-
-    @ApiModelProperty(value = "评论者所在城市")
-    @TableField(exist = false)
-    private String city;
-
-    @ApiModelProperty(value = "被评论者昵称")
-    @TableField(exist = false)
-    private String toUserNickname;
-
-    @ApiModelProperty(value = "被评论者头像")
-    @TableField(exist = false)
-    private String toUserAvatar;
-
-    @ApiModelProperty(value = "被评论者粉丝数")
-    @TableField(exist = false)
-    private Integer toUserFans;
-
-    @ApiModelProperty(value = "被评论者所在省份")
-    @TableField(exist = false)
-    private String toUserProvince;
-
-    @ApiModelProperty(value = "被评论者所在城市")
-    @TableField(exist = false)
-    private String toUserCity;
-
-    @ApiModelProperty(value = "被评论者获赞数")
-    @TableField(exist = false)
-    private Integer toUserLikes;
-
-    @ApiModelProperty(value = "回复者昵称")
-    @TableField(exist = false)
-    private String replyNickname;
-
-    @ApiModelProperty(value = "回复者头像")
-    @TableField(exist = false)
-    private String replyAvatar;
-
-    @ApiModelProperty(value = "回复者粉丝数")
-    @TableField(exist = false)
-    private Integer replyFans;
-
-    @ApiModelProperty(value = "子评论列表")
-    @TableField(exist = false)
-    private List<UserComment> children;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java b/src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java
deleted file mode 100644
index cf5ed0d..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserCoupon.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 用户优惠券记录表
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserCoupon对象", description = "用户优惠券记录表")
-@TableName("shop_user_coupon")
-public class UserCoupon implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "user_coupon_id", type = IdType.AUTO)
-    private Integer userCouponId;
-
-    @ApiModelProperty(value = "优惠券ID")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券名称")
-    private String name;
-
-    @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)")
-    private Integer couponType;
-
-    @ApiModelProperty(value = "满减券-减免金额")
-    private BigDecimal reducePrice;
-
-    @ApiModelProperty(value = "折扣券-折扣率(0-100)")
-    private Integer discount;
-
-    @ApiModelProperty(value = "最低消费金额")
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)")
-    private Integer expireType;
-
-    @ApiModelProperty(value = "领取后生效-有效天数")
-    private Integer expireDay;
-
-    @ApiModelProperty(value = "有效期开始时间")
-    private Integer startTime;
-
-    @ApiModelProperty(value = "有效期结束时间")
-    private Integer endTime;
-
-    @ApiModelProperty(value = "适用范围(10全部商品 20指定商品)")
-    private Integer applyRange;
-
-    @ApiModelProperty(value = "适用范围配置(json格式)")
-    private String applyRangeConfig;
-
-    @ApiModelProperty(value = "是否过期(0未过期 1已过期)")
-    private Integer isExpire;
-
-    @ApiModelProperty(value = "是否已使用(0未使用 1已使用)")
-    private Integer isUse;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java b/src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java
deleted file mode 100644
index 78ec9b9..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserFeedback.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 意见反馈记录表
- *
- * @author 科技小王子
- * @since 2023-07-16 22:24:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserFeedback对象", description = "意见反馈记录表")
-@TableName("shop_user_feedback")
-public class UserFeedback implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    @ApiModelProperty(value = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "反馈图片")
-    private String images;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserFollow.java b/src/main/java/com/gxwebsoft/shop/entity/UserFollow.java
deleted file mode 100644
index 8472f49..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserFollow.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 关注记录表
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserFollow对象", description = "关注记录表")
-@TableName("shop_user_follow")
-public class UserFollow implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "关注人")
-    @TableField(exist = false)
-    private User formUser;
-
-    @ApiModelProperty(value = "被关注人")
-    @TableField(exist = false)
-    private User toUser;
-
-    @ApiModelProperty(value = "商铺ID")
-    private Integer shopId;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "关注人昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "关注人头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "被关注人昵称")
-    @TableField(exist = false)
-    private String shopNickname;
-
-    @ApiModelProperty(value = "被关注人头像")
-    @TableField(exist = false)
-    private String shopAvatar;
-
-    @ApiModelProperty(value = "是否相互关注")
-    @TableField(exist = false)
-    private Boolean eachFollow;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserGrade.java b/src/main/java/com/gxwebsoft/shop/entity/UserGrade.java
deleted file mode 100644
index e6a501d..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserGrade.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 用户会员等级表
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserGrade对象", description = "用户会员等级表")
-@TableName("shop_user_grade")
-public class UserGrade implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "等级ID")
-    @TableId(value = "grade_id", type = IdType.AUTO)
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "等级名称")
-    private String name;
-
-    @ApiModelProperty(value = "等级权重(1-9999)")
-    private Integer weight;
-
-    @ApiModelProperty(value = "升级条件")
-    private String upgrade;
-
-    @ApiModelProperty(value = "等级权益(折扣率0-100)")
-    private String equity;
-
-    @ApiModelProperty(value = "佣金比率")
-    private String commission;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java
deleted file mode 100644
index b6adcb5..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserGradeLog.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 用户会员等级变更记录表
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserGradeLog对象", description = "用户会员等级变更记录表")
-@TableName("shop_user_grade_log")
-public class UserGradeLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "变更前的等级ID")
-    private Integer oldGradeId;
-
-    @ApiModelProperty(value = "变更后的等级ID")
-    private Integer newGradeId;
-
-    @ApiModelProperty(value = "变更类型(10后台管理员设置 20自动升级)")
-    private Integer changeType;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserLike.java b/src/main/java/com/gxwebsoft/shop/entity/UserLike.java
deleted file mode 100644
index 80f88f7..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserLike.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 点赞记录表
- *
- * @author 科技小王子
- * @since 2023-07-06 17:51:04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserLike对象", description = "点赞记录表")
-@TableName("shop_user_like")
-public class UserLike implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "点赞对象ID")
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "评论者昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "评论者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "被评论者昵称")
-    @TableField(exist = false)
-    private String toUserNickname;
-
-    @ApiModelProperty(value = "被评论者头像")
-    @TableField(exist = false)
-    private String toUserAvatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserLook.java b/src/main/java/com/gxwebsoft/shop/entity/UserLook.java
deleted file mode 100644
index 1a67ea1..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserLook.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 访客记录表
- *
- * @author 科技小王子
- * @since 2023-07-13 23:10:38
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserLook对象", description = "访客记录表")
-@TableName("shop_user_look")
-public class UserLook implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "点赞对象ID")
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "访问者昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "访问者头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserOauth.java b/src/main/java/com/gxwebsoft/shop/entity/UserOauth.java
deleted file mode 100644
index c3f4c28..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserOauth.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 第三方用户信息表
- *
- * @author 科技小王子
- * @since 2022-12-15 08:33:13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserOauth对象", description = "第三方用户信息表")
-@TableName("shop_user_oauth")
-public class UserOauth implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "第三方登陆类型(MP-WEIXIN)")
-    private String oauthType;
-
-    @ApiModelProperty(value = "第三方用户唯一标识 (uid openid)")
-    private String oauthId;
-
-    @ApiModelProperty(value = "微信unionID")
-    private String unionid;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java b/src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java
deleted file mode 100644
index bda4980..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserPointsLog.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 用户积分变动明细表
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserPointsLog对象", description = "用户积分变动明细表")
-@TableName("shop_user_points_log")
-public class UserPointsLog implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "变动数量")
-    private Integer value;
-
-    @ApiModelProperty(value = "描述/说明")
-    private String describe;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/entity/UserReferee.java b/src/main/java/com/gxwebsoft/shop/entity/UserReferee.java
deleted file mode 100644
index 6c9e45e..0000000
--- a/src/main/java/com/gxwebsoft/shop/entity/UserReferee.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.gxwebsoft.shop.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户推荐关系表
- *
- * @author 科技小王子
- * @since 2023-04-28 14:07:29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "UserReferee对象", description = "用户推荐关系表")
-@TableName("shop_user_referee")
-public class UserReferee implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "推荐人ID")
-    private Integer dealerId;
-
-    @ApiModelProperty(value = "用户id(被推荐人)")
-    private Integer userId;
-
-    @ApiModelProperty(value = "推荐关系层级(1,2,3)")
-    private Integer level;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "推荐人")
-    @TableField(exist = false)
-    private User dealer;
-
-    @ApiModelProperty(value = "被推荐人")
-    @TableField(exist = false)
-    private User user;
-
-    @ApiModelProperty(value = "被推荐人的报餐信息")
-    @TableField(exist = false)
-    private List<Order> order;
-
-    @ApiModelProperty(value = "被推荐人的报餐菜品")
-    @TableField(exist = false)
-    private List<OrderGoods> orderGoods;
-
-    @ApiModelProperty(value = "被推荐人昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "被推荐人头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "被推荐人等级ID")
-    @TableField(exist = false)
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "被推荐人等级")
-    @TableField(exist = false)
-    private String gradeName;
-
-    @ApiModelProperty(value = "推荐人昵称")
-    @TableField(exist = false)
-    private String dealerName;
-
-    @ApiModelProperty(value = "推荐人头像")
-    @TableField(exist = false)
-    private String dealerAvatar;
-
-    @ApiModelProperty(value = "推荐人电话")
-    @TableField(exist = false)
-    private String dealerPhone;
-
-    @ApiModelProperty(value = "用户所属门店")
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "所属门店")
-    @TableField(exist = false)
-    private Merchant merchant;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java
deleted file mode 100644
index 8889fcd..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/CartMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Cart;
-import com.gxwebsoft.shop.param.CartParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 购物车记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface CartMapper extends BaseMapper<Cart> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Cart>
-     */
-    List<Cart> selectPageRel(@Param("page") IPage<Cart> page,
-                             @Param("param") CartParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Cart> selectListRel(@Param("param") CartParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java
deleted file mode 100644
index bdf81ed..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/CategoryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Category;
-import com.gxwebsoft.shop.param.CategoryParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商品分类表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-public interface CategoryMapper extends BaseMapper<Category> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Category>
-     */
-    List<Category> selectPageRel(@Param("page") IPage<Category> page,
-                             @Param("param") CategoryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Category> selectListRel(@Param("param") CategoryParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java
deleted file mode 100644
index 7ba9719..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/CommentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Comment;
-import com.gxwebsoft.shop.param.CommentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商品评价记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-23 21:18:56
- */
-public interface CommentMapper extends BaseMapper<Comment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Comment>
-     */
-    List<Comment> selectPageRel(@Param("page") IPage<Comment> page,
-                             @Param("param") CommentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Comment> selectListRel(@Param("param") CommentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java
deleted file mode 100644
index bd393cb..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/CouponMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Coupon;
-import com.gxwebsoft.shop.param.CouponParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 优惠券记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-28 18:26:05
- */
-public interface CouponMapper extends BaseMapper<Coupon> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Coupon>
-     */
-    List<Coupon> selectPageRel(@Param("page") IPage<Coupon> page,
-                             @Param("param") CouponParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Coupon> selectListRel(@Param("param") CouponParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java
deleted file mode 100644
index 80fa82a..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/ExpressMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Express;
-import com.gxwebsoft.shop.param.ExpressParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 物流公司记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-22 00:21:07
- */
-public interface ExpressMapper extends BaseMapper<Express> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Express>
-     */
-    List<Express> selectPageRel(@Param("page") IPage<Express> page,
-                             @Param("param") ExpressParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Express> selectListRel(@Param("param") ExpressParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java
deleted file mode 100644
index bbecec7..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.param.GoodsParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商品记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-public interface GoodsMapper extends BaseMapper<Goods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Goods>
-     */
-    List<Goods> selectPageRel(@Param("page") IPage<Goods> page,
-                             @Param("param") GoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Goods> selectListRel(@Param("param") GoodsParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java
deleted file mode 100644
index 821e516..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/GoodsServiceMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.GoodsService;
-import com.gxwebsoft.shop.param.GoodsServiceParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商品服务与承诺记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-23 21:57:50
- */
-public interface GoodsServiceMapper extends BaseMapper<GoodsService> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<GoodsService>
-     */
-    List<GoodsService> selectPageRel(@Param("page") IPage<GoodsService> page,
-                             @Param("param") GoodsServiceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<GoodsService> selectListRel(@Param("param") GoodsServiceParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java
deleted file mode 100644
index 5d8e4be..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/MemberMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Member;
-import com.gxwebsoft.shop.param.MemberParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商城会员Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 14:02:24
- */
-public interface MemberMapper extends BaseMapper<Member> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Member>
-     */
-    List<Member> selectPageRel(@Param("page") IPage<Member> page,
-                             @Param("param") MemberParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Member> selectListRel(@Param("param") MemberParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java
deleted file mode 100644
index 12d4754..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/MerchantClerkMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.MerchantClerk;
-import com.gxwebsoft.shop.param.MerchantClerkParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商家门店店员表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-30 16:32:25
- */
-public interface MerchantClerkMapper extends BaseMapper<MerchantClerk> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<MerchantClerk>
-     */
-    List<MerchantClerk> selectPageRel(@Param("page") IPage<MerchantClerk> page,
-                             @Param("param") MerchantClerkParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<MerchantClerk> selectListRel(@Param("param") MerchantClerkParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java
deleted file mode 100644
index aeaf966..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/MerchantMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.param.MerchantParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商户管理Mapper
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-public interface MerchantMapper extends BaseMapper<Merchant> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Merchant>
-     */
-    List<Merchant> selectPageRel(@Param("page") IPage<Merchant> page,
-                             @Param("param") MerchantParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Merchant> selectListRel(@Param("param") MerchantParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java
deleted file mode 100644
index b8d711c..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/MerchantWithdrawMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.MerchantWithdraw;
-import com.gxwebsoft.shop.param.MerchantWithdrawParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商户提现记录Mapper
- *
- * @author 科技小王子
- * @since 2022-12-02 00:41:09
- */
-public interface MerchantWithdrawMapper extends BaseMapper<MerchantWithdraw> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<MerchantWithdraw>
-     */
-    List<MerchantWithdraw> selectPageRel(@Param("page") IPage<MerchantWithdraw> page,
-                             @Param("param") MerchantWithdrawParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<MerchantWithdraw> selectListRel(@Param("param") MerchantWithdrawParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java
deleted file mode 100644
index ac793d8..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/OrderAddressMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.OrderAddress;
-import com.gxwebsoft.shop.param.OrderAddressParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 订单收货地址记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-12-02 21:21:10
- */
-public interface OrderAddressMapper extends BaseMapper<OrderAddress> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<OrderAddress>
-     */
-    List<OrderAddress> selectPageRel(@Param("page") IPage<OrderAddress> page,
-                             @Param("param") OrderAddressParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<OrderAddress> selectListRel(@Param("param") OrderAddressParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java
deleted file mode 100644
index 090562a..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/OrderGoodsMapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * 订单商品记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<OrderGoods>
-     */
-    List<OrderGoods> selectPageRel(@Param("page") IPage<OrderGoods> page,
-                             @Param("param") OrderGoodsParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<OrderGoods> selectListRel(@Param("param") OrderGoodsParam param);
-
-
-    List<OrderGoods> selectByOrderIds(List<Integer> orderIds);
-
-    @InterceptorIgnore(tenantLine = "true")
-    @Select("SELECT * FROM shop_order_goods WHERE order_id = #{param.orderId}")
-    List<OrderGoods> selectByOrderId(Integer orderId);
-
-    @InterceptorIgnore(tenantLine = "true")
-    int selectCountBySettled(@Param("param") OrderGoodsParam param);
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java
deleted file mode 100644
index 5fe85a1..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/OrderMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.param.OrderParam;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * 订单记录表Mapper
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-public interface OrderMapper extends BaseMapper<Order> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Order>
-     */
-    List<Order> selectPageRel(@Param("page") IPage<Order> page,
-                             @Param("param") OrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Order> selectListRel(@Param("param") OrderParam param);
-
-
-    @InterceptorIgnore(tenantLine = "true")
-    List<Order> getOne(@Param("param") OrderParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    boolean updatePayStatus(@Param("param") OrderParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    @Select("UPDATE shop_order SET pay_status = #{param.payStatus} where order_no = #{param.orderNo}")
-    List<Order> getAll(@Param("param") OrderParam param);
-
-//    @InterceptorIgnore(tenantLine = "true")
-    boolean updateByIdRel(@Param("param") Order order);
-
-    @InterceptorIgnore(tenantLine = "true")
-    List<Order> selectPageSettled(@Param("page") IPage<Order> page,
-                              @Param("param") OrderParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    void updateByIdSettled(@Param("param") Order order);
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java
deleted file mode 100644
index 363dd16..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundAddressMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.OrderRefundAddress;
-import com.gxwebsoft.shop.param.OrderRefundAddressParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 售后单退货地址记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-public interface OrderRefundAddressMapper extends BaseMapper<OrderRefundAddress> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<OrderRefundAddress>
-     */
-    List<OrderRefundAddress> selectPageRel(@Param("page") IPage<OrderRefundAddress> page,
-                             @Param("param") OrderRefundAddressParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<OrderRefundAddress> selectListRel(@Param("param") OrderRefundAddressParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java
deleted file mode 100644
index 2afaccd..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/OrderRefundMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.OrderRefund;
-import com.gxwebsoft.shop.param.OrderRefundParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 售后单记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-public interface OrderRefundMapper extends BaseMapper<OrderRefund> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<OrderRefund>
-     */
-    List<OrderRefund> selectPageRel(@Param("page") IPage<OrderRefund> page,
-                             @Param("param") OrderRefundParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<OrderRefund> selectListRel(@Param("param") OrderRefundParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java
deleted file mode 100644
index f82389d..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/OrderRenewMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.OrderRenew;
-import com.gxwebsoft.shop.param.OrderRenewParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 续费订单记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-13 10:34:35
- */
-public interface OrderRenewMapper extends BaseMapper<OrderRenew> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<OrderRenew>
-     */
-    List<OrderRenew> selectPageRel(@Param("page") IPage<OrderRenew> page,
-                             @Param("param") OrderRenewParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<OrderRenew> selectListRel(@Param("param") OrderRenewParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java
deleted file mode 100644
index 2f2c331..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/PaymentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Payment;
-import com.gxwebsoft.shop.param.PaymentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商城支付方式记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-12-15 19:11:07
- */
-public interface PaymentMapper extends BaseMapper<Payment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<Payment>
-     */
-    List<Payment> selectPageRel(@Param("page") IPage<Payment> page,
-                             @Param("param") PaymentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<Payment> selectListRel(@Param("param") PaymentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java
deleted file mode 100644
index de133ec..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/PaymentTemplateMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.PaymentTemplate;
-import com.gxwebsoft.shop.param.PaymentTemplateParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商城支付模板记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-public interface PaymentTemplateMapper extends BaseMapper<PaymentTemplate> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<PaymentTemplate>
-     */
-    List<PaymentTemplate> selectPageRel(@Param("page") IPage<PaymentTemplate> page,
-                             @Param("param") PaymentTemplateParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<PaymentTemplate> selectListRel(@Param("param") PaymentTemplateParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java
deleted file mode 100644
index b830756..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/PaymentTradeMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.PaymentTrade;
-import com.gxwebsoft.shop.param.PaymentTradeParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 第三方支付交易记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-public interface PaymentTradeMapper extends BaseMapper<PaymentTrade> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<PaymentTrade>
-     */
-    List<PaymentTrade> selectPageRel(@Param("page") IPage<PaymentTrade> page,
-                             @Param("param") PaymentTradeParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<PaymentTrade> selectListRel(@Param("param") PaymentTradeParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java
deleted file mode 100644
index c4ee775..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.RechargeOrder;
-import com.gxwebsoft.shop.param.RechargeOrderParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员充值订单表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-public interface RechargeOrderMapper extends BaseMapper<RechargeOrder> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<RechargeOrder>
-     */
-    List<RechargeOrder> selectPageRel(@Param("page") IPage<RechargeOrder> page,
-                             @Param("param") RechargeOrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<RechargeOrder> selectListRel(@Param("param") RechargeOrderParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java
deleted file mode 100644
index 5330632..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/RechargeOrderPlanMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.RechargeOrderPlan;
-import com.gxwebsoft.shop.param.RechargeOrderPlanParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员充值订单套餐快照表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-public interface RechargeOrderPlanMapper extends BaseMapper<RechargeOrderPlan> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<RechargeOrderPlan>
-     */
-    List<RechargeOrderPlan> selectPageRel(@Param("page") IPage<RechargeOrderPlan> page,
-                             @Param("param") RechargeOrderPlanParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<RechargeOrderPlan> selectListRel(@Param("param") RechargeOrderPlanParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java
deleted file mode 100644
index 50b241f..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/RechargePlanMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.RechargePlan;
-import com.gxwebsoft.shop.param.RechargePlanParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 会员充值套餐表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-public interface RechargePlanMapper extends BaseMapper<RechargePlan> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<RechargePlan>
-     */
-    List<RechargePlan> selectPageRel(@Param("page") IPage<RechargePlan> page,
-                             @Param("param") RechargePlanParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<RechargePlan> selectListRel(@Param("param") RechargePlanParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java
deleted file mode 100644
index c2864e3..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserAddressMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserAddress;
-import com.gxwebsoft.shop.param.UserAddressParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户收货地址表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserAddressMapper extends BaseMapper<UserAddress> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserAddress>
-     */
-    List<UserAddress> selectPageRel(@Param("page") IPage<UserAddress> page,
-                             @Param("param") UserAddressParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserAddress> selectListRel(@Param("param") UserAddressParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java
deleted file mode 100644
index 0e01179..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserBalanceLogMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.UserBalanceLogParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户余额变动明细表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-21 15:59:09
- */
-public interface UserBalanceLogMapper extends BaseMapper<UserBalanceLog> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserBalanceLog>
-     */
-    List<UserBalanceLog> selectPageRel(@Param("page") IPage<UserBalanceLog> page,
-                             @Param("param") UserBalanceLogParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserBalanceLog> selectListRel(@Param("param") UserBalanceLogParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java
deleted file mode 100644
index 41b5aab..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserCommentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserComment;
-import com.gxwebsoft.shop.param.UserCommentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户评价记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-07-06 13:55:16
- */
-public interface UserCommentMapper extends BaseMapper<UserComment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserComment>
-     */
-    List<UserComment> selectPageRel(@Param("page") IPage<UserComment> page,
-                             @Param("param") UserCommentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserComment> selectListRel(@Param("param") UserCommentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java
deleted file mode 100644
index 3f29906..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserCouponMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserCoupon;
-import com.gxwebsoft.shop.param.UserCouponParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户优惠券记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserCouponMapper extends BaseMapper<UserCoupon> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserCoupon>
-     */
-    List<UserCoupon> selectPageRel(@Param("page") IPage<UserCoupon> page,
-                             @Param("param") UserCouponParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserCoupon> selectListRel(@Param("param") UserCouponParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java
deleted file mode 100644
index 9a093c0..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserFeedbackMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserFeedback;
-import com.gxwebsoft.shop.param.UserFeedbackParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 意见反馈记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-07-16 22:24:55
- */
-public interface UserFeedbackMapper extends BaseMapper<UserFeedback> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserFeedback>
-     */
-    List<UserFeedback> selectPageRel(@Param("page") IPage<UserFeedback> page,
-                             @Param("param") UserFeedbackParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserFeedback> selectListRel(@Param("param") UserFeedbackParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java
deleted file mode 100644
index 8ed7e5f..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserFollowMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserFollow;
-import com.gxwebsoft.shop.param.UserFollowParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 关注记录表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserFollowMapper extends BaseMapper<UserFollow> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserFollow>
-     */
-    List<UserFollow> selectPageRel(@Param("page") IPage<UserFollow> page,
-                             @Param("param") UserFollowParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserFollow> selectListRel(@Param("param") UserFollowParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java
deleted file mode 100644
index a16c6a2..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserGradeLogMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserGradeLog;
-import com.gxwebsoft.shop.param.UserGradeLogParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户会员等级变更记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-public interface UserGradeLogMapper extends BaseMapper<UserGradeLog> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserGradeLog>
-     */
-    List<UserGradeLog> selectPageRel(@Param("page") IPage<UserGradeLog> page,
-                             @Param("param") UserGradeLogParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserGradeLog> selectListRel(@Param("param") UserGradeLogParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java
deleted file mode 100644
index bac98d8..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserGradeMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserGrade;
-import com.gxwebsoft.shop.param.UserGradeParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户会员等级表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-public interface UserGradeMapper extends BaseMapper<UserGrade> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserGrade>
-     */
-    List<UserGrade> selectPageRel(@Param("page") IPage<UserGrade> page,
-                             @Param("param") UserGradeParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserGrade> selectListRel(@Param("param") UserGradeParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java
deleted file mode 100644
index 8b6bd23..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserLikeMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserLike;
-import com.gxwebsoft.shop.param.UserLikeParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 点赞记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-07-06 17:51:04
- */
-public interface UserLikeMapper extends BaseMapper<UserLike> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserLike>
-     */
-    List<UserLike> selectPageRel(@Param("page") IPage<UserLike> page,
-                             @Param("param") UserLikeParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserLike> selectListRel(@Param("param") UserLikeParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java
deleted file mode 100644
index 66065cc..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserLookMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserLook;
-import com.gxwebsoft.shop.param.UserLookParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 访客记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-07-13 23:10:38
- */
-public interface UserLookMapper extends BaseMapper<UserLook> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserLook>
-     */
-    List<UserLook> selectPageRel(@Param("page") IPage<UserLook> page,
-                             @Param("param") UserLookParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserLook> selectListRel(@Param("param") UserLookParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java
deleted file mode 100644
index 56e86d0..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserOauthMapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 第三方用户信息表Mapper
- *
- * @author 科技小王子
- * @since 2022-12-15 08:33:13
- */
-public interface UserOauthMapper extends BaseMapper<UserOauth> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserOauth>
-     */
-    List<UserOauth> selectPageRel(@Param("page") IPage<UserOauth> page,
-                             @Param("param") UserOauthParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserOauth> selectListRel(@Param("param") UserOauthParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    List<UserOauth> getOne(@Param("param") UserOauthParam param);
-
-    @InterceptorIgnore(tenantLine = "true")
-    List<UserOauth> getByOauthId(@Param("param") UserOauthParam param);
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java
deleted file mode 100644
index c07ac82..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserPointsLogMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserPointsLog;
-import com.gxwebsoft.shop.param.UserPointsLogParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户积分变动明细表Mapper
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserPointsLogMapper extends BaseMapper<UserPointsLog> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserPointsLog>
-     */
-    List<UserPointsLog> selectPageRel(@Param("page") IPage<UserPointsLog> page,
-                             @Param("param") UserPointsLogParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserPointsLog> selectListRel(@Param("param") UserPointsLogParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java
deleted file mode 100644
index ca09702..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/UserRefereeMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.shop.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.UserRefereeParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 用户推荐关系表Mapper
- *
- * @author 科技小王子
- * @since 2023-04-28 14:07:29
- */
-public interface UserRefereeMapper extends BaseMapper<UserReferee> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<UserReferee>
-     */
-    List<UserReferee> selectPageRel(@Param("page") IPage<UserReferee> page,
-                             @Param("param") UserRefereeParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<UserReferee> selectListRel(@Param("param") UserRefereeParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml
deleted file mode 100644
index 0073a4b..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/CategoryMapper.xml
+++ /dev/null
@@ -1,59 +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="com.gxwebsoft.shop.mapper.CategoryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_category a
-        <where>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
-            </if>
-            <if test="param.title != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.merchantCode != null">
-              AND a.shop_code = #{param.merchantCode}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Category">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Category">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml
deleted file mode 100644
index e78cafe..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/CommentMapper.xml
+++ /dev/null
@@ -1,68 +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="com.gxwebsoft.shop.mapper.CommentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_comment a
-        <where>
-            <if test="param.commentId != null">
-                AND a.comment_id = #{param.commentId}
-            </if>
-            <if test="param.score != null">
-                AND a.score = #{param.score}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.isPicture != null">
-                AND a.is_picture = #{param.isPicture}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.orderGoodsId != null">
-                AND a.order_goods_id = #{param.orderGoodsId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Comment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Comment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml
deleted file mode 100644
index a35abc5..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/CouponMapper.xml
+++ /dev/null
@@ -1,95 +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="com.gxwebsoft.shop.mapper.CouponMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_coupon a
-        <where>
-            <if test="param.couponId != null">
-                AND a.coupon_id = #{param.couponId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.couponType != null">
-                AND a.coupon_type = #{param.couponType}
-            </if>
-            <if test="param.reducePrice != null">
-                AND a.reduce_price = #{param.reducePrice}
-            </if>
-            <if test="param.discount != null">
-                AND a.discount = #{param.discount}
-            </if>
-            <if test="param.minPrice != null">
-                AND a.min_price = #{param.minPrice}
-            </if>
-            <if test="param.expireType != null">
-                AND a.expire_type = #{param.expireType}
-            </if>
-            <if test="param.expireDay != null">
-                AND a.expire_day = #{param.expireDay}
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time = #{param.startTime}
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time = #{param.endTime}
-            </if>
-            <if test="param.applyRange != null">
-                AND a.apply_range = #{param.applyRange}
-            </if>
-            <if test="param.applyRangeConfig != null">
-                AND a.apply_range_config LIKE CONCAT('%', #{param.applyRangeConfig}, '%')
-            </if>
-            <if test="param.totalNum != null">
-                AND a.total_num = #{param.totalNum}
-            </if>
-            <if test="param.receiveNum != null">
-                AND a.receive_num = #{param.receiveNum}
-            </if>
-            <if test="param.describe != null">
-                AND a.describe LIKE CONCAT('%', #{param.describe}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Coupon">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Coupon">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml
deleted file mode 100644
index 46abc2a..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ExpressMapper.xml
+++ /dev/null
@@ -1,62 +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="com.gxwebsoft.shop.mapper.ExpressMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_express a
-        <where>
-            <if test="param.expressId != null">
-                AND a.express_id = #{param.expressId}
-            </if>
-            <if test="param.expressName != null">
-                AND a.express_name LIKE CONCAT('%', #{param.expressName}, '%')
-            </if>
-            <if test="param.kuaidi100Code != null">
-                AND a.kuaidi100_code LIKE CONCAT('%', #{param.kuaidi100Code}, '%')
-            </if>
-            <if test="param.kdniaoCode != null">
-                AND a.kdniao_code LIKE CONCAT('%', #{param.kdniaoCode}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Express">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Express">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml
deleted file mode 100644
index 03aaa5b..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsMapper.xml
+++ /dev/null
@@ -1,168 +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="com.gxwebsoft.shop.mapper.GoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.merchant_name,b.merchant_code,
-        c.title as categoryName,c.parent_id,c.category_id
-        FROM shop_goods a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        LEFT JOIN shop_category c ON a.category_id = c.category_id
-        <where>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.goodsName != null">
-                AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%')
-            </if>
-            <if test="param.goodsCode != null">
-                AND a.goods_code LIKE CONCAT('%', #{param.goodsCode}, '%')
-            </if>
-            <if test="param.goodsType != null">
-                AND a.goods_type = #{param.goodsType}
-            </if>
-            <if test="param.categoryId != null">
-                AND a.category_id = #{param.categoryId}
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.videoUrl != null">
-                AND a.video_url LIKE CONCAT('%', #{param.videoUrl}, '%')
-            </if>
-            <if test="param.sellingPoint != null">
-                AND a.selling_point LIKE CONCAT('%', #{param.sellingPoint}, '%')
-            </if>
-            <if test="param.specType != null">
-                AND a.spec_type = #{param.specType}
-            </if>
-            <if test="param.goodsPriceMin != null">
-                AND a.goods_price_min = #{param.goodsPriceMin}
-            </if>
-            <if test="param.goodsPriceMax != null">
-                AND a.goods_price_max = #{param.goodsPriceMax}
-            </if>
-            <if test="param.linePriceMin != null">
-                AND a.line_price_min = #{param.linePriceMin}
-            </if>
-            <if test="param.linePriceMax != null">
-                AND a.line_price_max = #{param.linePriceMax}
-            </if>
-            <if test="param.stockTotal != null">
-                AND a.stock_total = #{param.stockTotal}
-            </if>
-            <if test="param.deductStockType != null">
-                AND a.deduct_stock_type = #{param.deductStockType}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.salesInitial != null">
-                AND a.sales_initial = #{param.salesInitial}
-            </if>
-            <if test="param.salesActual != null">
-                AND a.sales_actual = #{param.salesActual}
-            </if>
-            <if test="param.deliveryId != null">
-                AND a.delivery_id = #{param.deliveryId}
-            </if>
-            <if test="param.isPointsGift != null">
-                AND a.is_points_gift = #{param.isPointsGift}
-            </if>
-            <if test="param.isPointsDiscount != null">
-                AND a.is_points_discount = #{param.isPointsDiscount}
-            </if>
-            <if test="param.isAlonePointsDiscount != null">
-                AND a.is_alone_points_discount = #{param.isAlonePointsDiscount}
-            </if>
-            <if test="param.pointsDiscountConfig != null">
-                AND a.points_discount_config LIKE CONCAT('%', #{param.pointsDiscountConfig}, '%')
-            </if>
-            <if test="param.isEnableGrade != null">
-                AND a.is_enable_grade = #{param.isEnableGrade}
-            </if>
-            <if test="param.isAloneGrade != null">
-                AND a.is_alone_grade = #{param.isAloneGrade}
-            </if>
-            <if test="param.aloneGradeEquity != null">
-                AND a.alone_grade_equity LIKE CONCAT('%', #{param.aloneGradeEquity}, '%')
-            </if>
-            <if test="param.isHot != null">
-                AND a.is_hot = #{param.isHot}
-            </if>
-            <if test="param.unit != null">
-                AND a.unit LIKE CONCAT('%', #{param.unit}, '%')
-            </if>
-            <if test="param.attribute != null">
-                AND a.attribute = #{param.attribute}
-            </if>
-            <if test="param.isIndDealer != null">
-                AND a.is_ind_dealer = #{param.isIndDealer}
-            </if>
-            <if test="param.dealerMoneyType != null">
-                AND a.dealer_money_type = #{param.dealerMoneyType}
-            </if>
-            <if test="param.firstMoney != null">
-                AND a.first_money = #{param.firstMoney}
-            </if>
-            <if test="param.secondMoney != null">
-                AND a.second_money = #{param.secondMoney}
-            </if>
-            <if test="param.thirdMoney != null">
-                AND a.third_money = #{param.thirdMoney}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.merchantCode != null">
-              AND a.merchant_code = #{param.merchantCode}
-            </if>
-            <if test="param.merchantName != null">
-              AND b.merchant_name = #{param.merchantName}
-            </if>
-            <if test="param.period != null">
-              AND a.period = #{param.period}
-            </if>
-            <if test="param.gear != null">
-              AND a.gear = #{param.gear}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Goods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Goods">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml
deleted file mode 100644
index ae2f5da..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/GoodsServiceMapper.xml
+++ /dev/null
@@ -1,62 +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="com.gxwebsoft.shop.mapper.GoodsServiceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_goods_service a
-        <where>
-            <if test="param.serviceId != null">
-                AND a.service_id = #{param.serviceId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.summary != null">
-                AND a.summary LIKE CONCAT('%', #{param.summary}, '%')
-            </if>
-            <if test="param.isDefault != null">
-                AND a.is_default = #{param.isDefault}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.GoodsService">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.GoodsService">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml
deleted file mode 100644
index f285a73..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/MemberMapper.xml
+++ /dev/null
@@ -1,61 +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="com.gxwebsoft.shop.mapper.MemberMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.user_id,a.member_id,a.create_time addTime,
-               b.*
-        FROM shop_member a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.memberId != null">
-                AND a.member_id = #{param.memberId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.username != null">
-            AND b.username = #{param.username}
-          </if>
-          <if test="param.nickname != null">
-            AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%')
-          </if>
-          <if test="param.phone != null">
-            AND b.phone = #{param.phone}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Member">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Member">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml
deleted file mode 100644
index aaf3ec1..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantClerkMapper.xml
+++ /dev/null
@@ -1,46 +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="com.gxwebsoft.shop.mapper.MerchantClerkMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.merchant_name,b.merchant_code
-        FROM shop_merchant_clerk a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        <where>
-            <if test="param.clerkId != null">
-                AND a.clerk_id = #{param.clerkId}
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.isOwner != null">
-                AND a.is_owner = #{param.isOwner}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.merchantName != null">
-              AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.MerchantClerk">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.MerchantClerk">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml
deleted file mode 100644
index dd2532d..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml
+++ /dev/null
@@ -1,150 +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="com.gxwebsoft.shop.mapper.MerchantMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.username, b.nickname, b.phone,
-               c.grade_id,c.name as gradeName
-        FROM shop_merchant a
-        LEFT JOIN sys_user b ON a.merchant_owner = b.user_id
-        LEFT JOIN shop_user_grade c ON b.grade_id = c.grade_id
-        <where>
-            <if test="param.merchantId != null">
-                AND a.merchant_id = #{param.merchantId}
-            </if>
-            <if test="param.merchantName != null">
-                AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.freezeMoney != null">
-                AND a.freeze_money = #{param.freezeMoney}
-            </if>
-            <if test="param.totalMoney != null">
-                AND a.total_money = #{param.totalMoney}
-            </if>
-            <if test="param.logo != null">
-                AND a.logo LIKE CONCAT('%', #{param.logo}, '%')
-            </if>
-            <if test="param.background != null">
-                AND a.background LIKE CONCAT('%', #{param.background}, '%')
-            </if>
-            <if test="param.merchantHours != null">
-                AND a.merchant_hours LIKE CONCAT('%', #{param.merchantHours}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.lngAndLat != null">
-                AND a.lng_and_lat LIKE CONCAT('%', #{param.lngAndLat}, '%')
-            </if>
-            <if test="param.geohash != null">
-                AND a.geohash LIKE CONCAT('%', #{param.geohash}, '%')
-            </if>
-            <if test="param.summary != null">
-                AND a.summary LIKE CONCAT('%', #{param.summary}, '%')
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type = #{param.payType}
-            </if>
-            <if test="param.alipayName != null">
-                AND a.alipay_name LIKE CONCAT('%', #{param.alipayName}, '%')
-            </if>
-            <if test="param.alipayAccount != null">
-                AND a.alipay_account LIKE CONCAT('%', #{param.alipayAccount}, '%')
-            </if>
-            <if test="param.bankName != null">
-                AND a.bank_name LIKE CONCAT('%', #{param.bankName}, '%')
-            </if>
-            <if test="param.bankAccount != null">
-                AND a.bank_account LIKE CONCAT('%', #{param.bankAccount}, '%')
-            </if>
-            <if test="param.bankCard != null">
-                AND a.bank_card LIKE CONCAT('%', #{param.bankCard}, '%')
-            </if>
-            <if test="param.isEdit != null">
-                AND a.is_edit = #{param.isEdit}
-            </if>
-            <if test="param.isCheck != null">
-                AND a.is_check = #{param.isCheck}
-            </if>
-            <if test="param.merchantOwner != null">
-              AND a.merchant_owner = #{param.merchantOwner}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.customerId != null">
-                AND a.customer_id = #{param.customerId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.username != null">
-            AND b.username = #{param.username}
-          </if>
-          <if test="param.nickname != null">
-            AND b.nickname LIKE CONCAT('%', #{param.nickname}, '%')
-          </if>
-          <if test="param.phone != null">
-            AND b.phone = #{param.phone}
-          </if>
-          <if test="param.tenantId != null">
-            AND a.tenant_id = #{param.tenantId}
-          </if>
-          <if test="param.gradeId != null">
-            AND c.grade_id = #{param.gradeId}
-          </if>
-          <if test="param.sceneType == 'SHOP_USER'">
-            AND c.grade_id >= 7
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Merchant">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Merchant">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml
deleted file mode 100644
index 168062a..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantWithdrawMapper.xml
+++ /dev/null
@@ -1,100 +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="com.gxwebsoft.shop.mapper.MerchantWithdrawMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.merchant_code,b.merchant_name,
-               c.nickname,c.avatar,c.real_name
-        FROM shop_merchant_withdraw a
-        LEFT JOIN shop_merchant b ON a.merchant_code = b.merchant_code
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-          <if test="param.withdrawCode != null">
-            AND a.withdraw_code = #{param.withdrawCode}
-          </if>
-
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type = #{param.payType}
-            </if>
-            <if test="param.alipayName != null">
-                AND a.alipay_name LIKE CONCAT('%', #{param.alipayName}, '%')
-            </if>
-            <if test="param.alipayAccount != null">
-                AND a.alipay_account LIKE CONCAT('%', #{param.alipayAccount}, '%')
-            </if>
-            <if test="param.bankName != null">
-                AND a.bank_name LIKE CONCAT('%', #{param.bankName}, '%')
-            </if>
-            <if test="param.bankAccount != null">
-                AND a.bank_account LIKE CONCAT('%', #{param.bankAccount}, '%')
-            </if>
-            <if test="param.bankCard != null">
-                AND a.bank_card LIKE CONCAT('%', #{param.bankCard}, '%')
-            </if>
-            <if test="param.applyStatus != null">
-                AND a.apply_status = #{param.applyStatus}
-            </if>
-            <if test="param.auditTime != null">
-                AND a.audit_time = #{param.auditTime}
-            </if>
-            <if test="param.rejectReason != null">
-                AND a.reject_reason LIKE CONCAT('%', #{param.rejectReason}, '%')
-            </if>
-            <if test="param.platform != null">
-                AND a.platform LIKE CONCAT('%', #{param.platform}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.merchantName != null">
-            AND b.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-          </if>
-          <if test="param.merchantCode != null">
-            AND b.merchant_code = #{param.merchantCode}
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.MerchantWithdraw">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.MerchantWithdraw">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml
deleted file mode 100644
index 211ca19..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderAddressMapper.xml
+++ /dev/null
@@ -1,74 +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="com.gxwebsoft.shop.mapper.OrderAddressMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_order_address a
-        <where>
-            <if test="param.orderAddressId != null">
-                AND a.order_address_id = #{param.orderAddressId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.provinceId != null">
-                AND a.province_id = #{param.provinceId}
-            </if>
-            <if test="param.cityId != null">
-                AND a.city_id = #{param.cityId}
-            </if>
-            <if test="param.regionId != null">
-                AND a.region_id = #{param.regionId}
-            </if>
-            <if test="param.detail != null">
-                AND a.detail LIKE CONCAT('%', #{param.detail}, '%')
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.OrderAddress">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.OrderAddress">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml
deleted file mode 100644
index 6a57e30..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderGoodsMapper.xml
+++ /dev/null
@@ -1,219 +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="com.gxwebsoft.shop.mapper.OrderGoodsMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,c.order_status,c.pay_status,c.is_temporary,c.order_status,c.deleted,c.week,c.delivery_time as deliveryTime
-        FROM shop_order_goods a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN shop_order c ON a.order_id = c.order_id
-        <where>
-            <if test="param.orderGoodsId != null">
-                AND a.order_goods_id = #{param.orderGoodsId}
-            </if>
-            <if test="param.goodsId != null">
-                AND a.goods_id = #{param.goodsId}
-            </if>
-            <if test="param.goodsName != null">
-                AND a.goods_name LIKE CONCAT('%', #{param.goodsName}, '%')
-            </if>
-            <if test="param.categoryId != null">
-              AND a.category_id LIKE CONCAT('%', #{param.categoryId}, '%')
-            </if>
-            <if test="param.temporary != null">
-              AND a.temporary = #{param.temporary}
-            </if>
-            <if test="param.payStatus != null">
-              AND c.pay_status = #{param.payStatus}
-            </if>
-            <if test="param.imageId != null">
-                AND a.image_id = #{param.imageId}
-            </if>
-            <if test="param.deductStockType != null">
-                AND a.deduct_stock_type = #{param.deductStockType}
-            </if>
-            <if test="param.specType != null">
-                AND a.spec_type = #{param.specType}
-            </if>
-            <if test="param.goodsSkuId != null">
-                AND a.goods_sku_id LIKE CONCAT('%', #{param.goodsSkuId}, '%')
-            </if>
-            <if test="param.goodsProps != null">
-                AND a.goods_props LIKE CONCAT('%', #{param.goodsProps}, '%')
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.goodsNo != null">
-                AND a.goods_no LIKE CONCAT('%', #{param.goodsNo}, '%')
-            </if>
-            <if test="param.goodsPrice != null">
-                AND a.goods_price = #{param.goodsPrice}
-            </if>
-            <if test="param.linePrice != null">
-                AND a.line_price = #{param.linePrice}
-            </if>
-            <if test="param.goodsWeight != null">
-                AND a.goods_weight LIKE CONCAT('%', #{param.goodsWeight}, '%')
-            </if>
-            <if test="param.isUserGrade != null">
-                AND a.is_user_grade = #{param.isUserGrade}
-            </if>
-            <if test="param.gradeRatio != null">
-                AND a.grade_ratio = #{param.gradeRatio}
-            </if>
-            <if test="param.gradeGoodsPrice != null">
-                AND a.grade_goods_price = #{param.gradeGoodsPrice}
-            </if>
-            <if test="param.gradeTotalMoney != null">
-                AND a.grade_total_money = #{param.gradeTotalMoney}
-            </if>
-            <if test="param.couponMoney != null">
-                AND a.coupon_money = #{param.couponMoney}
-            </if>
-            <if test="param.pointsMoney != null">
-                AND a.points_money = #{param.pointsMoney}
-            </if>
-            <if test="param.pointsNum != null">
-                AND a.points_num = #{param.pointsNum}
-            </if>
-            <if test="param.pointsBonus != null">
-                AND a.points_bonus = #{param.pointsBonus}
-            </if>
-            <if test="param.totalNum != null">
-                AND a.total_num = #{param.totalNum}
-            </if>
-            <if test="param.hasNum != null">
-              AND a.total_num > 0
-            </if>
-            <if test="param.totalPrice != null">
-                AND a.total_price = #{param.totalPrice}
-            </if>
-            <if test="param.totalPayPrice != null">
-                AND a.total_pay_price = #{param.totalPayPrice}
-            </if>
-            <if test="param.deliveryStatus != null">
-                AND a.delivery_status = #{param.deliveryStatus}
-            </if>
-            <if test="param.deliveryTime != null">
-              AND c.delivery_time = #{param.deliveryTime}
-            </if>
-            <if test="param.deliveryNum != null">
-                AND a.delivery_num = #{param.deliveryNum}
-            </if>
-            <if test="param.isIndDealer != null">
-                AND a.is_ind_dealer = #{param.isIndDealer}
-            </if>
-            <if test="param.dealerMoneyType != null">
-                AND a.dealer_money_type = #{param.dealerMoneyType}
-            </if>
-            <if test="param.firstMoney != null">
-                AND a.first_money = #{param.firstMoney}
-            </if>
-            <if test="param.secondMoney != null">
-                AND a.second_money = #{param.secondMoney}
-            </if>
-            <if test="param.thirdMoney != null">
-                AND a.third_money = #{param.thirdMoney}
-            </if>
-            <if test="param.isComment != null">
-                AND a.is_comment = #{param.isComment}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.goodsSourceId != null">
-                AND a.goods_source_id = #{param.goodsSourceId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0 AND c.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.deliveryTimeStart != null">
-              AND c.delivery_time &gt;= #{param.deliveryTimeStart}
-            </if>
-            <if test="param.deliveryTimeEnd != null">
-              AND c.delivery_time &lt;= #{param.deliveryTimeEnd}
-            </if>
-            <if test="param.orderStatus != null">
-              AND c.order_status = #{param.orderStatus}
-            </if>
-            <if test="param.gear != null">
-              AND a.gear = #{param.gear}
-            </if>
-            <if test="param.nickname != null">
-              AND a.nickname LIKE CONCAT('%', #{param.nickname}, '%')
-            </if>
-            <if test="param.organizationId != null">
-              AND c.user_id IN (SELECT user_id FROM sys_user WHERE organization_id = #{param.organizationId})
-            </if>
-            <if test="param.week != null">
-              AND c.week = #{param.week}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              a.order_goods_id = #{param.keywords}
-              OR a.order_id = #{param.keywords}
-              OR b.nickname = #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.OrderGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.OrderGoods">
-        <include refid="selectSql"></include>
-    </select>
-
-    <select id="selectByOrderIds" resultType="com.gxwebsoft.shop.entity.OrderGoods">
-      SELECT a.order_id, b.*
-      FROM shop_order a
-      LEFT JOIN shop_order_goods b ON a.order_id = b.order_id
-      WHERE a.order_id IN
-      <foreach collection="orderIds" open="(" close=")" separator="," item="orderId">
-        #{orderId}
-      </foreach>
-      AND b.deleted = 0
-    </select>
-
-    <select id="selectCountBySettled" resultType="com.gxwebsoft.shop.entity.OrderGoods">
-      SELECT COUNT(*)
-      FROM shop_order_goods
-      <where>
-        <if test="param.categoryId != null">
-          AND category_id = #{param.categoryId}
-        </if>
-          AND deleted = 0
-      </where>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
deleted file mode 100644
index b9174db..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
+++ /dev/null
@@ -1,224 +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="com.gxwebsoft.shop.mapper.OrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-        b.nickname,b.alias,b.username,b.user_id,b.avatar,b.phone,b.email,
-        c.equipment_name,c.equipment_code,c.equipment_category,c.equipment_avatar,c.battery_model,c.equipment_id,
-        d.merchant_name,d.merchant_code,
-        e.organization_id,e.organization_name
-        FROM shop_order a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN apps_equipment c ON a.equipment_id = c.equipment_id
-        LEFT JOIN shop_merchant d ON a.merchant_code = d.merchant_code
-        LEFT JOIN sys_organization e ON b.organization_id = e.organization_id
-        <where>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.orderNo != null">
-                AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%')
-            </if>
-            <if test="param.totalPrice != null">
-                AND a.total_price = #{param.totalPrice}
-            </if>
-            <if test="param.orderPrice != null">
-                AND a.order_price = #{param.orderPrice}
-            </if>
-            <if test="param.couponId != null">
-                AND a.coupon_id = #{param.couponId}
-            </if>
-            <if test="param.couponMoney != null">
-                AND a.coupon_money = #{param.couponMoney}
-            </if>
-            <if test="param.pointsMoney != null">
-                AND a.points_money = #{param.pointsMoney}
-            </if>
-            <if test="param.pointsNum != null">
-                AND a.points_num = #{param.pointsNum}
-            </if>
-            <if test="param.payPrice != null">
-                AND a.pay_price = #{param.payPrice}
-            </if>
-            <if test="param.updatePrice != null">
-                AND a.update_price = #{param.updatePrice}
-            </if>
-            <if test="param.buyerRemark != null">
-                AND a.buyer_remark LIKE CONCAT('%', #{param.buyerRemark}, '%')
-            </if>
-            <if test="param.payType != null">
-                AND a.pay_type = #{param.payType}
-            </if>
-            <if test="param.payMethod != null">
-                AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%')
-            </if>
-            <if test="param.payStatus != null">
-                AND a.pay_status = #{param.payStatus}
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time = #{param.payTime}
-            </if>
-            <if test="param.tradeId != null">
-                AND a.trade_id = #{param.tradeId}
-            </if>
-            <if test="param.deliveryType != null">
-                AND a.delivery_type = #{param.deliveryType}
-            </if>
-            <if test="param.extractShopId != null">
-                AND a.extract_shop_id = #{param.extractShopId}
-            </if>
-            <if test="param.extractClerkId != null">
-                AND a.extract_clerk_id = #{param.extractClerkId}
-            </if>
-            <if test="param.expressPrice != null">
-                AND a.express_price = #{param.expressPrice}
-            </if>
-            <if test="param.expressId != null">
-                AND a.express_id = #{param.expressId}
-            </if>
-            <if test="param.expressNo != null">
-                AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%')
-            </if>
-            <if test="param.deliveryStatus != null">
-                AND a.delivery_status = #{param.deliveryStatus}
-            </if>
-            <if test="param.deliveryTime != null">
-                AND a.delivery_time = #{param.deliveryTime}
-            </if>
-            <if test="param.receiptStatus != null">
-                AND a.receipt_status = #{param.receiptStatus}
-            </if>
-            <if test="param.receiptTime != null">
-                AND a.receipt_time = #{param.receiptTime}
-            </if>
-            <if test="param.orderStatus != null">
-                AND a.order_status = #{param.orderStatus}
-            </if>
-            <if test="param.rentOrderId != null">
-              AND a.rent_order_id = #{param.rentOrderId}
-            </if>
-            <if test="param.pointsBonus != null">
-                AND a.points_bonus = #{param.pointsBonus}
-            </if>
-            <if test="param.merchantRemark != null">
-                AND a.merchant_remark LIKE CONCAT('%', #{param.merchantRemark}, '%')
-            </if>
-            <if test="param.isSettled != null">
-                AND a.is_settled = #{param.isSettled}
-            </if>
-            <if test="param.transactionId != null">
-                AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%')
-            </if>
-            <if test="param.isComment != null">
-                AND a.is_comment = #{param.isComment}
-            </if>
-            <if test="param.orderSource != null">
-                AND a.order_source = #{param.orderSource}
-            </if>
-            <if test="param.orderSourceId != null">
-                AND a.order_source_id = #{param.orderSourceId}
-            </if>
-            <if test="param.orderSourceData != null">
-                AND a.order_source_data LIKE CONCAT('%', #{param.orderSourceData}, '%')
-            </if>
-            <if test="param.platform != null">
-                AND a.platform LIKE CONCAT('%', #{param.platform}, '%')
-            </if>
-            <if test="param.isRenew != null">
-              AND a.is_renew = #{param.isRenew}
-            </if>
-            <if test="param.week != null">
-              AND a.week = #{param.week}
-            </if>
-            <if test="param.isTemporary != null">
-              AND a.is_temporary = #{param.isTemporary}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.userIds != null">
-              AND a.user_id IN
-              <foreach collection="param.userIds" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.merchantName != null">
-              AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
-            </if>
-            <if test="param.merchantCode != null">
-              AND a.merchant_code = #{param.merchantCode}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              a.order_no = #{param.keywords}
-              OR a.order_id = #{param.keywords}
-              OR a.user_id = #{param.keywords}
-              OR a.comments LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone = #{param.keywords}
-              OR c.equipment_code = #{param.keywords}
-              OR d.merchant_name LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Order">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Order">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询单条数据 -->
-    <select id="getOne" resultType="com.gxwebsoft.shop.entity.Order">
-      SELECT * FROM shop_order WHERE order_no = #{param.orderNo}
-    </select>
-
-    <select id="updatePayStatus" resultType="com.gxwebsoft.shop.entity.Order">
-      UPDATE shop_order SET pay_status = #{param.payStatus} WHERE order_no = #{param.orderNo}
-    </select>
-
-    <update id="updateByIdRel">
-      UPDATE shop_order SET pay_status = #{param.payStatus},pay_method = #{param.payMethod},receipt_amount = #{param.receiptAmount},pay_time = #{param.payTime},trade_id = #{param.tradeId},subject = #{param.subject},expiration_time = #{param.expirationTime} WHERE order_id = #{param.orderId}
-    </update>
-
-    <select id="selectPageSettled" resultType="com.gxwebsoft.shop.entity.Order">
-      <include refid="selectSql"></include>
-    </select>
-
-    <update id="updateByIdSettled">
-      UPDATE shop_order SET is_settled = #{param.isSettled},settled_time = #{param.settledTime} WHERE order_id = #{param.orderId}
-    </update>
-
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml
deleted file mode 100644
index 48436c7..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundAddressMapper.xml
+++ /dev/null
@@ -1,74 +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="com.gxwebsoft.shop.mapper.OrderRefundAddressMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_order_refund_address a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.orderRefundId != null">
-                AND a.order_refund_id = #{param.orderRefundId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.provinceId != null">
-                AND a.province_id = #{param.provinceId}
-            </if>
-            <if test="param.cityId != null">
-                AND a.city_id = #{param.cityId}
-            </if>
-            <if test="param.regionId != null">
-                AND a.region_id = #{param.regionId}
-            </if>
-            <if test="param.detail != null">
-                AND a.detail LIKE CONCAT('%', #{param.detail}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.OrderRefundAddress">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.OrderRefundAddress">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml
deleted file mode 100644
index e578fea..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRefundMapper.xml
+++ /dev/null
@@ -1,95 +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="com.gxwebsoft.shop.mapper.OrderRefundMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.nickname,b.avatar,c.equipment_code,d.merchant_name
-        FROM shop_order_refund a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN apps_equipment c ON a.order_id = c.order_id
-        LEFT JOIN shop_merchant d ON a.merchant_code = d.merchant_code
-        <where>
-            <if test="param.orderRefundId != null">
-                AND a.order_refund_id = #{param.orderRefundId}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.orderGoodsId != null">
-                AND a.order_goods_id = #{param.orderGoodsId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.applyDesc != null">
-                AND a.apply_desc LIKE CONCAT('%', #{param.applyDesc}, '%')
-            </if>
-            <if test="param.auditStatus != null">
-                AND a.audit_status = #{param.auditStatus}
-            </if>
-            <if test="param.refuseDesc != null">
-                AND a.refuse_desc LIKE CONCAT('%', #{param.refuseDesc}, '%')
-            </if>
-            <if test="param.refundMoney != null">
-                AND a.refund_money = #{param.refundMoney}
-            </if>
-            <if test="param.isUserSend != null">
-                AND a.is_user_send = #{param.isUserSend}
-            </if>
-            <if test="param.sendTime != null">
-                AND a.send_time = #{param.sendTime}
-            </if>
-            <if test="param.expressId != null">
-                AND a.express_id LIKE CONCAT('%', #{param.expressId}, '%')
-            </if>
-            <if test="param.expressNo != null">
-                AND a.express_no LIKE CONCAT('%', #{param.expressNo}, '%')
-            </if>
-            <if test="param.isReceipt != null">
-                AND a.is_receipt = #{param.isReceipt}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.OrderRefund">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.OrderRefund">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml
deleted file mode 100644
index 795becc..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderRenewMapper.xml
+++ /dev/null
@@ -1,68 +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="com.gxwebsoft.shop.mapper.OrderRenewMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_order_renew a
-        <where>
-            <if test="param.orderRenewId != null">
-                AND a.order_renew_id = #{param.orderRenewId}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.orderGoodsId != null">
-                AND a.order_goods_id = #{param.orderGoodsId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.type != null">
-                AND a.type = #{param.type}
-            </if>
-            <if test="param.renewMoney != null">
-                AND a.renew_money = #{param.renewMoney}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.OrderRenew">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.OrderRenew">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml
deleted file mode 100644
index 89f1778..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentMapper.xml
+++ /dev/null
@@ -1,62 +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="com.gxwebsoft.shop.mapper.PaymentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_payment a
-        <where>
-            <if test="param.paymentId != null">
-                AND a.payment_id = #{param.paymentId}
-            </if>
-            <if test="param.method != null">
-                AND a.method = #{param.method}
-            </if>
-            <if test="param.paymentCode != null">
-                AND a.payment_code LIKE CONCAT('%', #{param.paymentCode}, '%')
-            </if>
-            <if test="param.config != null">
-                AND a.config LIKE CONCAT('%', #{param.config}, '%')
-            </if>
-            <if test="param.isDefault != null">
-                AND a.is_default = #{param.isDefault}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.Payment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.Payment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml
deleted file mode 100644
index df1fb84..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTemplateMapper.xml
+++ /dev/null
@@ -1,68 +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="com.gxwebsoft.shop.mapper.PaymentTemplateMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_payment_template a
-        <where>
-            <if test="param.templateId != null">
-                AND a.template_id = #{param.templateId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.method != null">
-                AND a.method LIKE CONCAT('%', #{param.method}, '%')
-            </if>
-            <if test="param.config != null">
-                AND a.config LIKE CONCAT('%', #{param.config}, '%')
-            </if>
-            <if test="param.remarks != null">
-                AND a.remarks LIKE CONCAT('%', #{param.remarks}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.PaymentTemplate">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.PaymentTemplate">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml
deleted file mode 100644
index 11fb792..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/PaymentTradeMapper.xml
+++ /dev/null
@@ -1,83 +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="com.gxwebsoft.shop.mapper.PaymentTradeMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_payment_trade a
-        <where>
-            <if test="param.tradeId != null">
-                AND a.trade_id = #{param.tradeId}
-            </if>
-            <if test="param.outTradeNo != null">
-                AND a.out_trade_no LIKE CONCAT('%', #{param.outTradeNo}, '%')
-            </if>
-            <if test="param.client != null">
-                AND a.client LIKE CONCAT('%', #{param.client}, '%')
-            </if>
-            <if test="param.payMethod != null">
-                AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%')
-            </if>
-            <if test="param.orderType != null">
-                AND a.order_type = #{param.orderType}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.orderNo != null">
-                AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%')
-            </if>
-            <if test="param.tradeNo != null">
-                AND a.trade_no LIKE CONCAT('%', #{param.tradeNo}, '%')
-            </if>
-            <if test="param.prepayId != null">
-                AND a.prepay_id LIKE CONCAT('%', #{param.prepayId}, '%')
-            </if>
-            <if test="param.tradeState != null">
-                AND a.trade_state = #{param.tradeState}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.PaymentTrade">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.PaymentTrade">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml
deleted file mode 100644
index 9b69f72..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderMapper.xml
+++ /dev/null
@@ -1,101 +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="com.gxwebsoft.shop.mapper.RechargeOrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.phone,b.nickname,b.user_id,b.avatar,c.organization_id,c.organization_name
-        FROM shop_recharge_order a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN sys_organization c ON a.organization_id = c.organization_id
-        <where>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.orderNo != null">
-                AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.rechargeType != null">
-                AND a.recharge_type = #{param.rechargeType}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.payPrice != null">
-                AND a.pay_price = #{param.payPrice}
-            </if>
-            <if test="param.giftMoney != null">
-                AND a.gift_money = #{param.giftMoney}
-            </if>
-            <if test="param.actualMoney != null">
-                AND a.actual_money = #{param.actualMoney}
-            </if>
-            <if test="param.payMethod != null">
-                AND a.pay_method LIKE CONCAT('%', #{param.payMethod}, '%')
-            </if>
-            <if test="param.payStatus != null">
-                AND a.pay_status = #{param.payStatus}
-            </if>
-            <if test="param.payTime != null">
-                AND a.pay_time = #{param.payTime}
-            </if>
-            <if test="param.tradeId != null">
-                AND a.trade_id = #{param.tradeId}
-            </if>
-            <if test="param.platform != null">
-                AND a.platform LIKE CONCAT('%', #{param.platform}, '%')
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.organizationId != null">
-              AND c.organization_id = #{param.organizationId}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.alias LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.RechargeOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.RechargeOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml
deleted file mode 100644
index 99f185a..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargeOrderPlanMapper.xml
+++ /dev/null
@@ -1,71 +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="com.gxwebsoft.shop.mapper.RechargeOrderPlanMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_recharge_order_plan a
-        <where>
-            <if test="param.orderPlanId != null">
-                AND a.order_plan_id = #{param.orderPlanId}
-            </if>
-            <if test="param.orderId != null">
-                AND a.order_id = #{param.orderId}
-            </if>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.planName != null">
-                AND a.plan_name LIKE CONCAT('%', #{param.planName}, '%')
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.giftMoney != null">
-                AND a.gift_money = #{param.giftMoney}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.RechargeOrderPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.RechargeOrderPlan">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml
deleted file mode 100644
index b408b92..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/RechargePlanMapper.xml
+++ /dev/null
@@ -1,65 +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="com.gxwebsoft.shop.mapper.RechargePlanMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_recharge_plan a
-        <where>
-            <if test="param.planId != null">
-                AND a.plan_id = #{param.planId}
-            </if>
-            <if test="param.planName != null">
-                AND a.plan_name LIKE CONCAT('%', #{param.planName}, '%')
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.giftMoney != null">
-                AND a.gift_money = #{param.giftMoney}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.RechargePlan">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.RechargePlan">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml
deleted file mode 100644
index 6d27ce6..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserAddressMapper.xml
+++ /dev/null
@@ -1,68 +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="com.gxwebsoft.shop.mapper.UserAddressMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_user_address a
-        <where>
-            <if test="param.addressId != null">
-                AND a.address_id = #{param.addressId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.phone != null">
-                AND a.phone LIKE CONCAT('%', #{param.phone}, '%')
-            </if>
-            <if test="param.provinceId != null">
-                AND a.province_id = #{param.provinceId}
-            </if>
-            <if test="param.cityId != null">
-                AND a.city_id = #{param.cityId}
-            </if>
-            <if test="param.regionId != null">
-                AND a.region_id = #{param.regionId}
-            </if>
-            <if test="param.detail != null">
-                AND a.detail LIKE CONCAT('%', #{param.detail}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserAddress">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserAddress">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml
deleted file mode 100644
index 8be7e4f..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserBalanceLogMapper.xml
+++ /dev/null
@@ -1,84 +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="com.gxwebsoft.shop.mapper.UserBalanceLogMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname,b.avatar,b.phone
-        FROM shop_user_balance_log a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.scene != null">
-              AND a.scene = #{param.scene}
-            </if>
-            <if test="param.sceneMultiple != null">
-              AND a.scene IN
-              <foreach collection="param.sceneMultiple.split(',')" item="item" separator="," open="(" close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="param.money != null">
-                AND a.money = #{param.money}
-            </if>
-            <if test="param.balance != null">
-                AND a.balance = #{param.balance}
-            </if>
-            <if test="param.describe != null">
-                AND a.describe LIKE CONCAT('%', #{param.describe}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              a.user_id = #{param.keywords}
-              OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.alias LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone = #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserBalanceLog">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserBalanceLog">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml
deleted file mode 100644
index 0a2b3cc..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCommentMapper.xml
+++ /dev/null
@@ -1,71 +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="com.gxwebsoft.shop.mapper.UserCommentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname as toUserNickname, b.avatar as toUserAvatar,b.fans as toUserFans,b.province as toUserProvince,b.city as toUserCity,b.likes as toUserLikes,
-               c.nickname,c.avatar,c.fans,c.province,c.city,c.likes,
-               d.nickname as replyNickname,d.avatar as replyAvatar,d.fans as replyFans
-        FROM shop_user_comment a
-        LEFT JOIN sys_user b ON a.to_user_id = b.user_id
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        LEFT JOIN sys_user d ON a.reply_user_id = d.user_id
-        <where>
-            <if test="param.commentId != null">
-                AND a.comment_id = #{param.commentId}
-            </if>
-            <if test="param.score != null">
-                AND a.score = #{param.score}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.isPicture != null">
-                AND a.is_picture = #{param.isPicture}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.toUserId != null">
-              AND a.to_user_id = #{param.toUserId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserComment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserComment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml
deleted file mode 100644
index 59fad13..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserCouponMapper.xml
+++ /dev/null
@@ -1,92 +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="com.gxwebsoft.shop.mapper.UserCouponMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_user_coupon a
-        <where>
-            <if test="param.userCouponId != null">
-                AND a.user_coupon_id = #{param.userCouponId}
-            </if>
-            <if test="param.couponId != null">
-                AND a.coupon_id = #{param.couponId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.couponType != null">
-                AND a.coupon_type = #{param.couponType}
-            </if>
-            <if test="param.reducePrice != null">
-                AND a.reduce_price = #{param.reducePrice}
-            </if>
-            <if test="param.discount != null">
-                AND a.discount = #{param.discount}
-            </if>
-            <if test="param.minPrice != null">
-                AND a.min_price = #{param.minPrice}
-            </if>
-            <if test="param.expireType != null">
-                AND a.expire_type = #{param.expireType}
-            </if>
-            <if test="param.expireDay != null">
-                AND a.expire_day = #{param.expireDay}
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time = #{param.startTime}
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time = #{param.endTime}
-            </if>
-            <if test="param.applyRange != null">
-                AND a.apply_range = #{param.applyRange}
-            </if>
-            <if test="param.applyRangeConfig != null">
-                AND a.apply_range_config LIKE CONCAT('%', #{param.applyRangeConfig}, '%')
-            </if>
-            <if test="param.isExpire != null">
-                AND a.is_expire = #{param.isExpire}
-            </if>
-            <if test="param.isUse != null">
-                AND a.is_use = #{param.isUse}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserCoupon">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserCoupon">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml
deleted file mode 100644
index df3e8bf..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFeedbackMapper.xml
+++ /dev/null
@@ -1,66 +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="com.gxwebsoft.shop.mapper.UserFeedbackMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-      b.nickname,b.avatar,b.phone
-        FROM shop_user_feedback a
-      LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.content != null">
-                AND a.content LIKE CONCAT('%', #{param.content}, '%')
-            </if>
-            <if test="param.images != null">
-                AND a.images LIKE CONCAT('%', #{param.images}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.user_id = #{param.keywords}
-            OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-            OR b.alias LIKE CONCAT('%', #{param.keywords}, '%')
-            OR b.phone = #{param.keywords}
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserFeedback">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserFeedback">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml
deleted file mode 100644
index c9717e1..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserFollowMapper.xml
+++ /dev/null
@@ -1,60 +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="com.gxwebsoft.shop.mapper.UserFollowMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname as shopNickname,b.avatar as shopAvatar,
-               c.nickname,c.avatar
-        FROM shop_user_follow a
-        LEFT JOIN sys_user b ON a.shop_id = b.user_id
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.shopId != null">
-                AND a.shop_id = #{param.shopId}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserFollow">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserFollow">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml
deleted file mode 100644
index 405a097..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeLogMapper.xml
+++ /dev/null
@@ -1,65 +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="com.gxwebsoft.shop.mapper.UserGradeLogMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_user_grade_log a
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.oldGradeId != null">
-                AND a.old_grade_id = #{param.oldGradeId}
-            </if>
-            <if test="param.newGradeId != null">
-                AND a.new_grade_id = #{param.newGradeId}
-            </if>
-            <if test="param.changeType != null">
-                AND a.change_type = #{param.changeType}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserGradeLog">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserGradeLog">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml
deleted file mode 100644
index c8827e4..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserGradeMapper.xml
+++ /dev/null
@@ -1,69 +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="com.gxwebsoft.shop.mapper.UserGradeMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_user_grade a
-        <where>
-            <if test="param.gradeId != null">
-                AND a.grade_id = #{param.gradeId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.weight != null">
-                AND a.weight = #{param.weight}
-            </if>
-            <if test="param.upgrade != null">
-                AND a.upgrade LIKE CONCAT('%', #{param.upgrade}, '%')
-            </if>
-            <if test="param.equity != null">
-                AND a.equity LIKE CONCAT('%', #{param.equity}, '%')
-            </if>
-            <if test="param.commission != null">
-                AND a.commission LIKE CONCAT('%', #{param.commission}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserGrade">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserGrade">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml
deleted file mode 100644
index fdff5ad..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLikeMapper.xml
+++ /dev/null
@@ -1,73 +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="com.gxwebsoft.shop.mapper.UserLikeMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname as toUserNickname, b.avatar as toUserAvatar,
-               c.nickname,c.avatar
-        FROM shop_user_like a
-        LEFT JOIN sys_user b ON a.to_user_id = b.user_id
-        LEFT JOIN sys_user c ON a.user_id = c.user_id
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.toUserId != null">
-                AND a.to_user_id = #{param.toUserId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <!-- 查询未读我喜欢 -->
-            <if test="param.sceneType == 'UN_READ_USER_LIKE'">
-                AND a.status = 0
-                AND (a.user_id = #{param.loginUserId})
-            </if>
-            <!-- 查询未读喜欢我 -->
-            <if test="param.sceneType == 'UN_READ_USER_LIKE_ME'">
-                AND a.status = 0
-                AND (a.to_user_id = #{param.loginUserId})
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserLike">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserLike">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml
deleted file mode 100644
index 9a55247..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserLookMapper.xml
+++ /dev/null
@@ -1,57 +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="com.gxwebsoft.shop.mapper.UserLookMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname,b.avatar
-        FROM shop_user_look a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.toUserId != null">
-                AND a.to_user_id = #{param.toUserId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <!-- 查询未读访客 -->
-            <if test="param.sceneType == 'UN_READ_USER_LOOK'">
-                AND a.status = 0
-                AND (a.to_user_id = #{param.loginUserId})
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserLook">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserLook">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml
deleted file mode 100644
index 005ba55..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserOauthMapper.xml
+++ /dev/null
@@ -1,75 +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="com.gxwebsoft.shop.mapper.UserOauthMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_user_oauth a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.oauthType != null">
-                AND a.oauth_type LIKE CONCAT('%', #{param.oauthType}, '%')
-            </if>
-            <if test="param.oauthId != null">
-                AND a.oauth_id LIKE CONCAT('%', #{param.oauthId}, '%')
-            </if>
-            <if test="param.unionid != null">
-                AND a.unionid LIKE CONCAT('%', #{param.unionid}, '%')
-            </if>
-          <if test="param.tenantId != null">
-            AND a.tenant_id LIKE CONCAT('%', #{param.tenantId}, '%')
-          </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.merchantCode != null">
-                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserOauth">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserOauth">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询单条数据 -->
-    <select id="getOne" resultType="com.gxwebsoft.shop.entity.UserOauth">
-      SELECT * FROM shop_user_oauth WHERE unionid = #{param.unionid} and deleted = 0 order by id desc
-    </select>
-
-    <!-- 查询单条数据 -->
-    <select id="getByOauthId" resultType="com.gxwebsoft.shop.entity.UserOauth">
-      SELECT * FROM shop_user_oauth WHERE oauth_id = #{param.oauthId} and deleted = 0 order by id desc
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml
deleted file mode 100644
index 8b4cd8b..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserPointsLogMapper.xml
+++ /dev/null
@@ -1,59 +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="com.gxwebsoft.shop.mapper.UserPointsLogMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM shop_user_points_log a
-        <where>
-            <if test="param.logId != null">
-                AND a.log_id = #{param.logId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.value != null">
-                AND a.value = #{param.value}
-            </if>
-            <if test="param.describe != null">
-                AND a.describe LIKE CONCAT('%', #{param.describe}, '%')
-            </if>
-            <if test="param.remark != null">
-                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserPointsLog">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserPointsLog">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml
deleted file mode 100644
index 68e0e37..0000000
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/UserRefereeMapper.xml
+++ /dev/null
@@ -1,78 +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="com.gxwebsoft.shop.mapper.UserRefereeMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,
-               b.nickname,b.avatar,b.sex,b.grade_id,b.offline,
-               c.nickname as dealerName,c.avatar as dealerAvatar,c.phone as dealerPhone,
-               d.name as gradeName
-        FROM shop_user_referee a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN sys_user c ON a.dealer_id = c.user_id
-        LEFT JOIN shop_user_grade d ON b.grade_id = d.grade_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.dealerId != null">
-                AND a.dealer_id = #{param.dealerId}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.level != null">
-                AND a.level = #{param.level}
-            </if>
-            <if test="param.sex != null">
-              AND b.sex = #{param.sex}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.gradeId != null">
-              AND b.grade_id = #{param.gradeId}
-            </if>
-            <if test="param.offline != null">
-              AND b.offline = #{param.offline}
-            </if>
-            <if test="param.gradeStart  != null">
-              AND b.grade_id &gt;= #{param.gradeStart}
-            </if>
-            <if test="param.gradeEnd  != null">
-              AND b.grade_id &lt;= #{param.gradeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              a.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.nickname = #{param.keywords}
-              OR c.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.UserReferee">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.UserReferee">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/shop/param/CartParam.java b/src/main/java/com/gxwebsoft/shop/param/CartParam.java
deleted file mode 100644
index 9165881..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/CartParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 购物车记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CartParam对象", description = "购物车记录表查询参数")
-public class CartParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品sku唯一标识")
-    private String goodsSkuId;
-
-    @ApiModelProperty(value = "商品数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsNum;
-
-    @ApiModelProperty(value = "商品价格")
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "是否临时报餐")
-    private Integer isTemporary;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商品总数量")
-    @TableField(exist = false)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "订单总金额")
-    @TableField(exist = false)
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "发货时间")
-    @TableField(exist = false)
-    private String deliveryTime;
-
-    @ApiModelProperty(value = "代报餐方式")
-    @TableField(exist = false)
-    private Integer agentUserId;
-
-    @ApiModelProperty(value = "代取餐人")
-    @TableField(exist = false)
-    private Integer dealerId;
-
-    @ApiModelProperty(value = "是否按餐段查询")
-    @TableField(exist = false)
-    private Boolean isPeriod;
-
-    @ApiModelProperty(value = "查询是否已经下过单")
-    @QueryField(type = QueryType.EQ)
-    private Boolean hasTemporary;
-
-    @ApiModelProperty(value = "当前餐段")
-    @QueryField(type = QueryType.EQ)
-    private Integer categoryId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/CategoryParam.java b/src/main/java/com/gxwebsoft/shop/param/CategoryParam.java
deleted file mode 100644
index 9819625..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/CategoryParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商品分类表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CategoryParam对象", description = "商品分类表查询参数")
-public class CategoryParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "分类名称")
-    private String title;
-
-    @ApiModelProperty(value = "上级分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "分类图片")
-    @QueryField(type = QueryType.EQ)
-    private Integer image;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属商户")
-    @QueryField(type = QueryType.EQ)
-    private String merchantCode;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/CommentParam.java b/src/main/java/com/gxwebsoft/shop/param/CommentParam.java
deleted file mode 100644
index 5e1dea5..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/CommentParam.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商品评价记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-23 21:18:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CommentParam对象", description = "商品评价记录表查询参数")
-public class CommentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "评价ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer commentId;
-
-    @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
-    @QueryField(type = QueryType.EQ)
-    private Integer score;
-
-    @ApiModelProperty(value = "评价内容")
-    private String content;
-
-    @ApiModelProperty(value = "是否为图片评价")
-    @QueryField(type = QueryType.EQ)
-    private Integer isPicture;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "订单商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/CouponParam.java b/src/main/java/com/gxwebsoft/shop/param/CouponParam.java
deleted file mode 100644
index 4a5431e..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/CouponParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 优惠券记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-28 18:26:05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CouponParam对象", description = "优惠券记录表查询参数")
-public class CouponParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "优惠券ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券名称")
-    private String name;
-
-    @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)")
-    @QueryField(type = QueryType.EQ)
-    private Integer couponType;
-
-    @ApiModelProperty(value = "满减券-减免金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal reducePrice;
-
-    @ApiModelProperty(value = "折扣券-折扣率(0-100)")
-    @QueryField(type = QueryType.EQ)
-    private Integer discount;
-
-    @ApiModelProperty(value = "最低消费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)")
-    @QueryField(type = QueryType.EQ)
-    private Integer expireType;
-
-    @ApiModelProperty(value = "领取后生效-有效天数")
-    @QueryField(type = QueryType.EQ)
-    private Integer expireDay;
-
-    @ApiModelProperty(value = "固定时间-开始时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer startTime;
-
-    @ApiModelProperty(value = "固定时间-结束时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer endTime;
-
-    @ApiModelProperty(value = "适用范围(10全部商品 20指定商品 30排除商品)")
-    @QueryField(type = QueryType.EQ)
-    private Integer applyRange;
-
-    @ApiModelProperty(value = "适用范围配置(json格式)")
-    private String applyRangeConfig;
-
-    @ApiModelProperty(value = "发放总数量(-1为不限制)")
-    @QueryField(type = QueryType.EQ)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "已领取数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer receiveNum;
-
-    @ApiModelProperty(value = "优惠券描述")
-    private String describe;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/ExpressParam.java b/src/main/java/com/gxwebsoft/shop/param/ExpressParam.java
deleted file mode 100644
index 480914d..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/ExpressParam.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 物流公司记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-22 00:21:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "ExpressParam对象", description = "物流公司记录表查询参数")
-public class ExpressParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "物流公司ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer expressId;
-
-    @ApiModelProperty(value = "物流公司名称")
-    private String expressName;
-
-    @ApiModelProperty(value = "物流公司编码 (快递100)")
-    private String kuaidi100Code;
-
-    @ApiModelProperty(value = "物流公司编码 (快递鸟)")
-    private String kdniaoCode;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java
deleted file mode 100644
index 8c50d55..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/GoodsParam.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 商品记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "GoodsParam对象", description = "商品记录表查询参数")
-public class GoodsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品编码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "商品规格(10单规格 20多规格)")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsType;
-
-    @ApiModelProperty(value = "商品分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "商品封面图")
-    private String image;
-
-    @ApiModelProperty(value = "上传的文件")
-    private String files;
-
-    @ApiModelProperty(value = "主图视频路径")
-    private String videoUrl;
-
-    @ApiModelProperty(value = "商品卖点")
-    private String sellingPoint;
-
-    @ApiModelProperty(value = "商品规格(10单规格 20多规格)")
-    @QueryField(type = QueryType.EQ)
-    private Integer specType;
-
-    @ApiModelProperty(value = "商品价格(最低)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal goodsPriceMin;
-
-    @ApiModelProperty(value = "商品价格(最高)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal goodsPriceMax;
-
-    @ApiModelProperty(value = "划线价格(最低)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal linePriceMin;
-
-    @ApiModelProperty(value = "划线价格(最高)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal linePriceMax;
-
-    @ApiModelProperty(value = "库存总量(包含所有sku)")
-    @QueryField(type = QueryType.EQ)
-    private Integer stockTotal;
-
-    @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deductStockType;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "初始销量")
-    @QueryField(type = QueryType.EQ)
-    private Integer salesInitial;
-
-    @ApiModelProperty(value = "实际销量")
-    @QueryField(type = QueryType.EQ)
-    private Integer salesActual;
-
-    @ApiModelProperty(value = "配送方式")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "配送模板ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryId;
-
-    @ApiModelProperty(value = "是否开启积分赠送(1开启 0关闭)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isPointsGift;
-
-    @ApiModelProperty(value = "是否允许使用积分抵扣(1允许 0不允许)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isPointsDiscount;
-
-    @ApiModelProperty(value = "积分抵扣设置(0默认抵扣 1单独设置抵扣)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isAlonePointsDiscount;
-
-    @ApiModelProperty(value = "单独设置积分抵扣的配置")
-    private String pointsDiscountConfig;
-
-    @ApiModelProperty(value = "是否开启会员折扣(1开启 0关闭)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isEnableGrade;
-
-    @ApiModelProperty(value = "会员折扣设置(0默认等级折扣 1单独设置折扣)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isAloneGrade;
-
-    @ApiModelProperty(value = "单独设置折扣的配置")
-    private String aloneGradeEquity;
-
-    @ApiModelProperty(value = "是否推荐")
-    @QueryField(type = QueryType.EQ)
-    private Integer isHot;
-
-    @ApiModelProperty(value = "规格单位")
-    private String unit;
-
-    @ApiModelProperty(value = "餐段")
-    private String period;
-
-    @ApiModelProperty(value = "档口")
-    private Integer gear;
-
-    @ApiModelProperty(value = "商品重量")
-    private Double goodsWeight;
-
-    @ApiModelProperty(value = "商品优惠属性: 0无 1限时特惠 2特惠专区")
-    @QueryField(type = QueryType.EQ)
-    private Integer attribute;
-
-    @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isIndDealer;
-
-    @ApiModelProperty(value = "是否开启限购(0关闭 1开启)")
-    @QueryField(type = QueryType.EQ)
-    private Integer purchaseLimit;
-
-    @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)")
-    @QueryField(type = QueryType.EQ)
-    private Integer dealerMoneyType;
-
-    @ApiModelProperty(value = "分销佣金(一级)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal firstMoney;
-
-    @ApiModelProperty(value = "分销佣金(二级)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal secondMoney;
-
-    @ApiModelProperty(value = "分销佣金(三级)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal thirdMoney;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0上架, 1下架")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编号")
-    @QueryField(type = QueryType.EQ)
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @QueryField(type = QueryType.EQ)
-    private String merchantName;
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java b/src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java
deleted file mode 100644
index abaad85..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/GoodsServiceParam.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商品服务与承诺记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-23 21:57:50
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "GoodsServiceParam对象", description = "商品服务与承诺记录表查询参数")
-public class GoodsServiceParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商品服务ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer serviceId;
-
-    @ApiModelProperty(value = "服务名称")
-    private String name;
-
-    @ApiModelProperty(value = "概述")
-    private String summary;
-
-    @ApiModelProperty(value = "是否默认(新增商品时)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isDefault;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/MemberParam.java b/src/main/java/com/gxwebsoft/shop/param/MemberParam.java
deleted file mode 100644
index 1552009..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/MemberParam.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商城会员查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 14:02:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "MemberParam对象", description = "商城会员查询参数")
-public class MemberParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer memberId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty("登录账号")
-    @QueryField(type = QueryType.EQ)
-    private String username;
-
-    @ApiModelProperty("用户昵称")
-    @QueryField(type = QueryType.LIKE)
-    private String nickname;
-
-    @ApiModelProperty("手机号码")
-    @QueryField(type = QueryType.EQ)
-    private String phone;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java
deleted file mode 100644
index 7a7e1b4..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/MerchantClerkParam.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商家门店店员表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-30 16:32:25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "MerchantClerkParam对象", description = "商家门店店员表查询参数")
-public class MerchantClerkParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商户人员ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer clerkId;
-
-    @ApiModelProperty(value = "关联商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "关联商户编号")
-    @QueryField(type = QueryType.LIKE)
-    private String merchantName;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否为商户主")
-    @QueryField(type = QueryType.EQ)
-    private Integer isOwner;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java
deleted file mode 100644
index 4752c75..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 商户管理查询参数
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "MerchantParam对象", description = "商户管理查询参数")
-public class MerchantParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "商户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer merchantId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String merchantName;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户类型")
-    private String merchantType;
-
-    @ApiModelProperty(value = "当前可提现金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "已冻结金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal freezeMoney;
-
-    @ApiModelProperty(value = "累积提现金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalMoney;
-
-    @ApiModelProperty(value = "商户logo")
-    private String logo;
-
-    @ApiModelProperty(value = "商户背景图片")
-    private String background;
-
-    @ApiModelProperty(value = "营业时间")
-    private String merchantHours;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "商户详情")
-    private String content;
-
-    @ApiModelProperty(value = "商户坐标经纬度")
-    private String lngAndLat;
-
-    @ApiModelProperty(value = "geohash")
-    private String geohash;
-
-    @ApiModelProperty(value = "商户简介")
-    private String summary;
-
-    @ApiModelProperty(value = "打款方式 (10微信 20支付宝 30银行卡)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付宝姓名")
-    private String alipayName;
-
-    @ApiModelProperty(value = "支付宝账号")
-    private String alipayAccount;
-
-    @ApiModelProperty(value = "开户行名称")
-    private String bankName;
-
-    @ApiModelProperty(value = "银行开户名")
-    private String bankAccount;
-
-    @ApiModelProperty(value = "银行卡号")
-    private String bankCard;
-
-    @ApiModelProperty(value = "是否可编辑 0 商户可编辑 1 管理员可编辑")
-    @QueryField(type = QueryType.EQ)
-    private Integer isEdit;
-
-    @ApiModelProperty(value = "是否支持自提核销(0否 1支持)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isCheck;
-
-    @ApiModelProperty(value = "商户主")
-    @QueryField(type = QueryType.EQ)
-    private Integer merchantOwner;
-
-    @ApiModelProperty(value = "门店联系电话")
-    @QueryField(type = QueryType.EQ)
-    private String merchantPhone;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "客户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer customerId;
-
-    @ApiModelProperty("登录账号")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty("用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "联系电话")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "租户ID")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "会元等级ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer gradeId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java
deleted file mode 100644
index fb878cf..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/MerchantWithdrawParam.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 商户提现记录查询参数
- *
- * @author 科技小王子
- * @since 2022-12-02 00:41:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "MerchantWithdrawParam对象", description = "商户提现记录查询参数")
-public class MerchantWithdrawParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "提现单号")
-    @QueryField(type = QueryType.EQ)
-    private String withdrawCode;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "提现金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "打款方式 (10微信 20支付宝 30银行卡)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付宝姓名")
-    private String alipayName;
-
-    @ApiModelProperty(value = "支付宝账号")
-    private String alipayAccount;
-
-    @ApiModelProperty(value = "开户行名称")
-    private String bankName;
-
-    @ApiModelProperty(value = "银行开户名")
-    private String bankAccount;
-
-    @ApiModelProperty(value = "银行卡号")
-    private String bankCard;
-
-    @ApiModelProperty(value = "申请状态 (10待审核 20审核通过 30驳回 40已打款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer applyStatus;
-
-    @ApiModelProperty(value = "审核时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer auditTime;
-
-    @ApiModelProperty(value = "驳回原因")
-    private String rejectReason;
-
-    @ApiModelProperty(value = "来源客户端(APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "关联商户编号")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @QueryField(type = QueryType.LIKE)
-    private String merchantName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java
deleted file mode 100644
index 07c426f..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/OrderAddressParam.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 订单收货地址记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-12-02 21:21:10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "OrderAddressParam对象", description = "订单收货地址记录表查询参数")
-public class OrderAddressParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "地址ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderAddressId;
-
-    @ApiModelProperty(value = "收货人姓名")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "省份ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer provinceId;
-
-    @ApiModelProperty(value = "城市ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer cityId;
-
-    @ApiModelProperty(value = "区/县ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer regionId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String detail;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "关联商户编号")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java
deleted file mode 100644
index 4742555..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/OrderGoodsParam.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 订单商品记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "OrderGoodsParam对象", description = "订单商品记录表查询参数")
-public class OrderGoodsParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "商品分类")
-    private Integer categoryId;
-
-    @ApiModelProperty(value = "商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品封面图ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer imageId;
-
-    @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deductStockType;
-
-    @ApiModelProperty(value = "规格类型(10单规格 20多规格)")
-    @QueryField(type = QueryType.EQ)
-    private Integer specType;
-
-    @ApiModelProperty(value = "商品sku唯一标识")
-    private String goodsSkuId;
-
-    @ApiModelProperty(value = "SKU的规格属性(json格式)")
-    private String goodsProps;
-
-    @ApiModelProperty(value = "商品详情")
-    private String content;
-
-    @ApiModelProperty(value = "商品编码")
-    private String goodsNo;
-
-    @ApiModelProperty(value = "商品价格(单价)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal goodsPrice;
-
-    @ApiModelProperty(value = "商品划线价")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal linePrice;
-
-    @ApiModelProperty(value = "商品重量(Kg)")
-    private Double goodsWeight;
-
-    @ApiModelProperty(value = "所属档口")
-    private Integer gear;
-
-    @ApiModelProperty(value = "是否存在会员等级折扣")
-    @QueryField(type = QueryType.EQ)
-    private Integer isUserGrade;
-
-    @ApiModelProperty(value = "会员折扣比例(0-10)")
-    @QueryField(type = QueryType.EQ)
-    private Integer gradeRatio;
-
-    @ApiModelProperty(value = "会员折扣的商品单价")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal gradeGoodsPrice;
-
-    @ApiModelProperty(value = "会员折扣的总额差")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal gradeTotalMoney;
-
-    @ApiModelProperty(value = "优惠券折扣金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal couponMoney;
-
-    @ApiModelProperty(value = "积分金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal pointsMoney;
-
-    @ApiModelProperty(value = "积分抵扣数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer pointsNum;
-
-    @ApiModelProperty(value = "赠送的积分数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer pointsBonus;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "购买数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "商品总价(数量×单价)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "实际付款价(折扣和优惠后)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalPayPrice;
-
-    @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryStatus;
-
-    @ApiModelProperty(value = "已发货数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryNum;
-
-    @ApiModelProperty(value = "发货时间")
-    @TableField(exist = false)
-    private String deliveryTime;
-
-    @ApiModelProperty(value = "星期几")
-    @QueryField(type = QueryType.EQ)
-    private Integer week;
-
-    @ApiModelProperty(value = "是否开启单独分销(0关闭 1开启)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isIndDealer;
-
-    @ApiModelProperty(value = "是否临时报餐")
-    @QueryField(type = QueryType.EQ)
-    private Integer temporary;
-
-    @ApiModelProperty(value = "分销佣金类型(10百分比 20固定金额)")
-    @QueryField(type = QueryType.EQ)
-    private Integer dealerMoneyType;
-
-    @ApiModelProperty(value = "分销佣金(一级)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal firstMoney;
-
-    @ApiModelProperty(value = "分销佣金(二级)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal secondMoney;
-
-    @ApiModelProperty(value = "分销佣金(三级)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal thirdMoney;
-
-    @ApiModelProperty(value = "是否已评价(0否 1是)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isComment;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "来源记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer goodsSourceId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "用户昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "订购份数是否大于0")
-    @TableField(exist = false)
-    private Boolean hasNum;
-
-    @ApiModelProperty(value = "订单状态")
-    @TableField(exist = false)
-    private Integer orderStatus;
-
-    @QueryField(value = "delivery_time", type = QueryType.GE)
-    @TableField(exist = false)
-    @ApiModelProperty("报餐时间起始值")
-    private String deliveryTimeStart;
-
-    @QueryField(value = "delivery_time", type = QueryType.LE)
-    @TableField(exist = false)
-    @ApiModelProperty("报餐时间结束值")
-    private String deliveryTimeEnd;
-
-    @ApiModelProperty(value = "按部门查询")
-    @TableField(exist = false)
-    private Integer organizationId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderParam.java
deleted file mode 100644
index 0f8e13e..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/OrderParam.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Set;
-
-/**
- * 订单记录表查询参数
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "OrderParam对象", description = "订单记录表查询参数")
-public class OrderParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
-
-    @ApiModelProperty(value = "商品总金额(不含优惠折扣)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal totalPrice;
-
-    @ApiModelProperty(value = "订单金额(含优惠折扣)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal orderPrice;
-
-    @ApiModelProperty(value = "优惠券ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券抵扣金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal couponMoney;
-
-    @ApiModelProperty(value = "积分抵扣金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal pointsMoney;
-
-    @ApiModelProperty(value = "积分抵扣数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer pointsNum;
-
-    @ApiModelProperty(value = "实际付款金额(包含运费)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "后台修改的订单金额(差价)")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal updatePrice;
-
-    @ApiModelProperty(value = "买家留言")
-    private String buyerRemark;
-
-    @ApiModelProperty(value = "支付方式(废弃)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payType;
-
-    @ApiModelProperty(value = "支付方式（余额/微信/支付宝）")
-    private String payMethod;
-
-    @ApiModelProperty(value = "付款状态(10未付款 20已付款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "付款时间")
-    @QueryField(type = QueryType.EQ)
-    private Date payTime;
-
-    @ApiModelProperty("购买月份数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer month;
-
-    @ApiModelProperty(value = "星期几")
-    @QueryField(type = QueryType.EQ)
-    private Integer week;
-
-    @ApiModelProperty(value = "第三方交易记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer tradeId;
-
-    @ApiModelProperty(value = "配送方式(10快递配送 20门店自提)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "自提门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer extractShopId;
-
-    @ApiModelProperty(value = "核销店员ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer extractClerkId;
-
-    @ApiModelProperty(value = "运费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal expressPrice;
-
-    @ApiModelProperty(value = "物流公司ID (废弃)")
-    @QueryField(type = QueryType.EQ)
-    private Integer expressId;
-
-    @ApiModelProperty(value = "物流单号 (废弃)")
-    private String expressNo;
-
-    @ApiModelProperty(value = "发货状态(10未发货 20已发货 30部分发货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer deliveryStatus;
-
-    @ApiModelProperty(value = "发货时间")
-    @QueryField(type = QueryType.EQ)
-    private String deliveryTime;
-
-    @ApiModelProperty(value = "收货状态(10未收货 20已收货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer receiptStatus;
-
-    @ApiModelProperty(value = "收货时间")
-    @QueryField(type = QueryType.EQ)
-    private Date receiptTime;
-
-    @ApiModelProperty(value = "订单状态(10进行中 20取消 21待取消 30已完成)")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "赠送的积分数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer pointsBonus;
-
-    @ApiModelProperty(value = "商家备注")
-    private String merchantRemark;
-
-    @ApiModelProperty(value = "订单是否已结算(0未结算 1已结算)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isSettled;
-
-    @ApiModelProperty(value = "续租订单原单号")
-    private Integer rentOrderId;
-
-    @ApiModelProperty(value = "微信支付交易号(废弃)")
-    private String transactionId;
-
-    @ApiModelProperty(value = "是否已评价(0否 1是)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isComment;
-
-    @ApiModelProperty(value = "订单来源(10普通订单 20砍价订单 30秒杀订单)")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderSource;
-
-    @ApiModelProperty(value = "来源记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderSourceId;
-
-    @ApiModelProperty(value = "来源记录的参数 (json格式)")
-    private String orderSourceData;
-
-    @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "是否续费订单")
-    private Integer isRenew;
-
-    @ApiModelProperty(value = "是否临时报餐")
-    private Integer isTemporary;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "商品ID")
-    private Integer goodsId;
-
-    @ApiModelProperty(value = "设备ID")
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "商户编号")
-    @QueryField(type = QueryType.EQ)
-    private String merchantCode;
-
-    @ApiModelProperty(value = "商户名称")
-    @QueryField(type = QueryType.LIKE)
-    private String merchantName;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "是否按代报餐查询")
-    @TableField(exist = false)
-    private Boolean agent;
-
-    @ApiModelProperty(value = "租户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer tenantId;
-
-    @ApiModelProperty("搜索关键字")
-    @TableField(exist = false)
-    private String keywords;
-
-    @ApiModelProperty(value = "签名")
-    @TableField(exist = false)
-    private String sign;
-
-    @ApiModelProperty(value = "是否查询订单商品")
-    @TableField(exist = false)
-    private Boolean showGoodsList;
-
-    @ApiModelProperty(value = "用户id集合")
-    @TableField(exist = false)
-    private Set<Integer> userIds;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java
deleted file mode 100644
index f9cfe77..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/OrderRefundAddressParam.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 售后单退货地址记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "OrderRefundAddressParam对象", description = "售后单退货地址记录表查询参数")
-public class OrderRefundAddressParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "售后单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderRefundId;
-
-    @ApiModelProperty(value = "收货人姓名")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "所在省份ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer provinceId;
-
-    @ApiModelProperty(value = "所在城市ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer cityId;
-
-    @ApiModelProperty(value = "所在区/县ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer regionId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String detail;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java
deleted file mode 100644
index 35bf31c..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/OrderRefundParam.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 售后单记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "OrderRefundParam对象", description = "售后单记录表查询参数")
-public class OrderRefundParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "售后单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderRefundId;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "售后类型(10退货退款 20换货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "用户申请原因(说明)")
-    private String applyDesc;
-
-    @ApiModelProperty(value = "商家审核状态(0待审核 10已同意 20已拒绝)")
-    @QueryField(type = QueryType.EQ)
-    private Integer auditStatus;
-
-    @ApiModelProperty(value = "商家拒绝原因(说明)")
-    private String refuseDesc;
-
-    @ApiModelProperty(value = "实际退款金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal refundMoney;
-
-    @ApiModelProperty(value = "用户是否发货(0未发货 1已发货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isUserSend;
-
-    @ApiModelProperty(value = "用户发货时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer sendTime;
-
-    @ApiModelProperty(value = "用户发货物流公司ID")
-    private String expressId;
-
-    @ApiModelProperty(value = "用户发货物流单号")
-    private String expressNo;
-
-    @ApiModelProperty(value = "商家收货状态(0未收货 1已收货)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isReceipt;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java b/src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java
deleted file mode 100644
index 1c99574..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/OrderRenewParam.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 续费订单记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-13 10:34:35
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "OrderRenewParam对象", description = "续费订单记录表查询参数")
-public class OrderRenewParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "售后单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderRenewId;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单商品ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderGoodsId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "类型(10续费订单)")
-    @QueryField(type = QueryType.EQ)
-    private Integer type;
-
-    @ApiModelProperty(value = "实际续费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal renewMoney;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/PaymentParam.java b/src/main/java/com/gxwebsoft/shop/param/PaymentParam.java
deleted file mode 100644
index d3cca62..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/PaymentParam.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商城支付方式记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-12-15 19:11:07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "PaymentParam对象", description = "商城支付方式记录表查询参数")
-public class PaymentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "支付方式ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer paymentId;
-
-    @ApiModelProperty(value = "支付方式(微信、支付宝、余额)")
-    @QueryField(type = QueryType.EQ)
-    private String method;
-
-    @ApiModelProperty(value = "编码")
-    private String paymentCode;
-
-    @ApiModelProperty(value = "支付配置(json格式)")
-    private String config;
-
-    @ApiModelProperty(value = "是否为默认支付方式")
-    @QueryField(type = QueryType.EQ)
-    private Integer isDefault;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户ID")
-    private Integer tenantId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java b/src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java
deleted file mode 100644
index 45ff883..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/PaymentTemplateParam.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 商城支付模板记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "PaymentTemplateParam对象", description = "商城支付模板记录表查询参数")
-public class PaymentTemplateParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "支付模板ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer templateId;
-
-    @ApiModelProperty(value = "支付模板名称")
-    private String name;
-
-    @ApiModelProperty(value = "支付方式(微信、支付宝、余额)")
-    private String method;
-
-    @ApiModelProperty(value = "支付配置(json格式)")
-    private String config;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remarks;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java b/src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java
deleted file mode 100644
index 12a9f0e..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/PaymentTradeParam.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 第三方支付交易记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "PaymentTradeParam对象", description = "第三方支付交易记录表查询参数")
-public class PaymentTradeParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "交易记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer tradeId;
-
-    @ApiModelProperty(value = "交易订单号(全局唯一)")
-    private String outTradeNo;
-
-    @ApiModelProperty(value = "发起客户端(H5、小程序、APP)")
-    private String client;
-
-    @ApiModelProperty(value = "支付方式(微信、支付宝)")
-    private String payMethod;
-
-    @ApiModelProperty(value = "订单类型(10商城订单 100余额充值订单)")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderType;
-
-    @ApiModelProperty(value = "订单ID(商城订单、充值订单)")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "商城订单号(商城订单、充值订单)")
-    private String orderNo;
-
-    @ApiModelProperty(value = "第三方交易流水号")
-    private String tradeNo;
-
-    @ApiModelProperty(value = "预支付交易会话ID(微信支付)")
-    private String prepayId;
-
-    @ApiModelProperty(value = "交易状态")
-    @QueryField(type = QueryType.EQ)
-    private Integer tradeState;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java
deleted file mode 100644
index 2674017..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/RechargeOrderParam.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 会员充值订单表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "RechargeOrderParam对象", description = "会员充值订单表查询参数")
-public class RechargeOrderParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "充值方式(10自定义金额 20套餐充值)")
-    @QueryField(type = QueryType.EQ)
-    private Integer rechargeType;
-
-    @ApiModelProperty(value = "充值套餐ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "用户支付金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "赠送金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal giftMoney;
-
-    @ApiModelProperty(value = "实际到账金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal actualMoney;
-
-    @ApiModelProperty(value = "支付方式（微信/支付宝）")
-    private String payMethod;
-
-    @ApiModelProperty(value = "支付状态(10待支付 20已支付)")
-    @QueryField(type = QueryType.EQ)
-    private Integer payStatus;
-
-    @ApiModelProperty(value = "付款时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer payTime;
-
-    @ApiModelProperty(value = "第三方交易记录ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer tradeId;
-
-    @ApiModelProperty(value = "来源客户端 (APP、H5、小程序等)")
-    private String platform;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "机构ID")
-    private Integer organizationId;
-
-    @ApiModelProperty(value = "部门名称")
-    @TableField(exist = false)
-    private String organizationName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java b/src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java
deleted file mode 100644
index 51ab9a7..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/RechargeOrderPlanParam.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 会员充值订单套餐快照表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "RechargeOrderPlanParam对象", description = "会员充值订单套餐快照表查询参数")
-public class RechargeOrderPlanParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderPlanId;
-
-    @ApiModelProperty(value = "订单ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer orderId;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "方案名称")
-    private String planName;
-
-    @ApiModelProperty(value = "充值金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "赠送金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal giftMoney;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java b/src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java
deleted file mode 100644
index 0bb9b25..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/RechargePlanParam.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 会员充值套餐表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "RechargePlanParam对象", description = "会员充值套餐表查询参数")
-public class RechargePlanParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer planId;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String planName;
-
-    @ApiModelProperty(value = "充值金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "赠送金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal giftMoney;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "所属门店ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java b/src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java
deleted file mode 100644
index 252b940..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserAddressParam.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户收货地址表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserAddressParam对象", description = "用户收货地址表查询参数")
-public class UserAddressParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer addressId;
-
-    @ApiModelProperty(value = "收货人姓名")
-    private String name;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "省份ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer provinceId;
-
-    @ApiModelProperty(value = "城市ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer cityId;
-
-    @ApiModelProperty(value = "区/县ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer regionId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String detail;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java b/src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java
deleted file mode 100644
index 456e6e9..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserBalanceLogParam.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 用户余额变动明细表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-21 15:59:09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserBalanceLogParam对象", description = "用户余额变动明细表查询参数")
-public class UserBalanceLogParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)")
-    @QueryField(type = QueryType.EQ)
-    private Integer scene;
-
-    @ApiModelProperty(value = "变动金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal money;
-
-    @ApiModelProperty(value = "变动后余额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "描述/说明")
-    private String describe;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "昵称")
-    private String nickname;
-
-    @ApiModelProperty(value = "余额变动场景筛选")
-    private String sceneMultiple;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java b/src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java
deleted file mode 100644
index 60be4df..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserCommentParam.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户评价记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-07-06 13:55:16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserCommentParam对象", description = "用户评价记录表查询参数")
-public class UserCommentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "评价ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer commentId;
-
-    @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
-    @QueryField(type = QueryType.EQ)
-    private Integer score;
-
-    @ApiModelProperty(value = "评价内容")
-    private String content;
-
-    @ApiModelProperty(value = "是否为图片评价")
-    @QueryField(type = QueryType.EQ)
-    private Integer isPicture;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "被评价者ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "回复的评论ID")
-    @TableField(exist = false)
-    private Integer replyCommentId;
-
-    @ApiModelProperty(value = "回复者ID")
-    @TableField(exist = false)
-    private Integer replyUserId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "当前登录用户ID")
-    @TableField(exist = false)
-    private Integer loginUserId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java b/src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java
deleted file mode 100644
index e0ad943..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserCouponParam.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 用户优惠券记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserCouponParam对象", description = "用户优惠券记录表查询参数")
-public class UserCouponParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userCouponId;
-
-    @ApiModelProperty(value = "优惠券ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer couponId;
-
-    @ApiModelProperty(value = "优惠券名称")
-    private String name;
-
-    @ApiModelProperty(value = "优惠券类型(10满减券 20折扣券)")
-    @QueryField(type = QueryType.EQ)
-    private Integer couponType;
-
-    @ApiModelProperty(value = "满减券-减免金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal reducePrice;
-
-    @ApiModelProperty(value = "折扣券-折扣率(0-100)")
-    @QueryField(type = QueryType.EQ)
-    private Integer discount;
-
-    @ApiModelProperty(value = "最低消费金额")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal minPrice;
-
-    @ApiModelProperty(value = "到期类型(10领取后生效 20固定时间)")
-    @QueryField(type = QueryType.EQ)
-    private Integer expireType;
-
-    @ApiModelProperty(value = "领取后生效-有效天数")
-    @QueryField(type = QueryType.EQ)
-    private Integer expireDay;
-
-    @ApiModelProperty(value = "有效期开始时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer startTime;
-
-    @ApiModelProperty(value = "有效期结束时间")
-    @QueryField(type = QueryType.EQ)
-    private Integer endTime;
-
-    @ApiModelProperty(value = "适用范围(10全部商品 20指定商品)")
-    @QueryField(type = QueryType.EQ)
-    private Integer applyRange;
-
-    @ApiModelProperty(value = "适用范围配置(json格式)")
-    private String applyRangeConfig;
-
-    @ApiModelProperty(value = "是否过期(0未过期 1已过期)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isExpire;
-
-    @ApiModelProperty(value = "是否已使用(0未使用 1已使用)")
-    @QueryField(type = QueryType.EQ)
-    private Integer isUse;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java b/src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java
deleted file mode 100644
index 76de479..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserFollowParam.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 关注记录表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserFollowParam对象", description = "关注记录表查询参数")
-public class UserFollowParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "商铺ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer shopId;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "当期登录用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer loginUserId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java b/src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java
deleted file mode 100644
index c812a09..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserGradeLogParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户会员等级变更记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserGradeLogParam对象", description = "用户会员等级变更记录表查询参数")
-public class UserGradeLogParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "变更前的等级ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer oldGradeId;
-
-    @ApiModelProperty(value = "变更后的等级ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer newGradeId;
-
-    @ApiModelProperty(value = "变更类型(10后台管理员设置 20自动升级)")
-    @QueryField(type = QueryType.EQ)
-    private Integer changeType;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java b/src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java
deleted file mode 100644
index 42dcb80..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserGradeParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户会员等级表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserGradeParam对象", description = "用户会员等级表查询参数")
-public class UserGradeParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "等级ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "等级名称")
-    private String name;
-
-    @ApiModelProperty(value = "等级权重(1-9999)")
-    @QueryField(type = QueryType.EQ)
-    private Integer weight;
-
-    @ApiModelProperty(value = "升级条件")
-    private String upgrade;
-
-    @ApiModelProperty(value = "等级权益(折扣率0-100)")
-    private String equity;
-
-    @ApiModelProperty(value = "佣金比率")
-    private String commission;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java b/src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java
deleted file mode 100644
index e668924..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserLikeParam.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 点赞记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-07-06 17:51:03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserLikeParam对象", description = "点赞记录表查询参数")
-public class UserLikeParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "点赞对象ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "登录用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer loginUserId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserLookParam.java b/src/main/java/com/gxwebsoft/shop/param/UserLookParam.java
deleted file mode 100644
index a4e72e0..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserLookParam.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 访客记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-07-13 23:10:38
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserLookParam对象", description = "访客记录表查询参数")
-public class UserLookParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "点赞对象ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer toUserId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "登录用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer loginUserId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java b/src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java
deleted file mode 100644
index 02c441d..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserOauthParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 第三方用户信息表查询参数
- *
- * @author 科技小王子
- * @since 2022-12-15 08:33:13
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserOauthParam对象", description = "第三方用户信息表查询参数")
-public class UserOauthParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "第三方登陆类型(MP-WEIXIN)")
-    private String oauthType;
-
-    @ApiModelProperty(value = "第三方用户唯一标识 (uid openid)")
-    private String oauthId;
-
-    @ApiModelProperty(value = "微信unionID")
-    private String unionid;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "商户编码")
-    private String merchantCode;
-
-    @ApiModelProperty(value = "租户ID")
-    private Integer tenantId;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java b/src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java
deleted file mode 100644
index bc4e843..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserPointsLogParam.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户积分变动明细表查询参数
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserPointsLogParam对象", description = "用户积分变动明细表查询参数")
-public class UserPointsLogParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer logId;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "变动数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer value;
-
-    @ApiModelProperty(value = "描述/说明")
-    private String describe;
-
-    @ApiModelProperty(value = "管理员备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java b/src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java
deleted file mode 100644
index adfb251..0000000
--- a/src/main/java/com/gxwebsoft/shop/param/UserRefereeParam.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.gxwebsoft.shop.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 用户推荐关系表查询参数
- *
- * @author 科技小王子
- * @since 2023-04-28 14:07:29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "UserRefereeParam对象", description = "用户推荐关系表查询参数")
-public class UserRefereeParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "推荐人ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer dealerId;
-
-    @ApiModelProperty(value = "用户id(被推荐人)")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "推荐关系层级(1,2,3)")
-    @QueryField(type = QueryType.EQ)
-    private Integer level;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "被推荐人昵称")
-    @QueryField(type = QueryType.LIKE)
-    private String nickname;
-
-    @ApiModelProperty(value = "推荐人昵称")
-    @QueryField(type = QueryType.LIKE)
-    private String dealerName;
-
-    @ApiModelProperty(value = "性别")
-    @QueryField(type = QueryType.EQ)
-    private Integer sex;
-
-    @ApiModelProperty(value = "下级的会员等级")
-    @QueryField(type = QueryType.EQ)
-    private Integer gradeId;
-
-    @ApiModelProperty(value = "是否线下会员")
-    @QueryField(type = QueryType.EQ)
-    private Integer offline;
-
-    @QueryField(value = "grade_id", type = QueryType.GE)
-    @TableField(exist = false)
-    @ApiModelProperty("会员等级起始值")
-    private String gradeStart;
-
-    @QueryField(value = "grade_id", type = QueryType.LE)
-    @TableField(exist = false)
-    @ApiModelProperty("会员等级结束值")
-    private String gradeEnd;
-
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/CartService.java b/src/main/java/com/gxwebsoft/shop/service/CartService.java
deleted file mode 100644
index 6aa40c3..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/CartService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Cart;
-import com.gxwebsoft.shop.param.CartParam;
-
-import java.util.List;
-
-/**
- * 购物车记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface CartService extends IService<Cart> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Cart>
-     */
-    PageResult<Cart> pageRel(CartParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Cart>
-     */
-    List<Cart> listRel(CartParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 主键ID
-     * @return Cart
-     */
-    Cart getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/CategoryService.java b/src/main/java/com/gxwebsoft/shop/service/CategoryService.java
deleted file mode 100644
index 6127c99..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/CategoryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Category;
-import com.gxwebsoft.shop.param.CategoryParam;
-
-import java.util.List;
-
-/**
- * 商品分类表Service
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-public interface CategoryService extends IService<Category> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Category>
-     */
-    PageResult<Category> pageRel(CategoryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Category>
-     */
-    List<Category> listRel(CategoryParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param categoryId 商品分类ID
-     * @return Category
-     */
-    Category getByIdRel(Integer categoryId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/CommentService.java b/src/main/java/com/gxwebsoft/shop/service/CommentService.java
deleted file mode 100644
index 9663fac..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/CommentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Comment;
-import com.gxwebsoft.shop.param.CommentParam;
-
-import java.util.List;
-
-/**
- * 商品评价记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-23 21:18:56
- */
-public interface CommentService extends IService<Comment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Comment>
-     */
-    PageResult<Comment> pageRel(CommentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Comment>
-     */
-    List<Comment> listRel(CommentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param commentId 评价ID
-     * @return Comment
-     */
-    Comment getByIdRel(Integer commentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/CouponService.java b/src/main/java/com/gxwebsoft/shop/service/CouponService.java
deleted file mode 100644
index 328b8c0..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/CouponService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Coupon;
-import com.gxwebsoft.shop.param.CouponParam;
-
-import java.util.List;
-
-/**
- * 优惠券记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-28 18:26:05
- */
-public interface CouponService extends IService<Coupon> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Coupon>
-     */
-    PageResult<Coupon> pageRel(CouponParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Coupon>
-     */
-    List<Coupon> listRel(CouponParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param couponId 优惠券ID
-     * @return Coupon
-     */
-    Coupon getByIdRel(Integer couponId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/ExpressService.java b/src/main/java/com/gxwebsoft/shop/service/ExpressService.java
deleted file mode 100644
index db9d993..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/ExpressService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Express;
-import com.gxwebsoft.shop.param.ExpressParam;
-
-import java.util.List;
-
-/**
- * 物流公司记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-22 00:21:07
- */
-public interface ExpressService extends IService<Express> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Express>
-     */
-    PageResult<Express> pageRel(ExpressParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Express>
-     */
-    List<Express> listRel(ExpressParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param expressId 物流公司ID
-     * @return Express
-     */
-    Express getByIdRel(Integer expressId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsService.java
deleted file mode 100644
index 98e8c64..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/GoodsService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.param.GoodsParam;
-
-import java.util.List;
-
-/**
- * 商品记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-public interface GoodsService extends IService<Goods> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Goods>
-     */
-    PageResult<Goods> pageRel(GoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Goods>
-     */
-    List<Goods> listRel(GoodsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param goodsId 商品ID
-     * @return Goods
-     */
-    Goods getByIdRel(Integer goodsId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java b/src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java
deleted file mode 100644
index c2f2212..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/GoodsServiceService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.GoodsService;
-import com.gxwebsoft.shop.param.GoodsServiceParam;
-
-import java.util.List;
-
-/**
- * 商品服务与承诺记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-23 21:57:50
- */
-public interface GoodsServiceService extends IService<GoodsService> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<GoodsService>
-     */
-    PageResult<GoodsService> pageRel(GoodsServiceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<GoodsService>
-     */
-    List<GoodsService> listRel(GoodsServiceParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param serviceId 商品服务ID
-     * @return GoodsService
-     */
-    GoodsService getByIdRel(Integer serviceId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/MemberService.java b/src/main/java/com/gxwebsoft/shop/service/MemberService.java
deleted file mode 100644
index 3e006a9..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/MemberService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Member;
-import com.gxwebsoft.shop.param.MemberParam;
-
-import java.util.List;
-
-/**
- * 商城会员Service
- *
- * @author 科技小王子
- * @since 2022-11-25 14:02:24
- */
-public interface MemberService extends IService<Member> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Member>
-     */
-    PageResult<Member> pageRel(MemberParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Member>
-     */
-    List<Member> listRel(MemberParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param memberId 主键ID
-     * @return Member
-     */
-    Member getByIdRel(Integer memberId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java b/src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java
deleted file mode 100644
index 9e6b1be..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/MerchantClerkService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.MerchantClerk;
-import com.gxwebsoft.shop.param.MerchantClerkParam;
-
-import java.util.List;
-
-/**
- * 商家门店店员表Service
- *
- * @author 科技小王子
- * @since 2022-11-30 16:32:25
- */
-public interface MerchantClerkService extends IService<MerchantClerk> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<MerchantClerk>
-     */
-    PageResult<MerchantClerk> pageRel(MerchantClerkParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<MerchantClerk>
-     */
-    List<MerchantClerk> listRel(MerchantClerkParam param);
-
-    /**
-     * 根据id查询
-     * @param clerkId 商户人员ID
-     * @return MerchantClerk
-     */
-    MerchantClerk getByIdRel(Integer clerkId);
-
-    /**
-     * 根据当前登录用户的userId查询所属的商户编号
-     * @param loginUserId 商户人员ID
-     * @return MerchantClerk
-     */
-    String getMerchantCodeByClerk(Integer loginUserId);
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/MerchantService.java b/src/main/java/com/gxwebsoft/shop/service/MerchantService.java
deleted file mode 100644
index dfe3c1f..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/MerchantService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.param.MerchantParam;
-
-import java.util.List;
-
-/**
- * 商户管理Service
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-public interface MerchantService extends IService<Merchant> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Merchant>
-     */
-    PageResult<Merchant> pageRel(MerchantParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Merchant>
-     */
-    List<Merchant> listRel(MerchantParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param merchantId 商户ID
-     * @return Merchant
-     */
-    Merchant getByIdRel(Integer merchantId);
-
-    /**
-     *
-     * @param merchantOwner 店主绑定的userId
-     * @return 商户编号
-     */
-    String getMerchantCodeByOwner(Integer merchantOwner);
-
-    Merchant getMerchantByCode(String merchantCode);
-
-    List<Merchant> listByGeo(MerchantParam param);
-
-    void saveGeoPointToRedis();
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java b/src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java
deleted file mode 100644
index a3c5227..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/MerchantWithdrawService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.MerchantWithdraw;
-import com.gxwebsoft.shop.param.MerchantWithdrawParam;
-
-import java.util.List;
-
-/**
- * 商户提现记录Service
- *
- * @author 科技小王子
- * @since 2022-12-02 00:41:09
- */
-public interface MerchantWithdrawService extends IService<MerchantWithdraw> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<MerchantWithdraw>
-     */
-    PageResult<MerchantWithdraw> pageRel(MerchantWithdrawParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<MerchantWithdraw>
-     */
-    List<MerchantWithdraw> listRel(MerchantWithdrawParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 主键ID
-     * @return MerchantWithdraw
-     */
-    MerchantWithdraw getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java b/src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java
deleted file mode 100644
index 4f2680a..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/OrderAddressService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.OrderAddress;
-import com.gxwebsoft.shop.param.OrderAddressParam;
-
-import java.util.List;
-
-/**
- * 订单收货地址记录表Service
- *
- * @author 科技小王子
- * @since 2022-12-02 21:21:10
- */
-public interface OrderAddressService extends IService<OrderAddress> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<OrderAddress>
-     */
-    PageResult<OrderAddress> pageRel(OrderAddressParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<OrderAddress>
-     */
-    List<OrderAddress> listRel(OrderAddressParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderAddressId 地址ID
-     * @return OrderAddress
-     */
-    OrderAddress getByIdRel(Integer orderAddressId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java b/src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java
deleted file mode 100644
index 8d116da..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/OrderGoodsService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-
-import java.util.List;
-
-/**
- * 订单商品记录表Service
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-public interface OrderGoodsService extends IService<OrderGoods> {
-
-    List<OrderGoods> listByOrderIds(List<Integer> orderIds);
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<OrderGoods>
-     */
-    PageResult<OrderGoods> pageRel(OrderGoodsParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<OrderGoods>
-     */
-    List<OrderGoods> listRel(OrderGoodsParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderGoodsId 订单商品ID
-     * @return OrderGoods
-     */
-    OrderGoods getByIdRel(Integer orderGoodsId);
-
-    int countBySettled(OrderGoodsParam param);
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java
deleted file mode 100644
index 4af1443..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/OrderRefundAddressService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.OrderRefundAddress;
-import com.gxwebsoft.shop.param.OrderRefundAddressParam;
-
-import java.util.List;
-
-/**
- * 售后单退货地址记录表Service
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-public interface OrderRefundAddressService extends IService<OrderRefundAddress> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<OrderRefundAddress>
-     */
-    PageResult<OrderRefundAddress> pageRel(OrderRefundAddressParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<OrderRefundAddress>
-     */
-    List<OrderRefundAddress> listRel(OrderRefundAddressParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 主键ID
-     * @return OrderRefundAddress
-     */
-    OrderRefundAddress getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java
deleted file mode 100644
index 8f5a2cb..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/OrderRefundService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.OrderRefund;
-import com.gxwebsoft.shop.param.OrderRefundParam;
-
-import java.util.List;
-
-/**
- * 售后单记录表Service
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-public interface OrderRefundService extends IService<OrderRefund> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<OrderRefund>
-     */
-    PageResult<OrderRefund> pageRel(OrderRefundParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<OrderRefund>
-     */
-    List<OrderRefund> listRel(OrderRefundParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderRefundId 售后单ID
-     * @return OrderRefund
-     */
-    OrderRefund getByIdRel(Integer orderRefundId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java b/src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java
deleted file mode 100644
index f5137e3..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/OrderRenewService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.OrderRenew;
-import com.gxwebsoft.shop.param.OrderRenewParam;
-
-import java.util.List;
-
-/**
- * 续费订单记录表Service
- *
- * @author 科技小王子
- * @since 2023-04-13 10:34:35
- */
-public interface OrderRenewService extends IService<OrderRenew> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<OrderRenew>
-     */
-    PageResult<OrderRenew> pageRel(OrderRenewParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<OrderRenew>
-     */
-    List<OrderRenew> listRel(OrderRenewParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderRenewId 售后单ID
-     * @return OrderRenew
-     */
-    OrderRenew getByIdRel(Integer orderRenewId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/OrderService.java b/src/main/java/com/gxwebsoft/shop/service/OrderService.java
deleted file mode 100644
index a6efb9b..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/OrderService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.param.OrderParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 订单记录表Service
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-public interface OrderService extends IService<Order> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Order>
-     */
-    PageResult<Order> pageRel(OrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Order>
-     */
-    List<Order> listRel(OrderParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderId 订单ID
-     * @return Order
-     */
-    Order getByIdRel(Integer orderId);
-
-    Order getByOutTradeNo(String outTradeNo);
-
-    @InterceptorIgnore(tenantLine = "true")
-    void paySuccess(AlipayTradeQueryResponse params);
-
-    boolean allinPay(Map<String, String> params);
-
-    @InterceptorIgnore(tenantLine = "true")
-    void removeOrderByTimeOut();
-
-    @InterceptorIgnore(tenantLine = "true")
-    boolean updateByIdRel(Order order);
-
-    PageResult<Order> selectPageSettled(OrderParam param);
-
-    void updateByIdSettled(Order order);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentService.java
deleted file mode 100644
index eea8d25..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/PaymentService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.alipay.api.AlipayApiException;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.shop.entity.Payment;
-import com.gxwebsoft.shop.param.PaymentParam;
-
-import java.util.List;
-
-/**
- * 商城支付方式记录表Service
- *
- * @author 科技小王子
- * @since 2022-12-15 19:11:07
- */
-public interface PaymentService extends IService<Payment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<Payment>
-     */
-    PageResult<Payment> pageRel(PaymentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<Payment>
-     */
-    List<Payment> listRel(PaymentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param paymentId 支付方式ID
-     * @return Payment
-     */
-    Payment getByIdRel(Integer paymentId);
-
-    /**
-     * 查询支付方式
-     * @param method
-     * @return
-     */
-    Payment getPaymentByMethod(String method);
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java
deleted file mode 100644
index a37c20c..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/PaymentTemplateService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.PaymentTemplate;
-import com.gxwebsoft.shop.param.PaymentTemplateParam;
-
-import java.util.List;
-
-/**
- * 商城支付模板记录表Service
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-public interface PaymentTemplateService extends IService<PaymentTemplate> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<PaymentTemplate>
-     */
-    PageResult<PaymentTemplate> pageRel(PaymentTemplateParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<PaymentTemplate>
-     */
-    List<PaymentTemplate> listRel(PaymentTemplateParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param templateId 支付模板ID
-     * @return PaymentTemplate
-     */
-    PaymentTemplate getByIdRel(Integer templateId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java b/src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java
deleted file mode 100644
index 0c1efdf..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/PaymentTradeService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.PaymentTrade;
-import com.gxwebsoft.shop.param.PaymentTradeParam;
-
-import java.util.List;
-
-/**
- * 第三方支付交易记录表Service
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-public interface PaymentTradeService extends IService<PaymentTrade> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<PaymentTrade>
-     */
-    PageResult<PaymentTrade> pageRel(PaymentTradeParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<PaymentTrade>
-     */
-    List<PaymentTrade> listRel(PaymentTradeParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param tradeId 交易记录ID
-     * @return PaymentTrade
-     */
-    PaymentTrade getByIdRel(Integer tradeId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java b/src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java
deleted file mode 100644
index ba26b1f..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/RechargeOrderPlanService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.RechargeOrderPlan;
-import com.gxwebsoft.shop.param.RechargeOrderPlanParam;
-
-import java.util.List;
-
-/**
- * 会员充值订单套餐快照表Service
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-public interface RechargeOrderPlanService extends IService<RechargeOrderPlan> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<RechargeOrderPlan>
-     */
-    PageResult<RechargeOrderPlan> pageRel(RechargeOrderPlanParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<RechargeOrderPlan>
-     */
-    List<RechargeOrderPlan> listRel(RechargeOrderPlanParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderPlanId 主键ID
-     * @return RechargeOrderPlan
-     */
-    RechargeOrderPlan getByIdRel(Integer orderPlanId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java b/src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java
deleted file mode 100644
index 697cb17..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/RechargeOrderService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.RechargeOrder;
-import com.gxwebsoft.shop.param.RechargeOrderParam;
-
-import java.util.List;
-
-/**
- * 会员充值订单表Service
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-public interface RechargeOrderService extends IService<RechargeOrder> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<RechargeOrder>
-     */
-    PageResult<RechargeOrder> pageRel(RechargeOrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<RechargeOrder>
-     */
-    List<RechargeOrder> listRel(RechargeOrderParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param orderId 订单ID
-     * @return RechargeOrder
-     */
-    RechargeOrder getByIdRel(Integer orderId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java b/src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java
deleted file mode 100644
index b5e9690..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/RechargePlanService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.RechargePlan;
-import com.gxwebsoft.shop.param.RechargePlanParam;
-
-import java.util.List;
-
-/**
- * 会员充值套餐表Service
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-public interface RechargePlanService extends IService<RechargePlan> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<RechargePlan>
-     */
-    PageResult<RechargePlan> pageRel(RechargePlanParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<RechargePlan>
-     */
-    List<RechargePlan> listRel(RechargePlanParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param planId 主键ID
-     * @return RechargePlan
-     */
-    RechargePlan getByIdRel(Integer planId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/TestService.java b/src/main/java/com/gxwebsoft/shop/service/TestService.java
deleted file mode 100644
index 8bee3da..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/TestService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.shop.entity.Order;
-
-public interface TestService extends IService<Order> {
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserAddressService.java b/src/main/java/com/gxwebsoft/shop/service/UserAddressService.java
deleted file mode 100644
index 2d0ed35..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserAddressService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserAddress;
-import com.gxwebsoft.shop.param.UserAddressParam;
-
-import java.util.List;
-
-/**
- * 用户收货地址表Service
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserAddressService extends IService<UserAddress> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserAddress>
-     */
-    PageResult<UserAddress> pageRel(UserAddressParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserAddress>
-     */
-    List<UserAddress> listRel(UserAddressParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param addressId 主键ID
-     * @return UserAddress
-     */
-    UserAddress getByIdRel(Integer addressId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java
deleted file mode 100644
index ba488f5..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserBalanceLogService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.UserBalanceLogParam;
-
-import java.util.List;
-
-/**
- * 用户余额变动明细表Service
- *
- * @author 科技小王子
- * @since 2023-04-21 15:59:09
- */
-public interface UserBalanceLogService extends IService<UserBalanceLog> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserBalanceLog>
-     */
-    PageResult<UserBalanceLog> pageRel(UserBalanceLogParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserBalanceLog>
-     */
-    List<UserBalanceLog> listRel(UserBalanceLogParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId 主键ID
-     * @return UserBalanceLog
-     */
-    UserBalanceLog getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserCommentService.java b/src/main/java/com/gxwebsoft/shop/service/UserCommentService.java
deleted file mode 100644
index e8cdfa7..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserCommentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserComment;
-import com.gxwebsoft.shop.param.UserCommentParam;
-
-import java.util.List;
-
-/**
- * 用户评价记录表Service
- *
- * @author 科技小王子
- * @since 2023-07-06 13:55:16
- */
-public interface UserCommentService extends IService<UserComment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserComment>
-     */
-    PageResult<UserComment> pageRel(UserCommentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserComment>
-     */
-    List<UserComment> listRel(UserCommentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param commentId 评价ID
-     * @return UserComment
-     */
-    UserComment getByIdRel(Integer commentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserCouponService.java b/src/main/java/com/gxwebsoft/shop/service/UserCouponService.java
deleted file mode 100644
index 49766e7..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserCouponService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserCoupon;
-import com.gxwebsoft.shop.param.UserCouponParam;
-
-import java.util.List;
-
-/**
- * 用户优惠券记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserCouponService extends IService<UserCoupon> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserCoupon>
-     */
-    PageResult<UserCoupon> pageRel(UserCouponParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserCoupon>
-     */
-    List<UserCoupon> listRel(UserCouponParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param userCouponId 主键ID
-     * @return UserCoupon
-     */
-    UserCoupon getByIdRel(Integer userCouponId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java b/src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java
deleted file mode 100644
index 6b71d8a..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserFeedbackService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserFeedback;
-import com.gxwebsoft.shop.param.UserFeedbackParam;
-
-import java.util.List;
-
-/**
- * 意见反馈记录表Service
- *
- * @author 科技小王子
- * @since 2023-07-16 22:24:55
- */
-public interface UserFeedbackService extends IService<UserFeedback> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserFeedback>
-     */
-    PageResult<UserFeedback> pageRel(UserFeedbackParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserFeedback>
-     */
-    List<UserFeedback> listRel(UserFeedbackParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id ID
-     * @return UserFeedback
-     */
-    UserFeedback getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserFollowService.java b/src/main/java/com/gxwebsoft/shop/service/UserFollowService.java
deleted file mode 100644
index 4b78313..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserFollowService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserFollow;
-import com.gxwebsoft.shop.param.UserFollowParam;
-
-import java.util.List;
-
-/**
- * 关注记录表Service
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserFollowService extends IService<UserFollow> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserFollow>
-     */
-    PageResult<UserFollow> pageRel(UserFollowParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserFollow>
-     */
-    List<UserFollow> listRel(UserFollowParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId 主键ID
-     * @return UserFollow
-     */
-    UserFollow getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java
deleted file mode 100644
index b4dd600..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserGradeLogService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserGradeLog;
-import com.gxwebsoft.shop.param.UserGradeLogParam;
-
-import java.util.List;
-
-/**
- * 用户会员等级变更记录表Service
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-public interface UserGradeLogService extends IService<UserGradeLog> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserGradeLog>
-     */
-    PageResult<UserGradeLog> pageRel(UserGradeLogParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserGradeLog>
-     */
-    List<UserGradeLog> listRel(UserGradeLogParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId 主键ID
-     * @return UserGradeLog
-     */
-    UserGradeLog getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserGradeService.java b/src/main/java/com/gxwebsoft/shop/service/UserGradeService.java
deleted file mode 100644
index a8e578c..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserGradeService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserGrade;
-import com.gxwebsoft.shop.param.UserGradeParam;
-
-import java.util.List;
-
-/**
- * 用户会员等级表Service
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-public interface UserGradeService extends IService<UserGrade> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserGrade>
-     */
-    PageResult<UserGrade> pageRel(UserGradeParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserGrade>
-     */
-    List<UserGrade> listRel(UserGradeParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param gradeId 等级ID
-     * @return UserGrade
-     */
-    UserGrade getByIdRel(Integer gradeId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserLikeService.java b/src/main/java/com/gxwebsoft/shop/service/UserLikeService.java
deleted file mode 100644
index 204e18c..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserLikeService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserLike;
-import com.gxwebsoft.shop.param.UserLikeParam;
-
-import java.util.List;
-
-/**
- * 点赞记录表Service
- *
- * @author 科技小王子
- * @since 2023-07-06 17:51:04
- */
-public interface UserLikeService extends IService<UserLike> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserLike>
-     */
-    PageResult<UserLike> pageRel(UserLikeParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserLike>
-     */
-    List<UserLike> listRel(UserLikeParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId 主键ID
-     * @return UserLike
-     */
-    UserLike getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserLookService.java b/src/main/java/com/gxwebsoft/shop/service/UserLookService.java
deleted file mode 100644
index 0a2fd27..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserLookService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserLook;
-import com.gxwebsoft.shop.param.UserLookParam;
-
-import java.util.List;
-
-/**
- * 访客记录表Service
- *
- * @author 科技小王子
- * @since 2023-07-13 23:10:38
- */
-public interface UserLookService extends IService<UserLook> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserLook>
-     */
-    PageResult<UserLook> pageRel(UserLookParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserLook>
-     */
-    List<UserLook> listRel(UserLookParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId 主键ID
-     * @return UserLook
-     */
-    UserLook getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserOauthService.java b/src/main/java/com/gxwebsoft/shop/service/UserOauthService.java
deleted file mode 100644
index d98d3de..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserOauthService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * 第三方用户信息表Service
- *
- * @author 科技小王子
- * @since 2022-12-15 08:33:13
- */
-public interface UserOauthService extends IService<UserOauth> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserOauth>
-     */
-    PageResult<UserOauth> pageRel(UserOauthParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserOauth>
-     */
-    List<UserOauth> listRel(UserOauthParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 主键ID
-     * @return UserOauth
-     */
-    UserOauth getByIdRel(Integer id);
-
-    /**
-     * 获取第三方用户唯一标识
-     * @param userId
-     * @param platform
-     * @return
-     */
-    String getOauthIdByUserId(Integer userId,String platform);
-
-    // 根据openId获取用户信息
-    User getByOauthId(String openid);
-
-    // 跟进unionId获取用户信息
-    UserOauth getByUnionId(UserOauthParam param);
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java b/src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java
deleted file mode 100644
index 7a66a27..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserPointsLogService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserPointsLog;
-import com.gxwebsoft.shop.param.UserPointsLogParam;
-
-import java.util.List;
-
-/**
- * 用户积分变动明细表Service
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-public interface UserPointsLogService extends IService<UserPointsLog> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserPointsLog>
-     */
-    PageResult<UserPointsLog> pageRel(UserPointsLogParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserPointsLog>
-     */
-    List<UserPointsLog> listRel(UserPointsLogParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param logId 主键ID
-     * @return UserPointsLog
-     */
-    UserPointsLog getByIdRel(Integer logId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java b/src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java
deleted file mode 100644
index e4caff8..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/UserRefereeService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.shop.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.UserRefereeParam;
-
-import java.util.List;
-
-/**
- * 用户推荐关系表Service
- *
- * @author 科技小王子
- * @since 2023-04-28 14:07:29
- */
-public interface UserRefereeService extends IService<UserReferee> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<UserReferee>
-     */
-    PageResult<UserReferee> pageRel(UserRefereeParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<UserReferee>
-     */
-    List<UserReferee> listRel(UserRefereeParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 主键ID
-     * @return UserReferee
-     */
-    UserReferee getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java
deleted file mode 100644
index 9f8cb47..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/CartServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.CartMapper;
-import com.gxwebsoft.shop.service.CartService;
-import com.gxwebsoft.shop.entity.Cart;
-import com.gxwebsoft.shop.param.CartParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 购物车记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Service
-public class CartServiceImpl extends ServiceImpl<CartMapper, Cart> implements CartService {
-
-    @Override
-    public PageResult<Cart> pageRel(CartParam param) {
-        PageParam<Cart, CartParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Cart> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Cart> listRel(CartParam param) {
-        List<Cart> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Cart, CartParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Cart getByIdRel(Integer id) {
-        CartParam param = new CartParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java
deleted file mode 100644
index 1055110..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/CategoryServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.CategoryMapper;
-import com.gxwebsoft.shop.service.CategoryService;
-import com.gxwebsoft.shop.entity.Category;
-import com.gxwebsoft.shop.param.CategoryParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商品分类表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-22 17:45:37
- */
-@Service
-public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> implements CategoryService {
-
-    @Override
-    public PageResult<Category> pageRel(CategoryParam param) {
-        PageParam<Category, CategoryParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Category> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Category> listRel(CategoryParam param) {
-        List<Category> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Category, CategoryParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Category getByIdRel(Integer categoryId) {
-        CategoryParam param = new CategoryParam();
-        param.setCategoryId(categoryId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java
deleted file mode 100644
index 7e4f444..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/CommentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.CommentMapper;
-import com.gxwebsoft.shop.service.CommentService;
-import com.gxwebsoft.shop.entity.Comment;
-import com.gxwebsoft.shop.param.CommentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商品评价记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-23 21:18:56
- */
-@Service
-public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> implements CommentService {
-
-    @Override
-    public PageResult<Comment> pageRel(CommentParam param) {
-        PageParam<Comment, CommentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Comment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Comment> listRel(CommentParam param) {
-        List<Comment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Comment, CommentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Comment getByIdRel(Integer commentId) {
-        CommentParam param = new CommentParam();
-        param.setCommentId(commentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java
deleted file mode 100644
index 76bf727..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/CouponServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.CouponMapper;
-import com.gxwebsoft.shop.service.CouponService;
-import com.gxwebsoft.shop.entity.Coupon;
-import com.gxwebsoft.shop.param.CouponParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 优惠券记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-28 18:26:05
- */
-@Service
-public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> implements CouponService {
-
-    @Override
-    public PageResult<Coupon> pageRel(CouponParam param) {
-        PageParam<Coupon, CouponParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Coupon> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Coupon> listRel(CouponParam param) {
-        List<Coupon> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Coupon, CouponParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Coupon getByIdRel(Integer couponId) {
-        CouponParam param = new CouponParam();
-        param.setCouponId(couponId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java
deleted file mode 100644
index 3b451df..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ExpressServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.ExpressMapper;
-import com.gxwebsoft.shop.service.ExpressService;
-import com.gxwebsoft.shop.entity.Express;
-import com.gxwebsoft.shop.param.ExpressParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import lombok.val;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 物流公司记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-22 00:21:07
- */
-@Service
-public class ExpressServiceImpl extends ServiceImpl<ExpressMapper, Express> implements ExpressService {
-
-    @Override
-    public PageResult<Express> pageRel(ExpressParam param) {
-        PageParam<Express, ExpressParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Express> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Express> listRel(ExpressParam param) {
-        List<Express> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Express, ExpressParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Express getByIdRel(Integer expressId) {
-      ExpressParam param = new ExpressParam();
-        param.setExpressId(expressId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java
deleted file mode 100644
index c7408e5..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Goods;
-import com.gxwebsoft.shop.mapper.GoodsMapper;
-import com.gxwebsoft.shop.param.GoodsParam;
-import com.gxwebsoft.shop.service.GoodsService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商品记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-23 12:47:16
- */
-@Service
-public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
-
-    @Override
-    public PageResult<Goods> pageRel(GoodsParam param) {
-        PageParam<Goods, GoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("gear asc,sort_number asc,create_time desc");
-        List<Goods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Goods> listRel(GoodsParam param) {
-        List<Goods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Goods, GoodsParam> page = new PageParam<>();
-        page.setDefaultOrder("gear asc,sort_number asc,create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Goods getByIdRel(Integer goodsId) {
-        GoodsParam param = new GoodsParam();
-        param.setGoodsId(goodsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java
deleted file mode 100644
index f0e33cf..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/GoodsServiceServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.GoodsServiceMapper;
-import com.gxwebsoft.shop.service.GoodsServiceService;
-import com.gxwebsoft.shop.entity.GoodsService;
-import com.gxwebsoft.shop.param.GoodsServiceParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商品服务与承诺记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-23 21:57:50
- */
-@Service
-public class GoodsServiceServiceImpl extends ServiceImpl<GoodsServiceMapper, GoodsService> implements GoodsServiceService {
-
-    @Override
-    public PageResult<GoodsService> pageRel(GoodsServiceParam param) {
-        PageParam<GoodsService, GoodsServiceParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<GoodsService> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<GoodsService> listRel(GoodsServiceParam param) {
-        List<GoodsService> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<GoodsService, GoodsServiceParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public GoodsService getByIdRel(Integer serviceId) {
-        GoodsServiceParam param = new GoodsServiceParam();
-        param.setServiceId(serviceId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java
deleted file mode 100644
index fa8d39b..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/MemberServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.system.entity.Role;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.mapper.MemberMapper;
-import com.gxwebsoft.shop.service.MemberService;
-import com.gxwebsoft.shop.entity.Member;
-import com.gxwebsoft.shop.param.MemberParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 商城会员Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 14:02:24
- */
-@Service
-public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
-
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<Member> pageRel(MemberParam param) {
-        PageParam<Member, MemberParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<Member> list = baseMapper.selectPageRel(page, param);
-        // 查询会员的关联信息
-        selectUser(list);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Member> listRel(MemberParam param) {
-        List<Member> list = baseMapper.selectListRel(param);
-        // 查询会员的关联信息
-        selectUser(list);
-        // 排序
-        PageParam<Member, MemberParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Member getByIdRel(Integer memberId) {
-        MemberParam param = new MemberParam();
-        param.setMemberId(memberId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-  /**
-   * 批量查询会员的关联信息
-   *
-   * @param members 会员集合
-   */
-  private void selectUser(List<Member> members) {
-    if (members != null && members.size() > 0) {
-      for (Member member : members) {
-        member.setUser(userService.getById(member.getUserId()));
-      }
-    }
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java
deleted file mode 100644
index 74208e3..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantClerkServiceImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.mapper.MerchantClerkMapper;
-import com.gxwebsoft.shop.service.MerchantClerkService;
-import com.gxwebsoft.shop.entity.MerchantClerk;
-import com.gxwebsoft.shop.param.MerchantClerkParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import lombok.val;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商家门店店员表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-30 16:32:25
- */
-@Service
-public class MerchantClerkServiceImpl extends ServiceImpl<MerchantClerkMapper, MerchantClerk> implements MerchantClerkService {
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<MerchantClerk> pageRel(MerchantClerkParam param) {
-        PageParam<MerchantClerk, MerchantClerkParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<MerchantClerk> list = baseMapper.selectPageRel(page, param);
-        // 查询会员的关联信息
-        selectUser(list);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<MerchantClerk> listRel(MerchantClerkParam param) {
-        List<MerchantClerk> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<MerchantClerk, MerchantClerkParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public MerchantClerk getByIdRel(Integer clerkId) {
-        MerchantClerkParam param = new MerchantClerkParam();
-        param.setClerkId(clerkId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public String getMerchantCodeByClerk(Integer loginUserId) {
-      MerchantClerk merchantClerk = query().eq("user_id", loginUserId).one();
-      if(merchantClerk != null){
-        return merchantClerk.getMerchantCode();
-      }
-      return null;
-    }
-
-    /**
-     * 批量查询会员的关联信息
-     *
-     * @param clerks 会员集合
-     */
-    private void selectUser(List<MerchantClerk> clerks) {
-      if (clerks != null && clerks.size() > 0) {
-        for (MerchantClerk clerk : clerks) {
-          clerk.setUser(userService.getById(clerk.getUserId()));
-        }
-      }
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java
deleted file mode 100644
index ea35961..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantServiceImpl.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Merchant;
-import com.gxwebsoft.shop.mapper.MerchantMapper;
-import com.gxwebsoft.shop.param.MerchantParam;
-import com.gxwebsoft.shop.service.MerchantService;
-import org.springframework.data.geo.*;
-import org.springframework.data.redis.connection.RedisGeoCommands;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.RedisConstants.MERCHANT_GEO_KEY;
-
-/**
- * 商户管理Service实现
- *
- * @author 科技小王子
- * @since 2022-11-30 15:10:54
- */
-@Service
-public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> implements MerchantService {
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
-  private CacheClient cacheClient;
-
-  @Override
-  public PageResult<Merchant> pageRel(MerchantParam param) {
-    PageParam<Merchant, MerchantParam> page = new PageParam<>(param);
-    page.setDefaultOrder("create_time desc");
-    List<Merchant> list = baseMapper.selectPageRel(page, param);
-    return new PageResult<>(list, page.getTotal());
-  }
-
-  @Override
-  public List<Merchant> listRel(MerchantParam param) {
-    List<Merchant> list = baseMapper.selectListRel(param);
-    // 排序
-    PageParam<Merchant, MerchantParam> page = new PageParam<>();
-    page.setDefaultOrder("create_time desc");
-    return page.sortRecords(list);
-  }
-
-  @Override
-  public Merchant getByIdRel(Integer merchantId) {
-    MerchantParam param = new MerchantParam();
-    param.setMerchantId(merchantId);
-    return param.getOne(baseMapper.selectListRel(param));
-  }
-
-  @Override
-  public String getMerchantCodeByOwner(Integer merchantOwner) {
-    Merchant merchant = query().eq("merchant_owner", merchantOwner).one();
-    if (merchant == null) {
-      return null;
-    }
-    return merchant.getMerchantCode();
-  }
-
-  @Override
-  public Merchant getMerchantByCode(String merchantCode) {
-    return query().eq("merchant_code", merchantCode).one();
-  }
-
-  @Override
-  public List<Merchant> listByGeo(MerchantParam param) {
-    System.out.println("param = " + param);
-    // 1. 是否按距离排序
-    if (param.getLngAndLat() == null) {
-      // 无定位信息
-      return list();
-    }
-    // 2. 查询10公里内的10家店铺
-    final String lngAndLat = param.getLngAndLat();
-    final String[] split = lngAndLat.split(",");
-    final Point point = new Point(Double.parseDouble(split[0]), Double.parseDouble(split[1]));
-    RedisGeoCommands.GeoRadiusCommandArgs geoRadiusCommandArgs = RedisGeoCommands.GeoRadiusCommandArgs.newGeoRadiusArgs();
-//      final Distance distance1 = new Distance(5, Metrics.KILOMETERS);
-    GeoResults<RedisGeoCommands.GeoLocation<String>> results = stringRedisTemplate.opsForGeo().radius(MERCHANT_GEO_KEY, new Circle(point, 10000), geoRadiusCommandArgs.includeDistance().limit(10));
-
-    assert results != null;
-    final List<GeoResult<RedisGeoCommands.GeoLocation<String>>> list = results.getContent();
-    if (list.size() == 0) {
-      return null;
-    }
-    List<String> ids = new ArrayList<>(list.size());
-    Map<String, Distance> distanceMap = new HashMap<>(list.size());
-    list.forEach(d -> {
-      // 获取店铺ID
-      String merchantId = d.getContent().getName();
-      ids.add(merchantId);
-      // 获取距离
-      Distance distance = d.getDistance();
-//        System.out.println("distance = " + distance);
-      distanceMap.put(merchantId, distance);
-    });
-//      System.out.println("ids = " + ids);
-//      System.out.println("distanceMap = " + distanceMap);
-    final List<Merchant> merchants = query().in("merchant_id", ids).last("ORDER BY FIELD(merchant_id," + StrUtil.join(",", ids) + ")").list();
-    for (Merchant shop : merchants) {
-      shop.setDistance(distanceMap.get(StrUtil.toString(shop.getMerchantId())).getValue());
-    }
-//      System.out.println("merchants = " + merchants);
-    // 定时更新geo商户点位信息
-//    this.saveGeoPointToRedis();
-    return merchants;
-  }
-
-  /**
-   * 更新所有商户点位信息
-   */
-  @Override
-  public void saveGeoPointToRedis() {
-    // 1.查询所有商户
-    final List<Merchant> list = list();
-    // 2.然后按品牌分组，把品牌id一致的放到一个集合
-    final Map<Integer, List<Merchant>> map = list.stream().collect(Collectors.groupingBy(Merchant::getMerchantId));
-    // 3.分批完成写入Redis
-    for (Map.Entry<Integer, List<Merchant>> entry : map.entrySet()) {
-      // 3.1 获取商户的集合
-      List<Merchant> value = entry.getValue();
-      List<RedisGeoCommands.GeoLocation<String>> locatioins = new ArrayList<>(value.size());
-      // 3.2 写入redis GEOADD key 经度 维度 member
-      for (Merchant merchant : value) {
-        String lngAndLat = merchant.getLngAndLat();
-        final String[] split = lngAndLat.split(",");
-        locatioins.add(new RedisGeoCommands.GeoLocation<>(merchant.getMerchantId().toString(), new Point(Double.parseDouble(split[0]), Double.parseDouble(split[1]))));
-      }
-//        System.out.println("locatioins = " + locatioins);
-      stringRedisTemplate.opsForGeo().add(MERCHANT_GEO_KEY, locatioins);
-    }
-  }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java
deleted file mode 100644
index 41b08c6..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/MerchantWithdrawServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.MerchantWithdrawMapper;
-import com.gxwebsoft.shop.service.MerchantWithdrawService;
-import com.gxwebsoft.shop.entity.MerchantWithdraw;
-import com.gxwebsoft.shop.param.MerchantWithdrawParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商户提现记录Service实现
- *
- * @author 科技小王子
- * @since 2022-12-02 00:41:09
- */
-@Service
-public class MerchantWithdrawServiceImpl extends ServiceImpl<MerchantWithdrawMapper, MerchantWithdraw> implements MerchantWithdrawService {
-
-    @Override
-    public PageResult<MerchantWithdraw> pageRel(MerchantWithdrawParam param) {
-        PageParam<MerchantWithdraw, MerchantWithdrawParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<MerchantWithdraw> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<MerchantWithdraw> listRel(MerchantWithdrawParam param) {
-        List<MerchantWithdraw> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<MerchantWithdraw, MerchantWithdrawParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public MerchantWithdraw getByIdRel(Integer id) {
-        MerchantWithdrawParam param = new MerchantWithdrawParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java
deleted file mode 100644
index 438897e..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderAddressServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.OrderAddressMapper;
-import com.gxwebsoft.shop.service.OrderAddressService;
-import com.gxwebsoft.shop.entity.OrderAddress;
-import com.gxwebsoft.shop.param.OrderAddressParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 订单收货地址记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-12-02 21:21:10
- */
-@Service
-public class OrderAddressServiceImpl extends ServiceImpl<OrderAddressMapper, OrderAddress> implements OrderAddressService {
-
-    @Override
-    public PageResult<OrderAddress> pageRel(OrderAddressParam param) {
-        PageParam<OrderAddress, OrderAddressParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<OrderAddress> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<OrderAddress> listRel(OrderAddressParam param) {
-        List<OrderAddress> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<OrderAddress, OrderAddressParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public OrderAddress getByIdRel(Integer orderAddressId) {
-        OrderAddressParam param = new OrderAddressParam();
-        param.setOrderAddressId(orderAddressId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java
deleted file mode 100644
index 6b555de..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderGoodsServiceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.OrderGoodsMapper;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.param.OrderGoodsParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 订单商品记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-12-09 17:15:31
- */
-@Service
-public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGoods> implements OrderGoodsService {
-
-    @Override
-    public List<OrderGoods> listByOrderIds(List<Integer> orderIds) {
-      return baseMapper.selectByOrderIds(orderIds);
-    }
-
-    @Override
-    public PageResult<OrderGoods> pageRel(OrderGoodsParam param) {
-        PageParam<OrderGoods, OrderGoodsParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<OrderGoods> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<OrderGoods> listRel(OrderGoodsParam param) {
-        List<OrderGoods> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<OrderGoods, OrderGoodsParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public OrderGoods getByIdRel(Integer orderGoodsId) {
-        OrderGoodsParam param = new OrderGoodsParam();
-        param.setOrderGoodsId(orderGoodsId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public int countBySettled(OrderGoodsParam param) {
-        return baseMapper.selectCountBySettled(param);
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java
deleted file mode 100644
index 28b2455..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundAddressServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.OrderRefundAddressMapper;
-import com.gxwebsoft.shop.service.OrderRefundAddressService;
-import com.gxwebsoft.shop.entity.OrderRefundAddress;
-import com.gxwebsoft.shop.param.OrderRefundAddressParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 售后单退货地址记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Service
-public class OrderRefundAddressServiceImpl extends ServiceImpl<OrderRefundAddressMapper, OrderRefundAddress> implements OrderRefundAddressService {
-
-    @Override
-    public PageResult<OrderRefundAddress> pageRel(OrderRefundAddressParam param) {
-        PageParam<OrderRefundAddress, OrderRefundAddressParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<OrderRefundAddress> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<OrderRefundAddress> listRel(OrderRefundAddressParam param) {
-        List<OrderRefundAddress> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<OrderRefundAddress, OrderRefundAddressParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public OrderRefundAddress getByIdRel(Integer id) {
-        OrderRefundAddressParam param = new OrderRefundAddressParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java
deleted file mode 100644
index 8ea3545..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRefundServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.OrderRefundMapper;
-import com.gxwebsoft.shop.service.OrderRefundService;
-import com.gxwebsoft.shop.entity.OrderRefund;
-import com.gxwebsoft.shop.param.OrderRefundParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 售后单记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-05-18 13:09:51
- */
-@Service
-public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, OrderRefund> implements OrderRefundService {
-
-    @Override
-    public PageResult<OrderRefund> pageRel(OrderRefundParam param) {
-        PageParam<OrderRefund, OrderRefundParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<OrderRefund> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<OrderRefund> listRel(OrderRefundParam param) {
-        List<OrderRefund> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<OrderRefund, OrderRefundParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public OrderRefund getByIdRel(Integer orderRefundId) {
-        OrderRefundParam param = new OrderRefundParam();
-        param.setOrderRefundId(orderRefundId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java
deleted file mode 100644
index 7aaa9ec..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderRenewServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.OrderRenewMapper;
-import com.gxwebsoft.shop.service.OrderRenewService;
-import com.gxwebsoft.shop.entity.OrderRenew;
-import com.gxwebsoft.shop.param.OrderRenewParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 续费订单记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-13 10:34:35
- */
-@Service
-public class OrderRenewServiceImpl extends ServiceImpl<OrderRenewMapper, OrderRenew> implements OrderRenewService {
-
-    @Override
-    public PageResult<OrderRenew> pageRel(OrderRenewParam param) {
-        PageParam<OrderRenew, OrderRenewParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<OrderRenew> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<OrderRenew> listRel(OrderRenewParam param) {
-        List<OrderRenew> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<OrderRenew, OrderRenewParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public OrderRenew getByIdRel(Integer orderRenewId) {
-        OrderRenewParam param = new OrderRenewParam();
-        param.setOrderRenewId(orderRenewId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java
deleted file mode 100644
index d3f7826..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderServiceImpl.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.apps.service.EquipmentGoodsService;
-import com.gxwebsoft.apps.service.EquipmentService;
-import com.gxwebsoft.common.core.utils.CacheClient;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.entity.OrderGoods;
-import com.gxwebsoft.shop.mapper.OrderMapper;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.gxwebsoft.common.core.constants.OrderConstants.*;
-
-/**
- * 订单记录表Service实现
- *
- * @author WebSoft
- * @since 2022-11-16 11:25:58
- */
-@Service
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
-  @Resource
-  private EquipmentService equipmentService;
-  @Resource
-  private EquipmentGoodsService equipmentGoodsService;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private OrderGoodsService orderGoodsService;
-  @Resource
-  private CacheClient cacheClient;
-
-  @Override
-  public PageResult<Order> pageRel(OrderParam param) {
-    PageParam<Order, OrderParam> page = new PageParam<>(param);
-    page.setDefaultOrder("delivery_time desc,create_time desc");
-    List<Order> list = baseMapper.selectPageRel(page, param);
-    // 是否查询订单商品
-    if(param.getShowGoodsList() != null){
-      list.forEach(d -> {
-        final List<OrderGoods> goodsList = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, d.getOrderId()).gt(OrderGoods::getTotalNum, 0));
-        goodsList.forEach(g -> {
-          // 比较时间前后判断是否允许取消报餐
-          SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-          Date newDate = DateUtil.offset(d.getDeliveryTime(), DateField.HOUR, -3);
-          try {
-            Date date1 = df.parse(newDate.toString());
-            Date date2 = df.parse(DateUtil.now());
-            g.setIsCancel(date1.after(date2));
-            final boolean before = date1.after(date2);
-            System.out.println("是否允许取消报餐 = " + before);
-          } catch (ParseException e) {
-            e.printStackTrace();
-          }
-        });
-        d.setGoodsList(goodsList);
-      });
-    }
-    return new PageResult<>(list, page.getTotal());
-  }
-
-  @Override
-  public List<Order> listRel(OrderParam param) {
-    List<Order> list = baseMapper.selectListRel(param);
-    // 排序
-    PageParam<Order, OrderParam> page = new PageParam<>();
-    page.setDefaultOrder("create_time desc");
-    return page.sortRecords(list);
-  }
-
-  @Override
-  public Order getByIdRel(Integer orderId) {
-    OrderParam param = new OrderParam();
-    param.setOrderId(orderId);
-    return param.getOne(baseMapper.selectListRel(param));
-  }
-
-  @Override
-  public Order getByOutTradeNo(String outTradeNo) {
-    OrderParam param = new OrderParam();
-    param.setOrderNo(outTradeNo);
-    return param.getOne(baseMapper.getOne(param));
-  }
-
-  /**
-   * 支付成功后处理的业务(通联支付)
-   */
-  @Override
-  public boolean allinPay(Map<String, String> params) {
-    cacheClient.set(":payInfo", params.toString());
-    final String outTradeNo = params.get("merchantOrderNo");
-    final String trxamt = params.get("trxamt");
-    final String merchantNo = params.get("merchantNo");
-    final String chnltrxid = params.get("chnltrxid");
-    final String payTime = params.get("payTime");
-    final String fee = params.get("fee");
-    final String trxStatus = params.get("trxstatus");
-
-    // 1.是否为商城订单
-    Order order = orderService.getByOutTradeNo(outTradeNo);
-    if (order == null) {
-      return false;
-    }
-
-    // 2.订单金额是否一致
-    final BigDecimal payPrice = new BigDecimal(trxamt).divide(new BigDecimal(100));
-
-    // 3.订单商户是否一致
-//    if (!merchantNo.equals(order.getMerchantCode())) {
-//      return false;
-//    }
-
-    // 4.验证appId是否一致
-//    String appId = params.get("app_id");
-//    System.out.println("验证appId是否一致"+appId);
-//    String appIdPro = "2021003156628508";
-//    if (!appId.equals(appIdPro)) {
-//      System.out.println("验证appId校验失败");
-//      return false;
-//    }
-    // 5.判断交易状态
-    if (!"2".equals(trxStatus)) {
-      return false;
-    }
-    // 6.修改订单状态
-    OrderParam orderParam = new OrderParam();
-    orderParam.setOrderNo(outTradeNo);
-    orderParam.setPayStatus(PAY_STATUS_SUCCESS);
-    orderParam.setPayPrice(payPrice);
-    //
-    return baseMapper.updatePayStatus(orderParam);
-  }
-
-  @Override
-  public void removeOrderByTimeOut() {
-    final Integer pay_status = query().eq("order_no", "2023121205993791").count();
-    System.out.println("处理过期订单 = " + pay_status);
-  }
-
-  @Override
-  public boolean updateByIdRel(Order order) {
-    return baseMapper.updateByIdRel(order);
-  }
-
-    @Override
-    public PageResult<Order> selectPageSettled(OrderParam param) {
-      PageParam<Order, OrderParam> page = new PageParam<>(param);
-      //page.setDefaultOrder("create_time desc");
-      List<Order> list = baseMapper.selectPageSettled(page, param);
-      return new PageResult<>(list, page.getTotal());
-    }
-
-  @Override
-  public void updateByIdSettled(Order order) {
-    baseMapper.updateByIdSettled(order);
-  }
-
-
-  /**
-   * 支付成功后处理的业务
-   */
-  @Transactional(rollbackFor = {Exception.class})
-  @Override
-  public void paySuccess(AlipayTradeQueryResponse params) {
-    System.out.println("支付成功后处理的业务");
-    String outTradeNo = params.getOutTradeNo();
-    String totalAmount = params.getTotalAmount();
-    String receiptAmount = params.getReceiptAmount();
-    // 1.是否为商城订单
-    Order order = orderService.getByOutTradeNo(outTradeNo);
-    if (order == null) {
-      System.out.println("订单不存在！");
-      return;
-    }
-    // 2.订单金额是否一致
-    // 3.订单商户是否一致
-    // 4.验证appId是否一致
-    // 5.判断交易状态
-    String tradeStatus = params.getTradeStatus();
-    if (!"TRADE_SUCCESS".equals(tradeStatus)) {
-      System.out.println("支付未成功");
-      return;
-    }
-
-    // 6.修改订单状态
-    order.setPayStatus(PAY_STATUS_SUCCESS);
-    order.setPayMethod(PAY_METHOD_ALIPAY);
-    order.setReceiptAmount(new BigDecimal(receiptAmount));
-    order.setPayTime(DateUtil.date());
-    order.setExpirationTime(DateUtil.nextMonth());
-    orderService.updateById(order);
-
-    // 6. 续租订单
-    if (order.getRentOrderId() > 0) {
-      // 主订单
-      Order parentOrder = orderService.getById(order.getRentOrderId());
-      // 更新过期时间延长一个月
-      Date expirationTime = parentOrder.getExpirationTime();
-      DateTime nextMonthTime = DateUtil.offsetMonth(expirationTime, 1);
-      parentOrder.setExpirationTime(nextMonthTime);
-      orderService.updateById(parentOrder);
-      // 保存续费订单状态
-      order.setDeliveryStatus(DELIVERY_STATUS_YES);
-      order.setReceiptStatus(RECEIPT_STATUS_YES);
-      order.setOrderStatus(ORDER_STATUS_COMPLETED);
-      order.setStartTime(expirationTime);
-      order.setExpirationTime(nextMonthTime);
-      orderService.updateById(order);
-    }
-  }
-
-  /**
-   * 批量查询订单的关联商品
-   *
-   * @param orders 商品集合
-   */
-  private void selectOrderGoods(List<Order> orders) {
-    if (orders != null && orders.size() > 0) {
-      List<Integer> orderIds = orders.stream().map(Order::getOrderId).collect(Collectors.toList());
-      List<OrderGoods> orderGoods = orderGoodsService.listByOrderIds(orderIds);
-      for (Order order : orders) {
-        List<OrderGoods> goodsList = orderGoods.stream().filter(d -> order.getOrderId().equals(d.getOrderId()))
-          .collect(Collectors.toList());
-        order.setGoodsList(goodsList);
-      }
-    }
-  }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java
deleted file mode 100644
index 9fee559..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayClient;
-import com.alipay.api.request.AlipaySystemOauthTokenRequest;
-import com.alipay.api.response.AlipaySystemOauthTokenResponse;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.system.param.UserParam;
-import com.gxwebsoft.shop.mapper.PaymentMapper;
-import com.gxwebsoft.shop.service.PaymentService;
-import com.gxwebsoft.shop.entity.Payment;
-import com.gxwebsoft.shop.param.PaymentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 商城支付方式记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-12-15 19:11:07
- */
-@Service
-public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, Payment> implements PaymentService {
-
-    @Override
-    public PageResult<Payment> pageRel(PaymentParam param) {
-        PageParam<Payment, PaymentParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<Payment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<Payment> listRel(PaymentParam param) {
-        List<Payment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<Payment, PaymentParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public Payment getByIdRel(Integer paymentId) {
-        PaymentParam param = new PaymentParam();
-        param.setPaymentId(paymentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public Payment getPaymentByMethod(String method){
-      System.out.println(method+".......");
-      PaymentParam param = new PaymentParam();
-      param.setMethod(method);
-      param.setTenantId(6);
-      System.out.println(param);
-//      System.out.println(param.getOne(baseMapper.selectListRel(param)));
-      return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java
deleted file mode 100644
index 4650ff2..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTemplateServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.PaymentTemplateMapper;
-import com.gxwebsoft.shop.service.PaymentTemplateService;
-import com.gxwebsoft.shop.entity.PaymentTemplate;
-import com.gxwebsoft.shop.param.PaymentTemplateParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商城支付模板记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Service
-public class PaymentTemplateServiceImpl extends ServiceImpl<PaymentTemplateMapper, PaymentTemplate> implements PaymentTemplateService {
-
-    @Override
-    public PageResult<PaymentTemplate> pageRel(PaymentTemplateParam param) {
-        PageParam<PaymentTemplate, PaymentTemplateParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<PaymentTemplate> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<PaymentTemplate> listRel(PaymentTemplateParam param) {
-        List<PaymentTemplate> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<PaymentTemplate, PaymentTemplateParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public PaymentTemplate getByIdRel(Integer templateId) {
-        PaymentTemplateParam param = new PaymentTemplateParam();
-        param.setTemplateId(templateId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java
deleted file mode 100644
index 7c64f9c..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/PaymentTradeServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.PaymentTradeMapper;
-import com.gxwebsoft.shop.service.PaymentTradeService;
-import com.gxwebsoft.shop.entity.PaymentTrade;
-import com.gxwebsoft.shop.param.PaymentTradeParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 第三方支付交易记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-12-09 13:59:38
- */
-@Service
-public class PaymentTradeServiceImpl extends ServiceImpl<PaymentTradeMapper, PaymentTrade> implements PaymentTradeService {
-
-    @Override
-    public PageResult<PaymentTrade> pageRel(PaymentTradeParam param) {
-        PageParam<PaymentTrade, PaymentTradeParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<PaymentTrade> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<PaymentTrade> listRel(PaymentTradeParam param) {
-        List<PaymentTrade> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<PaymentTrade, PaymentTradeParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public PaymentTrade getByIdRel(Integer tradeId) {
-        PaymentTradeParam param = new PaymentTradeParam();
-        param.setTradeId(tradeId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java
deleted file mode 100644
index ad20509..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderPlanServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.RechargeOrderPlanMapper;
-import com.gxwebsoft.shop.service.RechargeOrderPlanService;
-import com.gxwebsoft.shop.entity.RechargeOrderPlan;
-import com.gxwebsoft.shop.param.RechargeOrderPlanParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员充值订单套餐快照表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Service
-public class RechargeOrderPlanServiceImpl extends ServiceImpl<RechargeOrderPlanMapper, RechargeOrderPlan> implements RechargeOrderPlanService {
-
-    @Override
-    public PageResult<RechargeOrderPlan> pageRel(RechargeOrderPlanParam param) {
-        PageParam<RechargeOrderPlan, RechargeOrderPlanParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<RechargeOrderPlan> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<RechargeOrderPlan> listRel(RechargeOrderPlanParam param) {
-        List<RechargeOrderPlan> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<RechargeOrderPlan, RechargeOrderPlanParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public RechargeOrderPlan getByIdRel(Integer orderPlanId) {
-        RechargeOrderPlanParam param = new RechargeOrderPlanParam();
-        param.setOrderPlanId(orderPlanId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java
deleted file mode 100644
index 4893379..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/RechargeOrderServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.mapper.RechargeOrderMapper;
-import com.gxwebsoft.shop.service.RechargeOrderService;
-import com.gxwebsoft.shop.entity.RechargeOrder;
-import com.gxwebsoft.shop.param.RechargeOrderParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 会员充值订单表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Service
-public class RechargeOrderServiceImpl extends ServiceImpl<RechargeOrderMapper, RechargeOrder> implements RechargeOrderService {
-    @Resource
-    private UserService userService;
-
-    @Override
-    public PageResult<RechargeOrder> pageRel(RechargeOrderParam param) {
-        PageParam<RechargeOrder, RechargeOrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<RechargeOrder> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<RechargeOrder> listRel(RechargeOrderParam param) {
-        List<RechargeOrder> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<RechargeOrder, RechargeOrderParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public RechargeOrder getByIdRel(Integer orderId) {
-        RechargeOrderParam param = new RechargeOrderParam();
-        param.setOrderId(orderId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java
deleted file mode 100644
index 261d76a..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/RechargePlanServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.RechargePlanMapper;
-import com.gxwebsoft.shop.service.RechargePlanService;
-import com.gxwebsoft.shop.entity.RechargePlan;
-import com.gxwebsoft.shop.param.RechargePlanParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 会员充值套餐表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-20 20:36:24
- */
-@Service
-public class RechargePlanServiceImpl extends ServiceImpl<RechargePlanMapper, RechargePlan> implements RechargePlanService {
-
-    @Override
-    public PageResult<RechargePlan> pageRel(RechargePlanParam param) {
-        PageParam<RechargePlan, RechargePlanParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<RechargePlan> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<RechargePlan> listRel(RechargePlanParam param) {
-        List<RechargePlan> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<RechargePlan, RechargePlanParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public RechargePlan getByIdRel(Integer planId) {
-        RechargePlanParam param = new RechargePlanParam();
-        param.setPlanId(planId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java
deleted file mode 100644
index 0f870d0..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/TestServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.mapper.OrderMapper;
-import com.gxwebsoft.shop.service.TestService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TestServiceImpl extends ServiceImpl<OrderMapper, Order> implements TestService {
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java
deleted file mode 100644
index ab187ca..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserAddressServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserAddressMapper;
-import com.gxwebsoft.shop.service.UserAddressService;
-import com.gxwebsoft.shop.entity.UserAddress;
-import com.gxwebsoft.shop.param.UserAddressParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户收货地址表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Service
-public class UserAddressServiceImpl extends ServiceImpl<UserAddressMapper, UserAddress> implements UserAddressService {
-
-    @Override
-    public PageResult<UserAddress> pageRel(UserAddressParam param) {
-        PageParam<UserAddress, UserAddressParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserAddress> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserAddress> listRel(UserAddressParam param) {
-        List<UserAddress> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserAddress, UserAddressParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserAddress getByIdRel(Integer addressId) {
-        UserAddressParam param = new UserAddressParam();
-        param.setAddressId(addressId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java
deleted file mode 100644
index ed533ce..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserBalanceLogServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserBalanceLogMapper;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
-import com.gxwebsoft.shop.entity.UserBalanceLog;
-import com.gxwebsoft.shop.param.UserBalanceLogParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户余额变动明细表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-21 15:59:09
- */
-@Service
-public class UserBalanceLogServiceImpl extends ServiceImpl<UserBalanceLogMapper, UserBalanceLog> implements UserBalanceLogService {
-
-    @Override
-    public PageResult<UserBalanceLog> pageRel(UserBalanceLogParam param) {
-        PageParam<UserBalanceLog, UserBalanceLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserBalanceLog> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserBalanceLog> listRel(UserBalanceLogParam param) {
-        List<UserBalanceLog> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserBalanceLog, UserBalanceLogParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserBalanceLog getByIdRel(Integer logId) {
-        UserBalanceLogParam param = new UserBalanceLogParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java
deleted file mode 100644
index 8fe11cb..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserCommentServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserComment;
-import com.gxwebsoft.shop.entity.UserLike;
-import com.gxwebsoft.shop.mapper.UserCommentMapper;
-import com.gxwebsoft.shop.param.UserCommentParam;
-import com.gxwebsoft.shop.service.UserCommentService;
-import com.gxwebsoft.shop.service.UserLikeService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 用户评价记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-07-06 13:55:16
- */
-@Service
-public class UserCommentServiceImpl extends ServiceImpl<UserCommentMapper, UserComment> implements UserCommentService {
-    @Resource
-    private UserLikeService userLikeService;
-
-    @Override
-    public PageResult<UserComment> pageRel(UserCommentParam param) {
-        PageParam<UserComment, UserCommentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserComment> list = baseMapper.selectPageRel(page, param);
-        if (param.getLoginUserId() != null) {
-          // 我点赞的人
-          final List<UserLike> myLikes = userLikeService.list(new LambdaQueryWrapper<UserLike>().eq(UserLike::getUserId, param.getLoginUserId()));
-          System.out.println("myLikes = " + myLikes);
-          list.forEach(d -> {
-            final boolean isLike = myLikes.stream().anyMatch(f -> f.getToUserId().equals(param.getLoginUserId()));
-            d.setLikes(isLike);
-          });
-        }
-        // List转为树形结构
-      final List<UserComment> userComments = CommonUtil.toTreeData(list, 0, UserComment::getReplyCommentId, UserComment::getCommentId, UserComment::setChildren);
-      return new PageResult<>(userComments, page.getTotal());
-    }
-
-    @Override
-    public List<UserComment> listRel(UserCommentParam param) {
-        List<UserComment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserComment, UserCommentParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserComment getByIdRel(Integer commentId) {
-        UserCommentParam param = new UserCommentParam();
-        param.setCommentId(commentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java
deleted file mode 100644
index 3c4239a..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserCouponServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserCouponMapper;
-import com.gxwebsoft.shop.service.UserCouponService;
-import com.gxwebsoft.shop.entity.UserCoupon;
-import com.gxwebsoft.shop.param.UserCouponParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户优惠券记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Service
-public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCoupon> implements UserCouponService {
-
-    @Override
-    public PageResult<UserCoupon> pageRel(UserCouponParam param) {
-        PageParam<UserCoupon, UserCouponParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserCoupon> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserCoupon> listRel(UserCouponParam param) {
-        List<UserCoupon> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserCoupon, UserCouponParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserCoupon getByIdRel(Integer userCouponId) {
-        UserCouponParam param = new UserCouponParam();
-        param.setUserCouponId(userCouponId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java
deleted file mode 100644
index 238ba47..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserFeedbackServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserFeedbackMapper;
-import com.gxwebsoft.shop.service.UserFeedbackService;
-import com.gxwebsoft.shop.entity.UserFeedback;
-import com.gxwebsoft.shop.param.UserFeedbackParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 意见反馈记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-07-16 22:24:55
- */
-@Service
-public class UserFeedbackServiceImpl extends ServiceImpl<UserFeedbackMapper, UserFeedback> implements UserFeedbackService {
-
-    @Override
-    public PageResult<UserFeedback> pageRel(UserFeedbackParam param) {
-        PageParam<UserFeedback, UserFeedbackParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserFeedback> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserFeedback> listRel(UserFeedbackParam param) {
-        List<UserFeedback> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserFeedback, UserFeedbackParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserFeedback getByIdRel(Integer id) {
-        UserFeedbackParam param = new UserFeedbackParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java
deleted file mode 100644
index f4ea116..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserFollowServiceImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserFollow;
-import com.gxwebsoft.shop.mapper.UserFollowMapper;
-import com.gxwebsoft.shop.param.UserFollowParam;
-import com.gxwebsoft.shop.service.UserFollowService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 关注记录表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Service
-public class UserFollowServiceImpl extends ServiceImpl<UserFollowMapper, UserFollow> implements UserFollowService {
-    @Resource
-    UserFollowService userFollowService;
-
-    @Override
-    public PageResult<UserFollow> pageRel(UserFollowParam param) {
-        PageParam<UserFollow, UserFollowParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserFollow> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserFollow> listRel(UserFollowParam param) {
-        List<UserFollow> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserFollow, UserFollowParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        // 我关注的人
-        final List<UserFollow> follows = userFollowService.list(new LambdaQueryWrapper<UserFollow>().eq(UserFollow::getUserId, param.getLoginUserId()));
-        final Set<Integer> collect = follows.stream().map(UserFollow::getShopId).collect(Collectors.toSet());
-        System.out.println("collect = " + collect);
-        list.forEach(d -> {
-            d.setEachFollow(false);
-            for (Integer shopId : collect) {
-              if(Objects.equals(shopId, d.getUserId())){
-                d.setEachFollow(true);
-              }
-            }
-          });
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserFollow getByIdRel(Integer logId) {
-        UserFollowParam param = new UserFollowParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java
deleted file mode 100644
index bccb1cf..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeLogServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserGradeLogMapper;
-import com.gxwebsoft.shop.service.UserGradeLogService;
-import com.gxwebsoft.shop.entity.UserGradeLog;
-import com.gxwebsoft.shop.param.UserGradeLogParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户会员等级变更记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Service
-public class UserGradeLogServiceImpl extends ServiceImpl<UserGradeLogMapper, UserGradeLog> implements UserGradeLogService {
-
-    @Override
-    public PageResult<UserGradeLog> pageRel(UserGradeLogParam param) {
-        PageParam<UserGradeLog, UserGradeLogParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserGradeLog> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserGradeLog> listRel(UserGradeLogParam param) {
-        List<UserGradeLog> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserGradeLog, UserGradeLogParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserGradeLog getByIdRel(Integer logId) {
-        UserGradeLogParam param = new UserGradeLogParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java
deleted file mode 100644
index 9847414..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserGradeServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserGradeMapper;
-import com.gxwebsoft.shop.service.UserGradeService;
-import com.gxwebsoft.shop.entity.UserGrade;
-import com.gxwebsoft.shop.param.UserGradeParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户会员等级表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-20 16:33:06
- */
-@Service
-public class UserGradeServiceImpl extends ServiceImpl<UserGradeMapper, UserGrade> implements UserGradeService {
-
-    @Override
-    public PageResult<UserGrade> pageRel(UserGradeParam param) {
-        PageParam<UserGrade, UserGradeParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserGrade> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserGrade> listRel(UserGradeParam param) {
-        List<UserGrade> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserGrade, UserGradeParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserGrade getByIdRel(Integer gradeId) {
-        UserGradeParam param = new UserGradeParam();
-        param.setGradeId(gradeId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java
deleted file mode 100644
index 34622f6..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserLikeServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.shop.entity.UserLike;
-import com.gxwebsoft.shop.mapper.UserLikeMapper;
-import com.gxwebsoft.shop.param.UserLikeParam;
-import com.gxwebsoft.shop.service.UserLikeService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 点赞记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-07-06 17:51:04
- */
-@Service
-public class UserLikeServiceImpl extends ServiceImpl<UserLikeMapper, UserLike> implements UserLikeService {
-
-    @Override
-    public PageResult<UserLike> pageRel(UserLikeParam param) {
-        PageParam<UserLike, UserLikeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserLike> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserLike> listRel(UserLikeParam param) {
-        List<UserLike> list = baseMapper.selectListRel(param);
-
-        // 排序
-        PageParam<UserLike, UserLikeParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserLike getByIdRel(Integer logId) {
-        UserLikeParam param = new UserLikeParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java
deleted file mode 100644
index b67bb06..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserLookServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserLookMapper;
-import com.gxwebsoft.shop.service.UserLookService;
-import com.gxwebsoft.shop.entity.UserLook;
-import com.gxwebsoft.shop.param.UserLookParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 访客记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-07-13 23:10:38
- */
-@Service
-public class UserLookServiceImpl extends ServiceImpl<UserLookMapper, UserLook> implements UserLookService {
-
-    @Override
-    public PageResult<UserLook> pageRel(UserLookParam param) {
-        PageParam<UserLook, UserLookParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserLook> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserLook> listRel(UserLookParam param) {
-        List<UserLook> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserLook, UserLookParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserLook getByIdRel(Integer logId) {
-        UserLookParam param = new UserLookParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java
deleted file mode 100644
index e32cec3..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserOauthServiceImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.shop.entity.Order;
-import com.gxwebsoft.shop.mapper.UserOauthMapper;
-import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.UserOauthService;
-import com.gxwebsoft.shop.entity.UserOauth;
-import com.gxwebsoft.shop.param.UserOauthParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import lombok.val;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 第三方用户信息表Service实现
- *
- * @author 科技小王子
- * @since 2022-12-15 08:33:13
- */
-@Service
-public class UserOauthServiceImpl extends ServiceImpl<UserOauthMapper, UserOauth> implements UserOauthService {
-    @Resource
-    private UserService userService;
-    @Resource
-    private UserOauthService userOauthService;
-
-    @Override
-    public PageResult<UserOauth> pageRel(UserOauthParam param) {
-        PageParam<UserOauth, UserOauthParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserOauth> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserOauth> listRel(UserOauthParam param) {
-        List<UserOauth> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserOauth, UserOauthParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserOauth getByIdRel(Integer id) {
-        UserOauthParam param = new UserOauthParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-    @Override
-    public String getOauthIdByUserId(Integer userId, String platform) {
-      UserOauthParam param = new UserOauthParam();
-      param.setUserId(userId);
-      param.setOauthType(platform);
-      return param.getOne(baseMapper.selectListRel(param)).getOauthId();
-    }
-
-    @Override
-    public User getByOauthId(String openid) {
-      UserOauth userOauth = query().eq("oauth_id", openid).one();
-      if(userOauth == null){
-        return null;
-      }
-      // 查询用户
-      User user = userService.getById(userOauth.getUserId());
-      if(user == null){
-        // 如果用户不存在，则清理第三方信息
-        userOauth.setDeleted(1);
-        userOauthService.save(userOauth);
-      }
-      return user;
-    }
-
-    @Override
-    public UserOauth getByUnionId(UserOauthParam param) {
-      UserOauth userOauth = param.getOne(baseMapper.getOne(param));
-      System.out.println("userOauth0 = " + userOauth);
-      if(userOauth == null){
-        return null;
-      }
-      return userOauth;
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java
deleted file mode 100644
index 6186d05..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserPointsLogServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserPointsLogMapper;
-import com.gxwebsoft.shop.service.UserPointsLogService;
-import com.gxwebsoft.shop.entity.UserPointsLog;
-import com.gxwebsoft.shop.param.UserPointsLogParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户积分变动明细表Service实现
- *
- * @author 科技小王子
- * @since 2022-11-25 19:04:43
- */
-@Service
-public class UserPointsLogServiceImpl extends ServiceImpl<UserPointsLogMapper, UserPointsLog> implements UserPointsLogService {
-
-    @Override
-    public PageResult<UserPointsLog> pageRel(UserPointsLogParam param) {
-        PageParam<UserPointsLog, UserPointsLogParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<UserPointsLog> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserPointsLog> listRel(UserPointsLogParam param) {
-        List<UserPointsLog> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserPointsLog, UserPointsLogParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserPointsLog getByIdRel(Integer logId) {
-        UserPointsLogParam param = new UserPointsLogParam();
-        param.setLogId(logId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java
deleted file mode 100644
index 49cdcf3..0000000
--- a/src/main/java/com/gxwebsoft/shop/service/impl/UserRefereeServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.shop.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.UserRefereeMapper;
-import com.gxwebsoft.shop.service.UserRefereeService;
-import com.gxwebsoft.shop.entity.UserReferee;
-import com.gxwebsoft.shop.param.UserRefereeParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 用户推荐关系表Service实现
- *
- * @author 科技小王子
- * @since 2023-04-28 14:07:29
- */
-@Service
-public class UserRefereeServiceImpl extends ServiceImpl<UserRefereeMapper, UserReferee> implements UserRefereeService {
-
-    @Override
-    public PageResult<UserReferee> pageRel(UserRefereeParam param) {
-        PageParam<UserReferee, UserRefereeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<UserReferee> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<UserReferee> listRel(UserRefereeParam param) {
-        List<UserReferee> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<UserReferee, UserRefereeParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public UserReferee getByIdRel(Integer id) {
-        UserRefereeParam param = new UserRefereeParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java
deleted file mode 100644
index 8aa7b13..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerAccessoryController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerAccessoryService;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 配件管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Api(tags = "配件管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-accessory")
-public class TowerAccessoryController extends BaseController {
-    @Resource
-    private TowerAccessoryService towerAccessoryService;
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @ApiOperation("分页查询配件管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerAccessory>> page(TowerAccessoryParam param) {
-        // 使用关联查询
-        return success(towerAccessoryService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @ApiOperation("查询全部配件管理")
-    @GetMapping()
-    public ApiResult<List<TowerAccessory>> list(TowerAccessoryParam param) {
-        // 使用关联查询
-        return success(towerAccessoryService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:list')")
-    @ApiOperation("根据id查询配件管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerAccessory> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerAccessoryService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:save')")
-    @ApiOperation("添加配件管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerAccessory towerAccessory) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerAccessory.setUserId(loginUser.getUserId());
-        }
-        if (towerAccessoryService.save(towerAccessory)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:update')")
-    @ApiOperation("修改配件管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerAccessory towerAccessory) {
-        if (towerAccessoryService.updateById(towerAccessory)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:remove')")
-    @ApiOperation("删除配件管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerAccessoryService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:save')")
-    @ApiOperation("批量添加配件管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerAccessory> list) {
-        if (towerAccessoryService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:update')")
-    @ApiOperation("批量修改配件管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerAccessory> batchParam) {
-        if (batchParam.update(towerAccessoryService, "accessory_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerAccessory:remove')")
-    @ApiOperation("批量删除配件管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerAccessoryService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java
deleted file mode 100644
index 998f30e..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerEquipmentController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import com.gxwebsoft.tower.service.TowerEquipmentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 塔吊设备管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Api(tags = "塔吊设备管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-equipment")
-public class TowerEquipmentController extends BaseController {
-    @Resource
-    private TowerEquipmentService towerEquipmentService;
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @ApiOperation("分页查询塔吊设备管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerEquipment>> page(TowerEquipmentParam param) {
-        // 使用关联查询
-        return success(towerEquipmentService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @ApiOperation("查询全部塔吊设备管理")
-    @GetMapping()
-    public ApiResult<List<TowerEquipment>> list(TowerEquipmentParam param) {
-        // 使用关联查询
-        return success(towerEquipmentService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:list')")
-    @ApiOperation("根据id查询塔吊设备管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerEquipment> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerEquipmentService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:save')")
-    @ApiOperation("添加塔吊设备管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerEquipment towerEquipment) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerEquipment.setUserId(loginUser.getUserId());
-        }
-        if (towerEquipmentService.save(towerEquipment)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @ApiOperation("修改塔吊设备管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerEquipment towerEquipment) {
-        if (towerEquipmentService.updateById(towerEquipment)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:remove')")
-    @ApiOperation("删除塔吊设备管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerEquipmentService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:save')")
-    @ApiOperation("批量添加塔吊设备管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerEquipment> list) {
-        if (towerEquipmentService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @ApiOperation("批量修改塔吊设备管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerEquipment> batchParam) {
-        if (batchParam.update(towerEquipmentService, "equipment_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:remove')")
-    @ApiOperation("批量删除塔吊设备管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerEquipmentService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerEquipment:update')")
-    @ApiOperation("批量修改塔吊设备状态")
-    @PutMapping("/status")
-    public ApiResult<?> statusBatch(@RequestBody List<TowerEquipment> batchParam) {
-      if (towerEquipmentService.updateBatchById(batchParam)) {
-        return success("修改成功");
-      }
-      return fail("修改失败");
-    }
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java
deleted file mode 100644
index 2941ee0..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-import com.gxwebsoft.tower.service.TowerModelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 设备型号管理表控制器
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Api(tags = "设备型号管理表管理")
-@RestController
-@RequestMapping("/api/tower/tower-model")
-public class TowerModelController extends BaseController {
-    @Resource
-    private TowerModelService towerModelService;
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @ApiOperation("分页查询设备型号管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerModel>> page(TowerModelParam param) {
-        // 使用关联查询
-        return success(towerModelService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @ApiOperation("查询全部设备型号管理表")
-    @GetMapping()
-    public ApiResult<List<TowerModel>> list(TowerModelParam param) {
-        // 使用关联查询
-        return success(towerModelService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:list')")
-    @ApiOperation("根据id查询设备型号管理表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerModel> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerModelService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:save')")
-    @ApiOperation("添加设备型号管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerModel towerModel) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerModel.setUserId(loginUser.getUserId());
-        }
-        if (towerModelService.save(towerModel)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:update')")
-    @ApiOperation("修改设备型号管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerModel towerModel) {
-        if (towerModelService.updateById(towerModel)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:remove')")
-    @ApiOperation("删除设备型号管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerModelService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:save')")
-    @ApiOperation("批量添加设备型号管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerModel> list) {
-        if (towerModelService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:update')")
-    @ApiOperation("批量修改设备型号管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerModel> batchParam) {
-        if (batchParam.update(towerModelService, "category_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerModel:remove')")
-    @ApiOperation("批量删除设备型号管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerModelService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java
deleted file mode 100644
index 70d4bcf..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-import com.gxwebsoft.tower.service.TowerPlaceService;
-import com.gxwebsoft.tower.service.TowerPlaceStandardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 检查/保养部位记录表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Api(tags = "检查/保养部位记录表管理")
-@RestController
-@RequestMapping("/api/tower/tower-place")
-public class TowerPlaceController extends BaseController {
-    @Resource
-    private TowerPlaceService towerPlaceService;
-    @Resource
-    private TowerPlaceStandardService towerPlaceStandardService;
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:list')")
-    @ApiOperation("分页查询检查/保养部位记录表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPlace>> page(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceService.page(page, page.getWrapper()));
-        // 使用关联查询
-//        return success(towerPlaceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:list')")
-    @ApiOperation("查询全部检查/保养部位记录表")
-    @GetMapping()
-    public ApiResult<List<TowerPlace>> list(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:list')")
-    @ApiOperation("根据id查询检查/保养部位记录表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPlace> get(@PathVariable("id") Integer id) {
-        return success(towerPlaceService.getById(id));
-        // 使用关联查询
-        //return success(towerPlaceService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:save')")
-    @ApiOperation("添加检查/保养部位记录表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPlace towerPlace) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPlace.setUserId(loginUser.getUserId());
-        }
-        if (towerPlaceService.save(towerPlace)) {
-            // 保存检查标准
-            if (!towerPlace.getStandard().isEmpty()) {
-              final List<TowerPlaceStandard> standards = towerPlace.getStandard();
-              standards.forEach(d->{
-                d.setPlaceId(towerPlace.getPlaceId());
-              });
-              towerPlaceStandardService.saveBatch(standards);
-            }
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:update')")
-    @ApiOperation("修改检查/保养部位记录表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPlace towerPlace) {
-        if (towerPlaceService.updateById(towerPlace)) {
-            // 更新检查标准
-            if (!towerPlace.getStandard().isEmpty()) {
-              final List<TowerPlaceStandard> standards = towerPlace.getStandard();
-              towerPlaceStandardService.saveOrUpdateBatch(standards);
-            }
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:remove')")
-    @ApiOperation("删除检查/保养部位记录表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPlaceService.removeById(id)) {
-            towerPlaceStandardService.remove(new LambdaQueryWrapper<TowerPlaceStandard>().eq(TowerPlaceStandard::getPlaceId,id));
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:save')")
-    @ApiOperation("批量添加检查/保养部位记录表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlace> list) {
-        if (towerPlaceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:update')")
-    @ApiOperation("批量修改检查/保养部位记录表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlace> batchParam) {
-        if (batchParam.update(towerPlaceService, "place_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlace:remove')")
-    @ApiOperation("批量删除检查/保养部位记录表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceService.removeByIds(ids)) {
-            for (Integer id: ids){
-              towerPlaceStandardService.remove(new LambdaQueryWrapper<TowerPlaceStandard>().eq(TowerPlaceStandard::getPlaceId,id));
-            }
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java
deleted file mode 100644
index e080853..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceSafetyController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-import com.gxwebsoft.tower.service.TowerPlaceSafetyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 安全巡检部位管理表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Api(tags = "安全巡检部位管理表管理")
-@RestController
-@RequestMapping("/api/tower/tower-place-safety")
-public class TowerPlaceSafetyController extends BaseController {
-    @Resource
-    private TowerPlaceSafetyService towerPlaceSafetyService;
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')")
-    @ApiOperation("分页查询安全巡检部位管理表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPlaceSafety>> page(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceSafetyService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceSafetyService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')")
-    @ApiOperation("查询全部安全巡检部位管理表")
-    @GetMapping()
-    public ApiResult<List<TowerPlaceSafety>> list(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceSafetyService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceSafetyService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:list')")
-    @ApiOperation("根据id查询安全巡检部位管理表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPlaceSafety> get(@PathVariable("id") Integer id) {
-        return success(towerPlaceSafetyService.getById(id));
-        // 使用关联查询
-        //return success(towerPlaceSafetyService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:save')")
-    @ApiOperation("添加安全巡检部位管理表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPlaceSafety towerPlaceSafety) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerPlaceSafety.setUserId(loginUser.getUserId());
-        }
-        if (towerPlaceSafetyService.save(towerPlaceSafety)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')")
-    @ApiOperation("修改安全巡检部位管理表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPlaceSafety towerPlaceSafety) {
-        if (towerPlaceSafetyService.updateById(towerPlaceSafety)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:remove')")
-    @ApiOperation("删除安全巡检部位管理表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPlaceSafetyService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:save')")
-    @ApiOperation("批量添加安全巡检部位管理表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlaceSafety> list) {
-        if (towerPlaceSafetyService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:update')")
-    @ApiOperation("批量修改安全巡检部位管理表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlaceSafety> batchParam) {
-        if (batchParam.update(towerPlaceSafetyService, "place_safety_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceSafety:remove')")
-    @ApiOperation("批量删除安全巡检部位管理表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceSafetyService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java
deleted file mode 100644
index a046b84..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerPlaceStandardController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-import com.gxwebsoft.tower.service.TowerPlaceStandardService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 检查标准附件表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Api(tags = "检查标准附件表管理")
-@RestController
-@RequestMapping("/api/tower/tower-place-standard")
-public class TowerPlaceStandardController extends BaseController {
-    @Resource
-    private TowerPlaceStandardService towerPlaceStandardService;
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')")
-    @ApiOperation("分页查询检查标准附件表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerPlaceStandard>> page(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceStandardService.page(page, page.getWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceStandardService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')")
-    @ApiOperation("查询全部检查标准附件表")
-    @GetMapping()
-    public ApiResult<List<TowerPlaceStandard>> list(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(towerPlaceStandardService.list(page.getOrderWrapper()));
-        // 使用关联查询
-        //return success(towerPlaceStandardService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:list')")
-    @ApiOperation("根据id查询检查标准附件表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerPlaceStandard> get(@PathVariable("id") Integer id) {
-        return success(towerPlaceStandardService.getById(id));
-        // 使用关联查询
-        //return success(towerPlaceStandardService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:save')")
-    @ApiOperation("添加检查标准附件表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerPlaceStandard towerPlaceStandard) {
-        if (towerPlaceStandardService.save(towerPlaceStandard)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')")
-    @ApiOperation("修改检查标准附件表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerPlaceStandard towerPlaceStandard) {
-        if (towerPlaceStandardService.updateById(towerPlaceStandard)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')")
-    @ApiOperation("删除检查标准附件表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerPlaceStandardService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:save')")
-    @ApiOperation("批量添加检查标准附件表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerPlaceStandard> list) {
-        if (towerPlaceStandardService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:update')")
-    @ApiOperation("批量修改检查标准附件表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerPlaceStandard> batchParam) {
-        if (batchParam.update(towerPlaceStandardService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerPlaceStandard:remove')")
-    @ApiOperation("批量删除检查标准附件表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerPlaceStandardService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
deleted file mode 100644
index 337e6b6..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import com.gxwebsoft.tower.service.TowerProjectPlaceService;
-import com.gxwebsoft.tower.service.TowerProjectService;
-import com.gxwebsoft.tower.service.TowerProjectUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 项目管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Api(tags = "项目管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-project")
-public class TowerProjectController extends BaseController {
-    @Resource
-    private TowerProjectService towerProjectService;
-    @Resource
-    private TowerProjectOrderService towerProjectOrderService;
-    @Resource
-    private TowerProjectUserService towerProjectUserService;
-    @Resource
-    private TowerProjectPlaceService towerProjectPlaceService;
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("分页查询项目管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProject>> page(TowerProjectParam param) {
-        // 使用关联查询
-        return success(towerProjectService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("查询全部项目管理")
-    @GetMapping()
-    public ApiResult<List<TowerProject>> list(TowerProjectParam param) {
-        // 使用关联查询
-        return success(towerProjectService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:list')")
-    @ApiOperation("根据id查询项目管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProject> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:save')")
-    @Transactional(rollbackFor = {Exception.class})
-    @ApiOperation("添加项目管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProject towerProject) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerProject.setUserId(loginUser.getUserId());
-        }
-      System.out.println("towerProject = " + towerProject.getPlaces2());
-        if (towerProjectService.save(towerProject)) {
-          final Integer projectId = towerProject.getProjectId();
-            // 批量添加项目成员
-            if (!towerProject.getUsers().isEmpty()) {
-              final Set<TowerProjectUser> users = towerProject.getUsers();
-              users.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectUserService.saveBatch(users);
-            }
-            // 批量添加项目订单
-            if (!towerProject.getOrders().isEmpty()) {
-              final Set<TowerProjectOrder> orders = towerProject.getOrders();
-              orders.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectOrderService.saveBatch(orders);
-            }
-            // 批量添加检查部位配置
-            if (!towerProject.getPlaces1().isEmpty()) {
-              final Set<TowerProjectPlace> places1 = towerProject.getPlaces1();
-              places1.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectPlaceService.saveBatch(places1);
-            }
-            // 批量添加保养部位配置
-            if (!towerProject.getPlaces2().isEmpty()) {
-              final Set<TowerProjectPlace> places2 = towerProject.getPlaces2();
-              places2.forEach(d->{
-                d.setProjectId(projectId);
-              });
-              towerProjectPlaceService.saveBatch(places2);
-            }
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:update')")
-    @Transactional(rollbackFor = {Exception.class})
-    @ApiOperation("修改项目管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProject towerProject) {
-        if (towerProjectService.updateById(towerProject)) {
-            // 批量修改项目成员
-            towerProjectUserService.saveOrUpdateBatch(towerProject.getUsers());
-            // 批量修改项目订单
-            towerProjectOrderService.saveOrUpdateBatch(towerProject.getOrders());
-            // 批量修改检查/保养部位配置
-            towerProjectPlaceService.saveOrUpdateBatch(towerProject.getPlaces1());
-            towerProjectPlaceService.saveOrUpdateBatch(towerProject.getPlaces2());
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:remove')")
-    @ApiOperation("删除项目管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:save')")
-    @ApiOperation("批量添加项目管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProject> list) {
-        if (towerProjectService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:update')")
-    @ApiOperation("批量修改项目管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProject> batchParam) {
-        if (batchParam.update(towerProjectService, "project_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProject:remove')")
-    @ApiOperation("批量删除项目管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java
deleted file mode 100644
index d9a6f5b..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectOrderController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.*;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 合同签订设备清单控制器
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Api(tags = "合同签订设备清单管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-order")
-public class TowerProjectOrderController extends BaseController {
-    @Resource
-    private TowerProjectOrderService towerProjectOrderService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @ApiOperation("分页查询合同签订设备清单")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectOrder>> page(TowerProjectOrderParam param) {
-        // 使用关联查询
-        return success(towerProjectOrderService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @ApiOperation("查询全部合同签订设备清单")
-    @GetMapping()
-    public ApiResult<List<TowerProjectOrder>> list(TowerProjectOrderParam param) {
-        // 使用关联查询
-        return success(towerProjectOrderService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:list')")
-    @ApiOperation("根据id查询合同签订设备清单")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectOrder> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectOrderService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:save')")
-    @ApiOperation("添加合同签订设备清单")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectOrder towerProjectOrder) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerProjectOrder.setUserId(loginUser.getUserId());
-        }
-        if (towerProjectOrderService.save(towerProjectOrder)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')")
-    @ApiOperation("修改合同签订设备清单")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectOrder towerProjectOrder) {
-        if (towerProjectOrderService.updateById(towerProjectOrder)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:remove')")
-    @ApiOperation("删除合同签订设备清单")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectOrderService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:save')")
-    @ApiOperation("批量添加合同签订设备清单")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectOrder> list) {
-        if (towerProjectOrderService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:update')")
-    @ApiOperation("批量修改合同签订设备清单")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectOrder> batchParam) {
-        if (batchParam.update(towerProjectOrderService, "project_order_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectOrder:remove')")
-    @ApiOperation("批量删除合同签订设备清单")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectOrderService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java
deleted file mode 100644
index 3c81f02..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectPlaceController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-import com.gxwebsoft.tower.service.TowerProjectPlaceService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 检查/保养部位配置表控制器
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Api(tags = "检查/保养部位配置表管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-place")
-public class TowerProjectPlaceController extends BaseController {
-    @Resource
-    private TowerProjectPlaceService towerProjectPlaceService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @ApiOperation("分页查询检查/保养部位配置表")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectPlace>> page(TowerProjectPlaceParam param) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @ApiOperation("查询全部检查/保养部位配置表")
-    @GetMapping()
-    public ApiResult<List<TowerProjectPlace>> list(TowerProjectPlaceParam param) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:list')")
-    @ApiOperation("根据id查询检查/保养部位配置表")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectPlace> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectPlaceService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:save')")
-    @ApiOperation("添加检查/保养部位配置表")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectPlace towerProjectPlace) {
-      if (towerProjectPlaceService.count(new LambdaQueryWrapper<TowerProjectPlace>()
-        .eq(TowerProjectPlace::getProjectId, towerProjectPlace.getProjectId()).eq(TowerProjectPlace::getPlaceId,towerProjectPlace.getPlaceId())) > 0) {
-        return fail("该部位已存在");
-      }
-      if (towerProjectPlaceService.save(towerProjectPlace)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')")
-    @ApiOperation("修改检查/保养部位配置表")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectPlace towerProjectPlace) {
-        if (towerProjectPlaceService.updateById(towerProjectPlace)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')")
-    @ApiOperation("删除检查/保养部位配置表")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectPlaceService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:save')")
-    @ApiOperation("批量添加检查/保养部位配置表")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectPlace> list) {
-        if (towerProjectPlaceService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:update')")
-    @ApiOperation("批量修改检查/保养部位配置表")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectPlace> batchParam) {
-        if (batchParam.update(towerProjectPlaceService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectPlace:remove')")
-    @ApiOperation("批量删除检查/保养部位配置表")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectPlaceService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java
deleted file mode 100644
index 41523ce..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectUserController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-import com.gxwebsoft.tower.service.TowerProjectUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 项目成员控制器
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Api(tags = "项目成员管理")
-@RestController
-@RequestMapping("/api/tower/tower-project-user")
-public class TowerProjectUserController extends BaseController {
-    @Resource
-    private TowerProjectUserService towerProjectUserService;
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @ApiOperation("分页查询项目成员")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerProjectUser>> page(TowerProjectUserParam param) {
-        // 使用关联查询
-        return success(towerProjectUserService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @ApiOperation("查询全部项目成员")
-    @GetMapping()
-    public ApiResult<List<TowerProjectUser>> list(TowerProjectUserParam param) {
-        // 使用关联查询
-        return success(towerProjectUserService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:list')")
-    @ApiOperation("根据id查询项目成员")
-    @GetMapping("/{id}")
-    public ApiResult<TowerProjectUser> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerProjectUserService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:save')")
-    @ApiOperation("添加项目成员")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerProjectUser towerProjectUser) {
-        if (towerProjectUserService.count(new LambdaQueryWrapper<TowerProjectUser>()
-          .eq(TowerProjectUser::getUserId, towerProjectUser.getUserId()).eq(TowerProjectUser::getProjectId,towerProjectUser.getProjectId())) > 0) {
-          return fail("该成员已存在");
-        }
-        if (towerProjectUserService.save(towerProjectUser)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:update')")
-    @ApiOperation("修改项目成员")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerProjectUser towerProjectUser) {
-        if (towerProjectUserService.updateById(towerProjectUser)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')")
-    @ApiOperation("删除项目成员")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerProjectUserService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:save')")
-    @ApiOperation("批量添加项目成员")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerProjectUser> list) {
-        if (towerProjectUserService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:update')")
-    @ApiOperation("批量修改项目成员")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerProjectUser> batchParam) {
-        if (batchParam.update(towerProjectUserService, "id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerProjectUser:remove')")
-    @ApiOperation("批量删除项目成员")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerProjectUserService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java
deleted file mode 100644
index 5d3d0b3..0000000
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerWarehouseController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.gxwebsoft.tower.controller;
-
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.tower.service.TowerWarehouseService;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 仓库管理控制器
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Api(tags = "仓库管理管理")
-@RestController
-@RequestMapping("/api/tower/tower-warehouse")
-public class TowerWarehouseController extends BaseController {
-    @Resource
-    private TowerWarehouseService towerWarehouseService;
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @ApiOperation("分页查询仓库管理")
-    @GetMapping("/page")
-    public ApiResult<PageResult<TowerWarehouse>> page(TowerWarehouseParam param) {
-        // 使用关联查询
-        return success(towerWarehouseService.pageRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @ApiOperation("查询全部仓库管理")
-    @GetMapping()
-    public ApiResult<List<TowerWarehouse>> list(TowerWarehouseParam param) {
-        // 使用关联查询
-        return success(towerWarehouseService.listRel(param));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:list')")
-    @ApiOperation("根据id查询仓库管理")
-    @GetMapping("/{id}")
-    public ApiResult<TowerWarehouse> get(@PathVariable("id") Integer id) {
-        // 使用关联查询
-        return success(towerWarehouseService.getByIdRel(id));
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:save')")
-    @ApiOperation("添加仓库管理")
-    @PostMapping()
-    public ApiResult<?> save(@RequestBody TowerWarehouse towerWarehouse) {
-        // 记录当前登录用户id
-        User loginUser = getLoginUser();
-        if (loginUser != null) {
-          towerWarehouse.setUserId(loginUser.getUserId());
-        }
-        if (towerWarehouseService.save(towerWarehouse)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:update')")
-    @ApiOperation("修改仓库管理")
-    @PutMapping()
-    public ApiResult<?> update(@RequestBody TowerWarehouse towerWarehouse) {
-        if (towerWarehouseService.updateById(towerWarehouse)) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:remove')")
-    @ApiOperation("删除仓库管理")
-    @DeleteMapping("/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (towerWarehouseService.removeById(id)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:save')")
-    @ApiOperation("批量添加仓库管理")
-    @PostMapping("/batch")
-    public ApiResult<?> saveBatch(@RequestBody List<TowerWarehouse> list) {
-        if (towerWarehouseService.saveBatch(list)) {
-            return success("添加成功");
-        }
-        return fail("添加失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:update')")
-    @ApiOperation("批量修改仓库管理")
-    @PutMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody BatchParam<TowerWarehouse> batchParam) {
-        if (batchParam.update(towerWarehouseService, "warehouse_id")) {
-            return success("修改成功");
-        }
-        return fail("修改失败");
-    }
-
-    @PreAuthorize("hasAuthority('tower:towerWarehouse:remove')")
-    @ApiOperation("批量删除仓库管理")
-    @DeleteMapping("/batch")
-    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (towerWarehouseService.removeByIds(ids)) {
-            return success("删除成功");
-        }
-        return fail("删除失败");
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java b/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java
deleted file mode 100644
index 6c15a05..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerAccessory.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 配件管理
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerAccessory对象", description = "配件管理")
-public class TowerAccessory implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "accessory_id", type = IdType.AUTO)
-    private Integer accessoryId;
-
-    @ApiModelProperty(value = "配件名称")
-    private String accessoryName;
-
-    @ApiModelProperty(value = "配件编号")
-    private String accessoryNo;
-
-    @ApiModelProperty(value = "配件分类")
-    private String accessoryCategory;
-
-    @ApiModelProperty(value = "适用设备型号")
-    private String accessoryModel;
-
-    @ApiModelProperty(value = "适用设备型号(多选)")
-    private String accessoryModelMultiple;
-
-    @ApiModelProperty(value = "配件规格")
-    private String accessorySpecs;
-
-    @ApiModelProperty(value = "单价")
-    private BigDecimal accessoryPrice;
-
-    @ApiModelProperty(value = "配件单位")
-    private String accessoryUnit;
-
-    @ApiModelProperty(value = "重量")
-    private String accessoryWeight;
-
-    @ApiModelProperty(value = "库存总量")
-    private Integer accessoryStock;
-
-    @ApiModelProperty(value = "产权单位名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "产权单位编号")
-    private String companyNo;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "制造厂商编号")
-    private String manufactorNo;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "出厂日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date factoryDate;
-
-    @ApiModelProperty(value = "报废日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scrapDate;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java b/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
deleted file mode 100644
index e0845ff..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 塔吊设备管理
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerEquipment对象", description = "塔吊设备管理")
-public class TowerEquipment implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "equipment_id", type = IdType.AUTO)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "出厂日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date factoryDate;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "报废日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date scrapDate;
-
-    @ApiModelProperty(value = "备案编号")
-    private String filingNo;
-
-    @ApiModelProperty(value = "机号")
-    private String machineNo;
-
-    @ApiModelProperty(value = "备案许可证号")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "产权单位")
-    private String company;
-
-    @ApiModelProperty(value = "所属部门")
-    private String organization;
-
-    @ApiModelProperty(value = "所属仓库")
-    private String warehouse;
-
-    @ApiModelProperty(value = "设备来源")
-    private String source;
-
-    @ApiModelProperty(value = "采购日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date buyDate;
-
-    @ApiModelProperty(value = "当前位置")
-      private String currentLocation;
-
-    @ApiModelProperty(value = "设计高度")
-    private String designHeight;
-
-    @ApiModelProperty(value = "独立高度")
-    private String height;
-
-    @ApiModelProperty(value = "额定载重")
-    private String ratedLoad;
-
-    @ApiModelProperty(value = "最大幅度处额定载重")
-    private String maxRatedLoad;
-
-    @ApiModelProperty(value = "最大起升高度")
-    private String maxLiftingHeight;
-
-    @ApiModelProperty(value = "臂长")
-    private String armLength;
-
-    @ApiModelProperty(value = "附件1")
-    private String file1;
-
-    @ApiModelProperty(value = "附件2")
-    private String file2;
-
-    @ApiModelProperty(value = "附件3")
-    private String file3;
-
-    @ApiModelProperty(value = "附件4")
-    private String file4;
-
-    @ApiModelProperty(value = "附件5")
-    private String file5;
-
-    @ApiModelProperty(value = "附件6")
-    private String file6;
-
-    @ApiModelProperty(value = "附件7")
-    private String file7;
-
-    @ApiModelProperty(value = "当前位置")
-    private String address;
-
-    @ApiModelProperty(value = "是否外协标识")
-    @TableField(exist = false)
-    private Boolean isOutOrg;
-
-    @ApiModelProperty(value = "所属人员")
-    private String users;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java b/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java
deleted file mode 100644
index 6db1559..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerModel.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备型号管理表
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerModel对象", description = "设备型号管理表")
-public class TowerModel implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "型号ID")
-    @TableId(value = "model_id", type = IdType.AUTO)
-    private Integer modelId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "上级分类ID")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "分类图片")
-    private String image;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "使用年限")
-    private Integer yearLife;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java
deleted file mode 100644
index f73da0b..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlace.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 检查/保养部位记录表
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPlace对象", description = "检查/保养部位记录表")
-public class TowerPlace implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @TableId(value = "place_id", type = IdType.AUTO)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查/保养标准")
-    @TableField(exist = false)
-    private List<TowerPlaceStandard> standard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java
deleted file mode 100644
index 770406a..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceSafety.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 安全巡检部位管理表
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPlaceSafety对象", description = "安全巡检部位管理表")
-public class TowerPlaceSafety implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @TableId(value = "place_safety_id", type = IdType.AUTO)
-    private Integer placeSafetyId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "安全巡检部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查标准")
-    private String checkStandard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java
deleted file mode 100644
index cca3230..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerPlaceStandard.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 检查标准附件表
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerPlaceStandard对象", description = "检查标准附件表")
-public class TowerPlaceStandard implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer placeId;
-
-    @ApiModelProperty(value = "检查标准")
-    private String standard;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java
deleted file mode 100644
index ddfb3e6..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProject.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-/**
- * 项目管理
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProject对象", description = "项目管理")
-public class TowerProject implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "project_id", type = IdType.AUTO)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目图片")
-    private String projectImage;
-
-    @ApiModelProperty(value = "租赁单位")
-    private String companyName;
-
-    @ApiModelProperty(value = "承租单位")
-    private String customerName;
-
-    @ApiModelProperty(value = "项目地址")
-    private String projectRegion;
-
-    @ApiModelProperty(value = "详细地址")
-    private String projectAddress;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "报监编号")
-    private String superviseNo;
-
-    @ApiModelProperty(value = "施工许可证")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "安全状态")
-    private String securityStatus;
-
-    @ApiModelProperty(value = "主管部门")
-    private String competentDepartment;
-
-    @ApiModelProperty(value = "安拆单位")
-    private String dismantlingCompany;
-
-    @ApiModelProperty(value = "汽吊规格")
-    private String truckCraneSpecs;
-
-    @ApiModelProperty(value = "合同其他说明")
-    private String contract;
-
-    @ApiModelProperty(value = "项目负责人")
-    private String director;
-
-    @ApiModelProperty(value = "项目经理")
-    private String projectDirector;
-
-    @ApiModelProperty(value = "项目状态")
-    private String projectStatus;
-
-    @ApiModelProperty(value = "业务员")
-    private String salesman;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "项目成员")
-    @TableField(exist = false)
-    private Set<TowerProjectUser> users;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private Set<TowerProjectOrder> orders;
-
-    @ApiModelProperty(value = "检查部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places1;
-
-    @ApiModelProperty(value = "保养部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places2;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java
deleted file mode 100644
index 3a09d0e..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectOrder.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 合同签订设备清单
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectOrder对象", description = "合同签订设备清单")
-public class TowerProjectOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "project_order_id", type = IdType.AUTO)
-    private Integer projectOrderId;
-
-    @ApiModelProperty(value = "key")
-    @TableField(exist = false)
-    private String key;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "签订数量")
-    private Integer equipmentNum;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "预计进场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date startTime;
-
-    @ApiModelProperty(value = "预计退场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
-
-    @ApiModelProperty(value = "出厂年限")
-    private String year;
-
-    @ApiModelProperty(value = "对应资料员")
-    private String documenter;
-
-    @ApiModelProperty(value = "状态")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java
deleted file mode 100644
index c79412f..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectPlace.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 检查/保养部位配置表
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectPlace对象", description = "检查/保养部位配置表")
-public class TowerProjectPlace implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "部位ID")
-    private Integer placeId;
-
-    @ApiModelProperty(value = "排序号")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "部位编码")
-    @TableField(exist = false)
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String equipmentType;
-
-    @ApiModelProperty(value = "检查部位")
-    @TableField(exist = false)
-    private String name;
-
-    @ApiModelProperty(value = "部位类型")
-    @TableField(exist = false)
-    private String type;
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java b/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java
deleted file mode 100644
index 129b289..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 项目成员
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerProjectUser对象", description = "项目成员")
-public class TowerProjectUser implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "角色，10可见成员 20项目成员 30管理员 ")
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    private Integer status;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "注册时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-    @ApiModelProperty(value = "所在部门")
-    @TableField(exist = false)
-    private String organizationName;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java b/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java
deleted file mode 100644
index b4a15ca..0000000
--- a/src/main/java/com/gxwebsoft/tower/entity/TowerWarehouse.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.gxwebsoft.tower.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 仓库管理
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "TowerWarehouse对象", description = "仓库管理")
-public class TowerWarehouse implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @TableId(value = "warehouse_id", type = IdType.AUTO)
-    private Integer warehouseId;
-
-    @ApiModelProperty(value = "仓库名称")
-    private String warehouseName;
-
-    @ApiModelProperty(value = "负责人")
-    private String warehouseKeeper;
-
-    @ApiModelProperty(value = "联系电话")
-    private String warehousePhone;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "所在国家")
-    private String country;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "街道地址")
-    private String address;
-
-    @ApiModelProperty(value = "区域名称")
-    private String regionName;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @TableLogic
-    private Integer deleted;
-
-    @ApiModelProperty(value = "租户id")
-    private Integer tenantId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java
deleted file mode 100644
index b57c669..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerAccessoryMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 配件管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-public interface TowerAccessoryMapper extends BaseMapper<TowerAccessory> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerAccessory>
-     */
-    List<TowerAccessory> selectPageRel(@Param("page") IPage<TowerAccessory> page,
-                             @Param("param") TowerAccessoryParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerAccessory> selectListRel(@Param("param") TowerAccessoryParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java
deleted file mode 100644
index 6ca0886..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerEquipmentMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerEquipmentMapper extends BaseMapper<TowerEquipment> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerEquipment>
-     */
-    List<TowerEquipment> selectPageRel(@Param("page") IPage<TowerEquipment> page,
-                             @Param("param") TowerEquipmentParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerEquipment> selectListRel(@Param("param") TowerEquipmentParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java
deleted file mode 100644
index d483b6c..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerModelMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 设备型号管理表Mapper
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-public interface TowerModelMapper extends BaseMapper<TowerModel> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerModel>
-     */
-    List<TowerModel> selectPageRel(@Param("page") IPage<TowerModel> page,
-                             @Param("param") TowerModelParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerModel> selectListRel(@Param("param") TowerModelParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java
deleted file mode 100644
index df44d63..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceMapper extends BaseMapper<TowerPlace> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlace>
-     */
-    List<TowerPlace> selectPageRel(@Param("page") IPage<TowerPlace> page,
-                             @Param("param") TowerPlaceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlace> selectListRel(@Param("param") TowerPlaceParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java
deleted file mode 100644
index bd1fd3c..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceSafetyMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 安全巡检部位管理表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceSafetyMapper extends BaseMapper<TowerPlaceSafety> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlaceSafety>
-     */
-    List<TowerPlaceSafety> selectPageRel(@Param("page") IPage<TowerPlaceSafety> page,
-                             @Param("param") TowerPlaceSafetyParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlaceSafety> selectListRel(@Param("param") TowerPlaceSafetyParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java
deleted file mode 100644
index df9460f..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerPlaceStandardMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 检查标准附件表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-public interface TowerPlaceStandardMapper extends BaseMapper<TowerPlaceStandard> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerPlaceStandard>
-     */
-    List<TowerPlaceStandard> selectPageRel(@Param("page") IPage<TowerPlaceStandard> page,
-                             @Param("param") TowerPlaceStandardParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerPlaceStandard> selectListRel(@Param("param") TowerPlaceStandardParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java
deleted file mode 100644
index b1002e6..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-public interface TowerProjectMapper extends BaseMapper<TowerProject> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProject>
-     */
-    List<TowerProject> selectPageRel(@Param("page") IPage<TowerProject> page,
-                             @Param("param") TowerProjectParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProject> selectListRel(@Param("param") TowerProjectParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java
deleted file mode 100644
index c942a9a..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectOrderMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单Mapper
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-public interface TowerProjectOrderMapper extends BaseMapper<TowerProjectOrder> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectOrder>
-     */
-    List<TowerProjectOrder> selectPageRel(@Param("page") IPage<TowerProjectOrder> page,
-                             @Param("param") TowerProjectOrderParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectOrder> selectListRel(@Param("param") TowerProjectOrderParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java
deleted file mode 100644
index 6cd19d0..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectPlaceMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 检查/保养部位配置表Mapper
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-public interface TowerProjectPlaceMapper extends BaseMapper<TowerProjectPlace> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectPlace>
-     */
-    List<TowerProjectPlace> selectPageRel(@Param("page") IPage<TowerProjectPlace> page,
-                             @Param("param") TowerProjectPlaceParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectPlace> selectListRel(@Param("param") TowerProjectPlaceParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java
deleted file mode 100644
index 1adb753..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerProjectUserMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 项目成员Mapper
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-public interface TowerProjectUserMapper extends BaseMapper<TowerProjectUser> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerProjectUser>
-     */
-    List<TowerProjectUser> selectPageRel(@Param("page") IPage<TowerProjectUser> page,
-                             @Param("param") TowerProjectUserParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerProjectUser> selectListRel(@Param("param") TowerProjectUserParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java
deleted file mode 100644
index 6a92b52..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/TowerWarehouseMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.gxwebsoft.tower.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 仓库管理Mapper
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerWarehouseMapper extends BaseMapper<TowerWarehouse> {
-
-    /**
-     * 分页查询
-     *
-     * @param page  分页对象
-     * @param param 查询参数
-     * @return List<TowerWarehouse>
-     */
-    List<TowerWarehouse> selectPageRel(@Param("page") IPage<TowerWarehouse> page,
-                             @Param("param") TowerWarehouseParam param);
-
-    /**
-     * 查询全部
-     *
-     * @param param 查询参数
-     * @return List<User>
-     */
-    List<TowerWarehouse> selectListRel(@Param("param") TowerWarehouseParam param);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml
deleted file mode 100644
index 6c49f5e..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerAccessoryMapper.xml
+++ /dev/null
@@ -1,96 +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="com.gxwebsoft.tower.mapper.TowerAccessoryMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_accessory a
-        <where>
-            <if test="param.accessoryId != null">
-                AND a.accessory_id = #{param.accessoryId}
-            </if>
-            <if test="param.accessoryName != null">
-                AND a.accessory_name LIKE CONCAT('%', #{param.accessoryName}, '%')
-            </if>
-            <if test="param.accessoryCategory != null">
-                AND a.accessory_category LIKE CONCAT('%', #{param.accessoryCategory}, '%')
-            </if>
-            <if test="param.accessoryModel != null">
-                AND a.accessory_model LIKE CONCAT('%', #{param.accessoryModel}, '%')
-            </if>
-            <if test="param.accessorySpecs != null">
-                AND a.accessory_specs LIKE CONCAT('%', #{param.accessorySpecs}, '%')
-            </if>
-            <if test="param.accessoryPrice != null">
-                AND a.accessory_price = #{param.accessoryPrice}
-            </if>
-            <if test="param.accessoryUnit != null">
-                AND a.accessory_unit LIKE CONCAT('%', #{param.accessoryUnit}, '%')
-            </if>
-            <if test="param.accessoryStock != null">
-                AND a.accessory_stock LIKE CONCAT('%', #{param.accessoryStock}, '%')
-            </if>
-            <if test="param.companyName != null">
-                AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%')
-            </if>
-            <if test="param.manufactor != null">
-                AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%')
-            </if>
-            <if test="param.manufactorNo != null">
-                AND a.manufactor_no LIKE CONCAT('%', #{param.manufactorNo}, '%')
-            </if>
-            <if test="param.lifeYear != null">
-                AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.scrapDate != null">
-                AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.accessory_name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.accessory_no LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerAccessory">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerAccessory">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml
deleted file mode 100644
index c7a2c93..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml
+++ /dev/null
@@ -1,115 +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="com.gxwebsoft.tower.mapper.TowerEquipmentMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_equipment a
-        <where>
-            <if test="param.equipmentId != null">
-                AND a.equipment_id = #{param.equipmentId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.model != null">
-                AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.equipmentNo != null">
-                AND a.equipment_no LIKE CONCAT('%', #{param.equipmentNo}, '%')
-            </if>
-            <if test="param.factoryNo != null">
-                AND a.factory_no LIKE CONCAT('%', #{param.factoryNo}, '%')
-            </if>
-            <if test="param.factoryDate != null">
-                AND a.factory_date LIKE CONCAT('%', #{param.factoryDate}, '%')
-            </if>
-            <if test="param.manufactor != null">
-                AND a.manufactor LIKE CONCAT('%', #{param.manufactor}, '%')
-            </if>
-            <if test="param.lifeYear != null">
-                AND a.life_year LIKE CONCAT('%', #{param.lifeYear}, '%')
-            </if>
-            <if test="param.scrapDate != null">
-                AND a.scrap_date LIKE CONCAT('%', #{param.scrapDate}, '%')
-            </if>
-            <if test="param.licenceNo != null">
-                AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%')
-            </if>
-            <if test="param.company != null">
-                AND a.company = #{param.company}
-            </if>
-            <if test="param.organization != null">
-                AND a.organization = #{param.organization}
-            </if>
-            <if test="param.warehouse != null">
-                AND a.warehouse = #{param.warehouse}
-            </if>
-            <if test="param.source != null">
-                AND a.source LIKE CONCAT('%', #{param.source}, '%')
-            </if>
-            <if test="param.buyDate != null">
-                AND a.buy_date LIKE CONCAT('%', #{param.buyDate}, '%')
-            </if>
-            <if test="param.currentLocation != null">
-                AND a.current_location LIKE CONCAT('%', #{param.currentLocation}, '%')
-            </if>
-            <if test="param.designHeight != null">
-                AND a.design_height LIKE CONCAT('%', #{param.designHeight}, '%')
-            </if>
-            <if test="param.height != null">
-                AND a.height LIKE CONCAT('%', #{param.height}, '%')
-            </if>
-            <if test="param.ratedLoad != null">
-                AND a.rated_load LIKE CONCAT('%', #{param.ratedLoad}, '%')
-            </if>
-            <if test="param.maxRatedLoad != null">
-                AND a.max_rated_load LIKE CONCAT('%', #{param.maxRatedLoad}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              a.name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.equipment_no LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.company LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerEquipment">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml
deleted file mode 100644
index ee0ae23..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerModelMapper.xml
+++ /dev/null
@@ -1,71 +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="com.gxwebsoft.tower.mapper.TowerModelMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_model a
-        <where>
-            <if test="param.modelId != null">
-                AND a.model_id = #{param.modelId}
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.model != null">
-              AND a.model LIKE CONCAT('%', #{param.model}, '%')
-            </if>
-            <if test="param.parentId != null">
-                AND a.parent_id = #{param.parentId}
-            </if>
-            <if test="param.image != null">
-                AND a.image LIKE CONCAT('%', #{param.image}, '%')
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.yearLife != null">
-                AND a.year_life = #{param.yearLife}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-          <if test="param.keywords != null">
-            AND (
-            a.name LIKE CONCAT('%', #{param.keywords}, '%')
-            OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
-            )
-          </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerModel">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerModel">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml
deleted file mode 100644
index 6fed629..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceMapper.xml
+++ /dev/null
@@ -1,83 +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="com.gxwebsoft.tower.mapper.TowerPlaceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place a
-        <where>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.placeCode != null">
-                AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%')
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.standard != null">
-                AND a.standard LIKE CONCAT('%', #{param.standard}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.pushSystem != null">
-                AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%')
-            </if>
-            <if test="param.otherParam != null">
-                AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.isShow != null">
-                AND a.is_show = #{param.isShow}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.equipment_type LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.place_code = #{param.keywords}
-              OR a.name #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml
deleted file mode 100644
index 82e35d1..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceSafetyMapper.xml
+++ /dev/null
@@ -1,77 +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="com.gxwebsoft.tower.mapper.TowerPlaceSafetyMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place_safety a
-        <where>
-            <if test="param.placeSafetyId != null">
-                AND a.place_safety_id = #{param.placeSafetyId}
-            </if>
-            <if test="param.placeCode != null">
-                AND a.place_code LIKE CONCAT('%', #{param.placeCode}, '%')
-            </if>
-            <if test="param.equipmentType != null">
-                AND a.equipment_type LIKE CONCAT('%', #{param.equipmentType}, '%')
-            </if>
-            <if test="param.name != null">
-                AND a.name LIKE CONCAT('%', #{param.name}, '%')
-            </if>
-            <if test="param.checkStandard != null">
-                AND a.check_standard LIKE CONCAT('%', #{param.checkStandard}, '%')
-            </if>
-            <if test="param.type != null">
-                AND a.type LIKE CONCAT('%', #{param.type}, '%')
-            </if>
-            <if test="param.pushSystem != null">
-                AND a.push_system LIKE CONCAT('%', #{param.pushSystem}, '%')
-            </if>
-            <if test="param.otherParam != null">
-                AND a.other_param LIKE CONCAT('%', #{param.otherParam}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.isShow != null">
-                AND a.is_show = #{param.isShow}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceSafety">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceSafety">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml
deleted file mode 100644
index 51988a5..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPlaceStandardMapper.xml
+++ /dev/null
@@ -1,44 +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="com.gxwebsoft.tower.mapper.TowerPlaceStandardMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_place_standard a
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.standard != null">
-                AND a.standard LIKE CONCAT('%', #{param.standard}, '%')
-            </if>
-            <if test="param.files != null">
-                AND a.files LIKE CONCAT('%', #{param.files}, '%')
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceStandard">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerPlaceStandard">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml
deleted file mode 100644
index 6819f21..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml
+++ /dev/null
@@ -1,104 +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="com.gxwebsoft.tower.mapper.TowerProjectMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project a
-        <where>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.projectName != null">
-                AND a.project_name LIKE CONCAT('%', #{param.projectName}, '%')
-            </if>
-            <if test="param.companyName != null">
-                AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%')
-            </if>
-            <if test="param.customerName != null">
-                AND a.customer_name LIKE CONCAT('%', #{param.customerName}, '%')
-            </if>
-            <if test="param.projectRegion != null">
-                AND a.project_region LIKE CONCAT('%', #{param.projectRegion}, '%')
-            </if>
-            <if test="param.projectAddress != null">
-                AND a.project_address LIKE CONCAT('%', #{param.projectAddress}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.superviseNo != null">
-                AND a.supervise_no LIKE CONCAT('%', #{param.superviseNo}, '%')
-            </if>
-            <if test="param.licenceNo != null">
-                AND a.licence_no LIKE CONCAT('%', #{param.licenceNo}, '%')
-            </if>
-            <if test="param.securityStatus != null">
-                AND a.security_status LIKE CONCAT('%', #{param.securityStatus}, '%')
-            </if>
-            <if test="param.competentDepartment != null">
-                AND a.competent_department LIKE CONCAT('%', #{param.competentDepartment}, '%')
-            </if>
-            <if test="param.dismantlingCompany != null">
-                AND a.dismantling_company LIKE CONCAT('%', #{param.dismantlingCompany}, '%')
-            </if>
-            <if test="param.truckCraneSpecs != null">
-                AND a.truck_crane_specs LIKE CONCAT('%', #{param.truckCraneSpecs}, '%')
-            </if>
-            <if test="param.contract != null">
-                AND a.contract LIKE CONCAT('%', #{param.contract}, '%')
-            </if>
-            <if test="param.director != null">
-                AND a.director = #{param.director}
-            </if>
-            <if test="param.projectDirector != null">
-                AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%')
-            </if>
-            <if test="param.projectStatus != null">
-                AND a.project_status LIKE CONCAT('%', #{param.projectStatus}, '%')
-            </if>
-            <if test="param.salesman != null">
-                AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProject">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProject">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml
deleted file mode 100644
index 7549e71..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectOrderMapper.xml
+++ /dev/null
@@ -1,77 +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="com.gxwebsoft.tower.mapper.TowerProjectOrderMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_project_order a
-        <where>
-            <if test="param.projectOrderId != null">
-                AND a.project_order_id = #{param.projectOrderId}
-            </if>
-          <if test="param.projectId != null">
-            AND a.project_id = #{param.projectId}
-          </if>
-            <if test="param.equipmentName != null">
-                AND a.equipment_name LIKE CONCAT('%', #{param.equipmentName}, '%')
-            </if>
-            <if test="param.equipmentModel != null">
-                AND a.equipment_model LIKE CONCAT('%', #{param.equipmentModel}, '%')
-            </if>
-            <if test="param.equipmentNum != null">
-                AND a.equipment_num = #{param.equipmentNum}
-            </if>
-            <if test="param.unit != null">
-                AND a.unit LIKE CONCAT('%', #{param.unit}, '%')
-            </if>
-            <if test="param.startTime != null">
-                AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%')
-            </if>
-            <if test="param.endTime != null">
-                AND a.end_time LIKE CONCAT('%', #{param.endTime}, '%')
-            </if>
-            <if test="param.year != null">
-                AND a.year LIKE CONCAT('%', #{param.year}, '%')
-            </if>
-            <if test="param.documenter != null">
-                AND a.documenter LIKE CONCAT('%', #{param.documenter}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectOrder">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml
deleted file mode 100644
index dc461fe..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectPlaceMapper.xml
+++ /dev/null
@@ -1,50 +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="com.gxwebsoft.tower.mapper.TowerProjectPlaceMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*,b.name,b.place_code,b.place_id,b.equipment_type,b.type
-        FROM tower_project_place a
-        LEFT JOIN tower_place b ON a.place_id = b.place_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.placeId != null">
-                AND a.place_id = #{param.placeId}
-            </if>
-            <if test="param.sortNumber != null">
-                AND a.sort_number = #{param.sortNumber}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (
-              b.name LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.place_code LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.type LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.equipment_type LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectPlace">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml
deleted file mode 100644
index d74c770..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml
+++ /dev/null
@@ -1,53 +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="com.gxwebsoft.tower.mapper.TowerProjectUserMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*, b.nickname,b.email,b.phone,b.avatar,c.organization_name
-        FROM tower_project_user a
-        LEFT JOIN sys_user b ON a.user_id = b.user_id
-        LEFT JOIN sys_organization c ON b.organization_id = c.organization_id
-        <where>
-            <if test="param.id != null">
-                AND a.id = #{param.id}
-            </if>
-            <if test="param.role != null">
-                AND a.role = #{param.role}
-            </if>
-            <if test="param.userId != null">
-                AND a.user_id = #{param.userId}
-            </if>
-            <if test="param.projectId != null">
-                AND a.project_id = #{param.projectId}
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.email LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.username LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.phone LIKE CONCAT('%', #{param.keywords}, '%')
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerProjectUser">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerProjectUser">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
deleted file mode 100644
index 08b47b3..0000000
--- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml
+++ /dev/null
@@ -1,87 +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="com.gxwebsoft.tower.mapper.TowerWarehouseMapper">
-
-    <!-- 关联查询sql -->
-    <sql id="selectSql">
-        SELECT a.*
-        FROM tower_warehouse a
-        <where>
-            <if test="param.warehouseId != null">
-                AND a.warehouse_id = #{param.warehouseId}
-            </if>
-            <if test="param.warehouseName != null">
-                AND a.warehouse_name LIKE CONCAT('%', #{param.warehouseName}, '%')
-            </if>
-            <if test="param.warehouseKeeper != null">
-                AND a.warehouse_keeper LIKE CONCAT('%', #{param.warehouseKeeper}, '%')
-            </if>
-            <if test="param.warehousePhone != null">
-                AND a.warehouse_phone LIKE CONCAT('%', #{param.warehousePhone}, '%')
-            </if>
-            <if test="param.longitude != null">
-                AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%')
-            </if>
-            <if test="param.latitude != null">
-                AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%')
-            </if>
-            <if test="param.country != null">
-                AND a.country LIKE CONCAT('%', #{param.country}, '%')
-            </if>
-            <if test="param.province != null">
-                AND a.province LIKE CONCAT('%', #{param.province}, '%')
-            </if>
-            <if test="param.city != null">
-                AND a.city LIKE CONCAT('%', #{param.city}, '%')
-            </if>
-            <if test="param.region != null">
-                AND a.region LIKE CONCAT('%', #{param.region}, '%')
-            </if>
-            <if test="param.address != null">
-                AND a.address LIKE CONCAT('%', #{param.address}, '%')
-            </if>
-            <if test="param.regionName != null">
-                AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%')
-            </if>
-            <if test="param.status != null">
-                AND a.status = #{param.status}
-            </if>
-            <if test="param.comments != null">
-                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
-            </if>
-            <if test="param.username != null">
-                AND a.username = #{param.username}
-            </if>
-            <if test="param.deleted != null">
-                AND a.deleted = #{param.deleted}
-            </if>
-            <if test="param.deleted == null">
-                AND a.deleted = 0
-            </if>
-            <if test="param.createTimeStart != null">
-                AND a.create_time &gt;= #{param.createTimeStart}
-            </if>
-            <if test="param.createTimeEnd != null">
-                AND a.create_time &lt;= #{param.createTimeEnd}
-            </if>
-            <if test="param.keywords != null">
-              AND (a.title LIKE CONCAT('%', #{param.keywords}, '%')
-              OR a.warehouse_name = #{param.keywords
-              OR a.warehouse_keeper = #{param.keywords}
-              OR a.warehouse_phone = #{param.keywords}
-              )
-            </if>
-        </where>
-    </sql>
-
-    <!-- 分页查询 -->
-    <select id="selectPageRel" resultType="com.gxwebsoft.tower.entity.TowerWarehouse">
-        <include refid="selectSql"></include>
-    </select>
-
-    <!-- 查询全部 -->
-    <select id="selectListRel" resultType="com.gxwebsoft.tower.entity.TowerWarehouse">
-        <include refid="selectSql"></include>
-    </select>
-
-</mapper>
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java
deleted file mode 100644
index c8326ac..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerAccessoryParam.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 配件管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerAccessoryParam对象", description = "配件管理查询参数")
-public class TowerAccessoryParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer accessoryId;
-
-    @ApiModelProperty(value = "配件名称")
-    private String accessoryName;
-
-    @ApiModelProperty(value = "配件分类")
-    private String accessoryCategory;
-
-    @ApiModelProperty(value = "适用设备型号")
-    private String accessoryModel;
-
-    @ApiModelProperty(value = "配件规格")
-    private String accessorySpecs;
-
-    @ApiModelProperty(value = "单价")
-    @QueryField(type = QueryType.EQ)
-    private BigDecimal accessoryPrice;
-
-    @ApiModelProperty(value = "配件单位")
-    private String accessoryUnit;
-
-    @ApiModelProperty(value = "库存总量")
-    private String accessoryStock;
-
-    @ApiModelProperty(value = "产权单位名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "制造厂商编号")
-    private String manufactorNo;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "出厂日期")
-    private String factoryDate;
-
-    @ApiModelProperty(value = "报废日期")
-    private String scrapDate;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java
deleted file mode 100644
index b3df3fe..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerEquipmentParam.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 塔吊设备管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerEquipmentParam对象", description = "塔吊设备管理查询参数")
-public class TowerEquipmentParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "设备编号")
-    private String equipmentNo;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNo;
-
-    @ApiModelProperty(value = "出厂日期")
-    private String factoryDate;
-
-    @ApiModelProperty(value = "制造厂商")
-    private String manufactor;
-
-    @ApiModelProperty(value = "使用年限")
-    private String lifeYear;
-
-    @ApiModelProperty(value = "报废日期")
-    private String scrapDate;
-
-    @ApiModelProperty(value = "备案许可证号")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "产权单位")
-    @QueryField(type = QueryType.EQ)
-    private String company;
-
-    @ApiModelProperty(value = "产权单位名称")
-    private String propertyCompany;
-
-    @ApiModelProperty(value = "所属部门")
-    @QueryField(type = QueryType.EQ)
-    private String organization;
-
-    @ApiModelProperty(value = "所属仓库")
-    @QueryField(type = QueryType.EQ)
-    private String warehouse;
-
-    @ApiModelProperty(value = "设备来源")
-    private String source;
-
-    @ApiModelProperty(value = "采购日期")
-    private String buyDate;
-
-    @ApiModelProperty(value = "当前位置")
-    private String currentLocation;
-
-    @ApiModelProperty(value = "设计高度")
-    private String designHeight;
-
-    @ApiModelProperty(value = "独立高度")
-    private String height;
-
-    @ApiModelProperty(value = "额定载重")
-    private String ratedLoad;
-
-    @ApiModelProperty(value = "最大幅度处额定载重")
-    private String maxRatedLoad;
-
-    @ApiModelProperty(value = "附件信息")
-    private String files;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java
deleted file mode 100644
index 970767e..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerModelParam.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 设备型号管理表查询参数
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerModelParam对象", description = "设备型号管理表查询参数")
-public class TowerModelParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "型号ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer modelId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String name;
-
-    @ApiModelProperty(value = "设备型号")
-    private String model;
-
-    @ApiModelProperty(value = "上级分类ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer parentId;
-
-    @ApiModelProperty(value = "分类图片")
-    private String image;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "使用年限")
-    private Integer yearLife;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java
deleted file mode 100644
index 3800102..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceParam.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPlaceParam对象", description = "检查/保养部位记录表查询参数")
-public class TowerPlaceParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查/保养标准")
-    @TableField(exist = false)
-    private List<TowerPlaceStandard> standard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    @QueryField(type = QueryType.EQ)
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java
deleted file mode 100644
index 0385285..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceSafetyParam.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 安全巡检部位管理表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPlaceSafetyParam对象", description = "安全巡检部位管理表查询参数")
-public class TowerPlaceSafetyParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeSafetyId;
-
-    @ApiModelProperty(value = "部位编码")
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备类型")
-    private String equipmentType;
-
-    @ApiModelProperty(value = "安全巡检部位名称")
-    private String name;
-
-    @ApiModelProperty(value = "检查标准")
-    private String checkStandard;
-
-    @ApiModelProperty(value = "部位类型")
-    private String type;
-
-    @ApiModelProperty(value = "推送目标系统")
-    private String pushSystem;
-
-    @ApiModelProperty(value = "其它项目对应值")
-    private String otherParam;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "是否默认显示")
-    @QueryField(type = QueryType.EQ)
-    private Integer isShow;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "排序(数字越小越靠前)")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "状态, 0正常, 1冻结")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java
deleted file mode 100644
index 8e13943..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerPlaceStandardParam.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 检查标准附件表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerPlaceStandardParam对象", description = "检查标准附件表查询参数")
-public class TowerPlaceStandardParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "参数ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "检查标准")
-    private String standard;
-
-    @ApiModelProperty(value = "附件")
-    private String files;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java
deleted file mode 100644
index 2864a5c..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectOrderParam.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单查询参数
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectOrderParam对象", description = "合同签订设备清单查询参数")
-public class TowerProjectOrderParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectOrderId;
-
-    @ApiModelProperty(value = "项目ID")
-    private Integer projectId;
-
-    @ApiModelProperty(value = "设备名称")
-    private String equipmentName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String equipmentModel;
-
-    @ApiModelProperty(value = "签订数量")
-    @QueryField(type = QueryType.EQ)
-    private Integer equipmentNum;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "预计进场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String startTime;
-
-    @ApiModelProperty(value = "预计退场时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String endTime;
-
-    @ApiModelProperty(value = "出厂年限")
-    private String year;
-
-    @ApiModelProperty(value = "对应资料员")
-    private String documenter;
-
-    @ApiModelProperty(value = "状态")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private List<TowerProjectOrder> orders;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java
deleted file mode 100644
index 46a8268..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectParam.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Set;
-
-/**
- * 项目管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectParam对象", description = "项目管理查询参数")
-public class TowerProjectParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "配件名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "项目图片")
-    private String projectImage;
-
-    @ApiModelProperty(value = "租赁单位")
-    private String companyName;
-
-    @ApiModelProperty(value = "承租单位")
-    private String customerName;
-
-    @ApiModelProperty(value = "项目地址")
-    private String projectRegion;
-
-    @ApiModelProperty(value = "详细地址")
-    private String projectAddress;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "报监编号")
-    private String superviseNo;
-
-    @ApiModelProperty(value = "施工许可证")
-    private String licenceNo;
-
-    @ApiModelProperty(value = "安全状态")
-    private String securityStatus;
-
-    @ApiModelProperty(value = "主管部门")
-    private String competentDepartment;
-
-    @ApiModelProperty(value = "安拆单位")
-    private String dismantlingCompany;
-
-    @ApiModelProperty(value = "汽吊规格")
-    private String truckCraneSpecs;
-
-    @ApiModelProperty(value = "合同其他说明")
-    private String contract;
-
-    @ApiModelProperty(value = "项目负责人")
-    @QueryField(type = QueryType.EQ)
-    private Integer director;
-
-    @ApiModelProperty(value = "项目经理")
-    private String projectDirector;
-
-    @ApiModelProperty(value = "项目状态")
-    private String projectStatus;
-
-    @ApiModelProperty(value = "业务员")
-    private String salesman;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-    @ApiModelProperty(value = "项目成员")
-    @TableField(exist = false)
-    private Set<TowerProjectUser> users;
-
-    @ApiModelProperty(value = "合同预定设备清单")
-    @TableField(exist = false)
-    private Set<TowerProjectOrder> orders;
-
-    @ApiModelProperty(value = "检查部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places1;
-
-    @ApiModelProperty(value = "保养部位配置")
-    @TableField(exist = false)
-    private Set<TowerProjectPlace> places2;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java
deleted file mode 100644
index 86607ed..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectPlaceParam.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 检查/保养部位配置表查询参数
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectPlaceParam对象", description = "检查/保养部位配置表查询参数")
-public class TowerProjectPlaceParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "部位ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer placeId;
-
-    @ApiModelProperty(value = "排序号")
-    @QueryField(type = QueryType.EQ)
-    private Integer sortNumber;
-
-    @ApiModelProperty(value = "部位编码")
-    @TableField(exist = false)
-    private String placeCode;
-
-    @ApiModelProperty(value = "设备名称")
-    @TableField(exist = false)
-    private String name;
-
-    @ApiModelProperty(value = "部位类型")
-    @TableField(exist = false)
-    private String type;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java
deleted file mode 100644
index 0e0ad28..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerProjectUserParam.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 项目成员查询参数
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerProjectUserParam对象", description = "项目成员查询参数")
-public class TowerProjectUserParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer id;
-
-    @ApiModelProperty(value = "角色，10可见成员 20项目成员 30管理员 ")
-    @QueryField(type = QueryType.EQ)
-    private Integer role;
-
-    @ApiModelProperty(value = "用户ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "项目ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer projectId;
-
-    @ApiModelProperty(value = "状态, 0正常, 1待确认")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField(exist = false)
-    private String nickname;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField(exist = false)
-    private String username;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField(exist = false)
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField(exist = false)
-    private String email;
-
-    @ApiModelProperty(value = "头像")
-    @TableField(exist = false)
-    private String avatar;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java
deleted file mode 100644
index 2a1d29d..0000000
--- a/src/main/java/com/gxwebsoft/tower/param/TowerWarehouseParam.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.gxwebsoft.tower.param;
-
-import com.gxwebsoft.common.core.annotation.QueryField;
-import com.gxwebsoft.common.core.annotation.QueryType;
-import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 仓库管理查询参数
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "TowerWarehouseParam对象", description = "仓库管理查询参数")
-public class TowerWarehouseParam extends BaseParam {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "自增ID")
-    @QueryField(type = QueryType.EQ)
-    private Integer warehouseId;
-
-    @ApiModelProperty(value = "仓库名称")
-    private String warehouseName;
-
-    @ApiModelProperty(value = "负责人")
-    private String warehouseKeeper;
-
-    @ApiModelProperty(value = "联系电话")
-    private String warehousePhone;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "所在国家")
-    private String country;
-
-    @ApiModelProperty(value = "所在省份")
-    private String province;
-
-    @ApiModelProperty(value = "所在城市")
-    private String city;
-
-    @ApiModelProperty(value = "所在辖区")
-    private String region;
-
-    @ApiModelProperty(value = "街道地址")
-    private String address;
-
-    @ApiModelProperty(value = "区域名称")
-    private String regionName;
-
-    @ApiModelProperty(value = "状态, 0待发布, 1已发布")
-    @QueryField(type = QueryType.EQ)
-    private Integer status;
-
-    @ApiModelProperty(value = "备注")
-    private String comments;
-
-    @ApiModelProperty(value = "所有人")
-    @QueryField(type = QueryType.EQ)
-    private Integer userId;
-
-    @ApiModelProperty(value = "是否删除, 0否, 1是")
-    @QueryField(type = QueryType.EQ)
-    private Integer deleted;
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java b/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java
deleted file mode 100644
index 2224bf0..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerAccessoryService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-
-import java.util.List;
-
-/**
- * 配件管理Service
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-public interface TowerAccessoryService extends IService<TowerAccessory> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerAccessory>
-     */
-    PageResult<TowerAccessory> pageRel(TowerAccessoryParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerAccessory>
-     */
-    List<TowerAccessory> listRel(TowerAccessoryParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param accessoryId 自增ID
-     * @return TowerAccessory
-     */
-    TowerAccessory getByIdRel(Integer accessoryId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java b/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java
deleted file mode 100644
index de1a69b..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerEquipmentService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理Service
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerEquipmentService extends IService<TowerEquipment> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerEquipment>
-     */
-    PageResult<TowerEquipment> pageRel(TowerEquipmentParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerEquipment>
-     */
-    List<TowerEquipment> listRel(TowerEquipmentParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param equipmentId 自增ID
-     * @return TowerEquipment
-     */
-    TowerEquipment getByIdRel(Integer equipmentId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java b/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java
deleted file mode 100644
index 8811eb7..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerModelService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-
-import java.util.List;
-
-/**
- * 设备型号管理表Service
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-public interface TowerModelService extends IService<TowerModel> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerModel>
-     */
-    PageResult<TowerModel> pageRel(TowerModelParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerModel>
-     */
-    List<TowerModel> listRel(TowerModelParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param categoryId 型号ID
-     * @return TowerModel
-     */
-    TowerModel getByIdRel(Integer categoryId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java
deleted file mode 100644
index 846b7a1..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceSafetyService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-
-import java.util.List;
-
-/**
- * 安全巡检部位管理表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceSafetyService extends IService<TowerPlaceSafety> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlaceSafety>
-     */
-    PageResult<TowerPlaceSafety> pageRel(TowerPlaceSafetyParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlaceSafety>
-     */
-    List<TowerPlaceSafety> listRel(TowerPlaceSafetyParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param placeSafetyId 参数ID
-     * @return TowerPlaceSafety
-     */
-    TowerPlaceSafety getByIdRel(Integer placeSafetyId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java
deleted file mode 100644
index c047181..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-public interface TowerPlaceService extends IService<TowerPlace> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlace>
-     */
-    PageResult<TowerPlace> pageRel(TowerPlaceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlace>
-     */
-    List<TowerPlace> listRel(TowerPlaceParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param placeId 参数ID
-     * @return TowerPlace
-     */
-    TowerPlace getByIdRel(Integer placeId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java
deleted file mode 100644
index bce6671..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerPlaceStandardService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-
-import java.util.List;
-
-/**
- * 检查标准附件表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-public interface TowerPlaceStandardService extends IService<TowerPlaceStandard> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerPlaceStandard>
-     */
-    PageResult<TowerPlaceStandard> pageRel(TowerPlaceStandardParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerPlaceStandard>
-     */
-    List<TowerPlaceStandard> listRel(TowerPlaceStandardParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 参数ID
-     * @return TowerPlaceStandard
-     */
-    TowerPlaceStandard getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java
deleted file mode 100644
index db761c7..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectOrderService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单Service
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-public interface TowerProjectOrderService extends IService<TowerProjectOrder> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectOrder>
-     */
-    PageResult<TowerProjectOrder> pageRel(TowerProjectOrderParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectOrder>
-     */
-    List<TowerProjectOrder> listRel(TowerProjectOrderParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param projectOrderId 自增ID
-     * @return TowerProjectOrder
-     */
-    TowerProjectOrder getByIdRel(Integer projectOrderId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java
deleted file mode 100644
index 950ea42..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectPlaceService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-
-import java.util.List;
-
-/**
- * 检查/保养部位配置表Service
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-public interface TowerProjectPlaceService extends IService<TowerProjectPlace> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectPlace>
-     */
-    PageResult<TowerProjectPlace> pageRel(TowerProjectPlaceParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectPlace>
-     */
-    List<TowerProjectPlace> listRel(TowerProjectPlaceParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return TowerProjectPlace
-     */
-    TowerProjectPlace getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java
deleted file mode 100644
index 84114fd..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-
-import java.util.List;
-
-/**
- * 项目管理Service
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-public interface TowerProjectService extends IService<TowerProject> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProject>
-     */
-    PageResult<TowerProject> pageRel(TowerProjectParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProject>
-     */
-    List<TowerProject> listRel(TowerProjectParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param projectId 自增ID
-     * @return TowerProject
-     */
-    TowerProject getByIdRel(Integer projectId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java b/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java
deleted file mode 100644
index 4a844d8..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerProjectUserService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-
-import java.util.List;
-
-/**
- * 项目成员Service
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-public interface TowerProjectUserService extends IService<TowerProjectUser> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerProjectUser>
-     */
-    PageResult<TowerProjectUser> pageRel(TowerProjectUserParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerProjectUser>
-     */
-    List<TowerProjectUser> listRel(TowerProjectUserParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param id 自增ID
-     * @return TowerProjectUser
-     */
-    TowerProjectUser getByIdRel(Integer id);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java b/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java
deleted file mode 100644
index c9095c4..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/TowerWarehouseService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.gxwebsoft.tower.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-
-import java.util.List;
-
-/**
- * 仓库管理Service
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-public interface TowerWarehouseService extends IService<TowerWarehouse> {
-
-    /**
-     * 分页关联查询
-     *
-     * @param param 查询参数
-     * @return PageResult<TowerWarehouse>
-     */
-    PageResult<TowerWarehouse> pageRel(TowerWarehouseParam param);
-
-    /**
-     * 关联查询全部
-     *
-     * @param param 查询参数
-     * @return List<TowerWarehouse>
-     */
-    List<TowerWarehouse> listRel(TowerWarehouseParam param);
-
-    /**
-     * 根据id查询
-     *
-     * @param warehouseId 自增ID
-     * @return TowerWarehouse
-     */
-    TowerWarehouse getByIdRel(Integer warehouseId);
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java
deleted file mode 100644
index a48aa07..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerAccessoryServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerAccessoryMapper;
-import com.gxwebsoft.tower.service.TowerAccessoryService;
-import com.gxwebsoft.tower.entity.TowerAccessory;
-import com.gxwebsoft.tower.param.TowerAccessoryParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 配件管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-22 11:53:48
- */
-@Service
-public class TowerAccessoryServiceImpl extends ServiceImpl<TowerAccessoryMapper, TowerAccessory> implements TowerAccessoryService {
-
-    @Override
-    public PageResult<TowerAccessory> pageRel(TowerAccessoryParam param) {
-        PageParam<TowerAccessory, TowerAccessoryParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerAccessory> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerAccessory> listRel(TowerAccessoryParam param) {
-        List<TowerAccessory> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerAccessory, TowerAccessoryParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerAccessory getByIdRel(Integer accessoryId) {
-        TowerAccessoryParam param = new TowerAccessoryParam();
-        param.setAccessoryId(accessoryId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java
deleted file mode 100644
index 6555537..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerEquipmentServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerEquipmentMapper;
-import com.gxwebsoft.tower.service.TowerEquipmentService;
-import com.gxwebsoft.tower.entity.TowerEquipment;
-import com.gxwebsoft.tower.param.TowerEquipmentParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 塔吊设备管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Service
-public class TowerEquipmentServiceImpl extends ServiceImpl<TowerEquipmentMapper, TowerEquipment> implements TowerEquipmentService {
-
-    @Override
-    public PageResult<TowerEquipment> pageRel(TowerEquipmentParam param) {
-        PageParam<TowerEquipment, TowerEquipmentParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerEquipment> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerEquipment> listRel(TowerEquipmentParam param) {
-        List<TowerEquipment> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerEquipment, TowerEquipmentParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerEquipment getByIdRel(Integer equipmentId) {
-        TowerEquipmentParam param = new TowerEquipmentParam();
-        param.setEquipmentId(equipmentId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java
deleted file mode 100644
index 3bd109f..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerModelServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerModelMapper;
-import com.gxwebsoft.tower.service.TowerModelService;
-import com.gxwebsoft.tower.entity.TowerModel;
-import com.gxwebsoft.tower.param.TowerModelParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 设备型号管理表Service实现
- *
- * @author 科技小王子
- * @since 2023-05-29 14:07:46
- */
-@Service
-public class TowerModelServiceImpl extends ServiceImpl<TowerModelMapper, TowerModel> implements TowerModelService {
-
-    @Override
-    public PageResult<TowerModel> pageRel(TowerModelParam param) {
-        PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerModel> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerModel> listRel(TowerModelParam param) {
-        List<TowerModel> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerModel, TowerModelParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerModel getByIdRel(Integer modelId) {
-        TowerModelParam param = new TowerModelParam();
-        param.setModelId(modelId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java
deleted file mode 100644
index 481fd4a..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceSafetyServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPlaceSafetyMapper;
-import com.gxwebsoft.tower.service.TowerPlaceSafetyService;
-import com.gxwebsoft.tower.entity.TowerPlaceSafety;
-import com.gxwebsoft.tower.param.TowerPlaceSafetyParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 安全巡检部位管理表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Service
-public class TowerPlaceSafetyServiceImpl extends ServiceImpl<TowerPlaceSafetyMapper, TowerPlaceSafety> implements TowerPlaceSafetyService {
-
-    @Override
-    public PageResult<TowerPlaceSafety> pageRel(TowerPlaceSafetyParam param) {
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlaceSafety> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlaceSafety> listRel(TowerPlaceSafetyParam param) {
-        List<TowerPlaceSafety> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlaceSafety, TowerPlaceSafetyParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPlaceSafety getByIdRel(Integer placeSafetyId) {
-        TowerPlaceSafetyParam param = new TowerPlaceSafetyParam();
-        param.setPlaceSafetyId(placeSafetyId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java
deleted file mode 100644
index 61ea96d..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPlaceMapper;
-import com.gxwebsoft.tower.service.TowerPlaceService;
-import com.gxwebsoft.tower.entity.TowerPlace;
-import com.gxwebsoft.tower.param.TowerPlaceParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 检查/保养部位记录表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 11:00:17
- */
-@Service
-public class TowerPlaceServiceImpl extends ServiceImpl<TowerPlaceMapper, TowerPlace> implements TowerPlaceService {
-
-    @Override
-    public PageResult<TowerPlace> pageRel(TowerPlaceParam param) {
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlace> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlace> listRel(TowerPlaceParam param) {
-        List<TowerPlace> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlace, TowerPlaceParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPlace getByIdRel(Integer placeId) {
-        TowerPlaceParam param = new TowerPlaceParam();
-        param.setPlaceId(placeId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java
deleted file mode 100644
index 9607273..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPlaceStandardServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerPlaceStandardMapper;
-import com.gxwebsoft.tower.service.TowerPlaceStandardService;
-import com.gxwebsoft.tower.entity.TowerPlaceStandard;
-import com.gxwebsoft.tower.param.TowerPlaceStandardParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 检查标准附件表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 15:37:00
- */
-@Service
-public class TowerPlaceStandardServiceImpl extends ServiceImpl<TowerPlaceStandardMapper, TowerPlaceStandard> implements TowerPlaceStandardService {
-
-    @Override
-    public PageResult<TowerPlaceStandard> pageRel(TowerPlaceStandardParam param) {
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerPlaceStandard> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerPlaceStandard> listRel(TowerPlaceStandardParam param) {
-        List<TowerPlaceStandard> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerPlaceStandard, TowerPlaceStandardParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerPlaceStandard getByIdRel(Integer id) {
-        TowerPlaceStandardParam param = new TowerPlaceStandardParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java
deleted file mode 100644
index bcc29f4..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectOrderServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectOrderMapper;
-import com.gxwebsoft.tower.service.TowerProjectOrderService;
-import com.gxwebsoft.tower.entity.TowerProjectOrder;
-import com.gxwebsoft.tower.param.TowerProjectOrderParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 合同签订设备清单Service实现
- *
- * @author 科技小王子
- * @since 2023-06-07 18:48:56
- */
-@Service
-public class TowerProjectOrderServiceImpl extends ServiceImpl<TowerProjectOrderMapper, TowerProjectOrder> implements TowerProjectOrderService {
-
-    @Override
-    public PageResult<TowerProjectOrder> pageRel(TowerProjectOrderParam param) {
-        PageParam<TowerProjectOrder, TowerProjectOrderParam> page = new PageParam<>(param);
-        //page.setDefaultOrder("create_time desc");
-        List<TowerProjectOrder> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectOrder> listRel(TowerProjectOrderParam param) {
-        List<TowerProjectOrder> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectOrder, TowerProjectOrderParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectOrder getByIdRel(Integer projectOrderId) {
-        TowerProjectOrderParam param = new TowerProjectOrderParam();
-        param.setProjectOrderId(projectOrderId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java
deleted file mode 100644
index 4555a61..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectPlaceServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectPlaceMapper;
-import com.gxwebsoft.tower.service.TowerProjectPlaceService;
-import com.gxwebsoft.tower.entity.TowerProjectPlace;
-import com.gxwebsoft.tower.param.TowerProjectPlaceParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 检查/保养部位配置表Service实现
- *
- * @author 科技小王子
- * @since 2023-06-08 17:22:55
- */
-@Service
-public class TowerProjectPlaceServiceImpl extends ServiceImpl<TowerProjectPlaceMapper, TowerProjectPlace> implements TowerProjectPlaceService {
-
-    @Override
-    public PageResult<TowerProjectPlace> pageRel(TowerProjectPlaceParam param) {
-        PageParam<TowerProjectPlace, TowerProjectPlaceParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProjectPlace> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectPlace> listRel(TowerProjectPlaceParam param) {
-        List<TowerProjectPlace> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectPlace, TowerProjectPlaceParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectPlace getByIdRel(Integer id) {
-        TowerProjectPlaceParam param = new TowerProjectPlaceParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java
deleted file mode 100644
index e2d4680..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectMapper;
-import com.gxwebsoft.tower.service.TowerProjectService;
-import com.gxwebsoft.tower.entity.TowerProject;
-import com.gxwebsoft.tower.param.TowerProjectParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-22 13:30:39
- */
-@Service
-public class TowerProjectServiceImpl extends ServiceImpl<TowerProjectMapper, TowerProject> implements TowerProjectService {
-
-    @Override
-    public PageResult<TowerProject> pageRel(TowerProjectParam param) {
-        PageParam<TowerProject, TowerProjectParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProject> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProject> listRel(TowerProjectParam param) {
-        List<TowerProject> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProject, TowerProjectParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProject getByIdRel(Integer projectId) {
-        TowerProjectParam param = new TowerProjectParam();
-        param.setProjectId(projectId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java
deleted file mode 100644
index 548f7ef..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerProjectUserServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerProjectUserMapper;
-import com.gxwebsoft.tower.service.TowerProjectUserService;
-import com.gxwebsoft.tower.entity.TowerProjectUser;
-import com.gxwebsoft.tower.param.TowerProjectUserParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目成员Service实现
- *
- * @author 科技小王子
- * @since 2023-06-07 15:00:32
- */
-@Service
-public class TowerProjectUserServiceImpl extends ServiceImpl<TowerProjectUserMapper, TowerProjectUser> implements TowerProjectUserService {
-
-    @Override
-    public PageResult<TowerProjectUser> pageRel(TowerProjectUserParam param) {
-        PageParam<TowerProjectUser, TowerProjectUserParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerProjectUser> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerProjectUser> listRel(TowerProjectUserParam param) {
-        List<TowerProjectUser> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerProjectUser, TowerProjectUserParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerProjectUser getByIdRel(Integer id) {
-        TowerProjectUserParam param = new TowerProjectUserParam();
-        param.setId(id);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java
deleted file mode 100644
index 984ffc9..0000000
--- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerWarehouseServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.gxwebsoft.tower.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.tower.mapper.TowerWarehouseMapper;
-import com.gxwebsoft.tower.service.TowerWarehouseService;
-import com.gxwebsoft.tower.entity.TowerWarehouse;
-import com.gxwebsoft.tower.param.TowerWarehouseParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 仓库管理Service实现
- *
- * @author 科技小王子
- * @since 2023-05-20 15:06:43
- */
-@Service
-public class TowerWarehouseServiceImpl extends ServiceImpl<TowerWarehouseMapper, TowerWarehouse> implements TowerWarehouseService {
-
-    @Override
-    public PageResult<TowerWarehouse> pageRel(TowerWarehouseParam param) {
-        PageParam<TowerWarehouse, TowerWarehouseParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        List<TowerWarehouse> list = baseMapper.selectPageRel(page, param);
-        return new PageResult<>(list, page.getTotal());
-    }
-
-    @Override
-    public List<TowerWarehouse> listRel(TowerWarehouseParam param) {
-        List<TowerWarehouse> list = baseMapper.selectListRel(param);
-        // 排序
-        PageParam<TowerWarehouse, TowerWarehouseParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
-        return page.sortRecords(list);
-    }
-
-    @Override
-    public TowerWarehouse getByIdRel(Integer warehouseId) {
-        TowerWarehouseParam param = new TowerWarehouseParam();
-        param.setWarehouseId(warehouseId);
-        return param.getOne(baseMapper.selectListRel(param));
-    }
-
-}
diff --git a/src/main/java/com/qq/weixin/mp/aes/AesException.java b/src/main/java/com/qq/weixin/mp/aes/AesException.java
deleted file mode 100644
index 868637e..0000000
--- a/src/main/java/com/qq/weixin/mp/aes/AesException.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.qq.weixin.mp.aes;
-
-@SuppressWarnings("serial")
-public class AesException extends Exception {
-
-	public final static int OK = 0;
-	public final static int ValidateSignatureError = -40001;
-	public final static int ParseJsonError = -40002;
-	public final static int ComputeSignatureError = -40003;
-	public final static int IllegalAesKey = -40004;
-	public final static int ValidateCorpidError = -40005;
-	public final static int EncryptAESError = -40006;
-	public final static int DecryptAESError = -40007;
-	public final static int IllegalBuffer = -40008;
-	public final static int EncodeBase64Error = -40009;
-	public final static int DecodeBase64Error = -40010;
-	public final static int GenReturnJsonError = -40011;
-
-	private int code;
-
-	private static String getMessage(int code) {
-		switch (code) {
-		case ValidateSignatureError:
-			return "签名验证错误";
-		case ParseJsonError:
-			return "json解析失败";
-		case ComputeSignatureError:
-			return "sha加密生成签名失败";
-		case IllegalAesKey:
-			return "SymmetricKey非法";
-		case ValidateCorpidError:
-			return "corpid校验失败";
-		case EncryptAESError:
-			return "aes加密失败";
-		case DecryptAESError:
-			return "aes解密失败";
-		case IllegalBuffer:
-			return "解密后得到的buffer非法";
-		case EncodeBase64Error:
-			return "base64加密错误";
-		case DecodeBase64Error:
-			return "base64解密错误";
-		case GenReturnJsonError:
-			return "josn生成失败";
-		default:
-			return null; // cannot be
-		}
-	}
-
-	public int getCode() {
-		return code;
-	}
-
-	AesException(int code) {
-		super(getMessage(code));
-		this.code = code;
-	}
-
-}
diff --git a/src/main/java/com/qq/weixin/mp/aes/ByteGroup.java b/src/main/java/com/qq/weixin/mp/aes/ByteGroup.java
deleted file mode 100644
index 6ba4330..0000000
--- a/src/main/java/com/qq/weixin/mp/aes/ByteGroup.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.qq.weixin.mp.aes;
-
-import java.util.ArrayList;
-
-class ByteGroup {
-	ArrayList<Byte> byteContainer = new ArrayList<Byte>();
-
-	public byte[] toBytes() {
-		byte[] bytes = new byte[byteContainer.size()];
-		for (int i = 0; i < byteContainer.size(); i++) {
-			bytes[i] = byteContainer.get(i);
-		}
-		return bytes;
-	}
-
-	public ByteGroup addBytes(byte[] bytes) {
-		for (byte b : bytes) {
-			byteContainer.add(b);
-		}
-		return this;
-	}
-
-	public int size() {
-		return byteContainer.size();
-	}
-}
diff --git a/src/main/java/com/qq/weixin/mp/aes/JsonParse.java b/src/main/java/com/qq/weixin/mp/aes/JsonParse.java
deleted file mode 100644
index 4a0f4ec..0000000
--- a/src/main/java/com/qq/weixin/mp/aes/JsonParse.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 对企业微信发送给企业后台的消息加解密示例代码.
- *
- * @copyright Copyright (c) 1998-2020 Tencent Inc.
- */
-
-// ------------------------------------------------------------------------
-
-package com.qq.weixin.mp.aes;
-
-/**
- * 针对 org.json.JSONObject,
- * 要编译打包架包json
- * 官方源码下载地址 : https://github.com/stleary/JSON-java, jar包下载地址 : https://mvnrepository.com/artifact/org.json/json
- */
-import org.json.JSONObject;
-
-
-/**
- * JsonParse class
- *
- * 提供提取消息格式中的密文及生成回复消息格式的接口.
- */
-class JsonParse {
-
-	/**
-	 * 提取出 JSON 包中的加密消息
-	 * @param jsontext 待提取的json字符串
-	 * @return 提取出的加密消息字符串
-	 * @throws AesException
-	 */
-	public static Object[] extract(String jsontext) throws AesException     {
-		Object[] result = new Object[3];
-		try {
-
-			JSONObject json = new JSONObject(jsontext);
-        	String encrypt_msg = json.getString("encrypt");
-			String tousername  = json.getString("tousername");
-			String agentid     = json.getString("agentid");
-
-			result[0] = tousername;
-			result[1] = encrypt_msg;
-			result[2] = agentid;
-			return result;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new AesException(AesException.ParseJsonError);
-		}
-	}
-
-	/**
-	 * 生成json消息
-	 * @param encrypt 加密后的消息密文
-	 * @param signature 安全签名
-	 * @param timestamp 时间戳
-	 * @param nonce 随机字符串
-	 * @return 生成的json字符串
-	 */
-	public static String generate(String encrypt, String signature, String timestamp, String nonce) {
-
-		String format = "{\"encrypt\":\"%1$s\",\"msgsignature\":\"%2$s\",\"timestamp\":\"%3$s\",\"nonce\":\"%4$s\"}";
-		return String.format(format, encrypt, signature, timestamp, nonce);
-
-	}
-}
diff --git a/src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java b/src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java
deleted file mode 100644
index f7ad49f..0000000
--- a/src/main/java/com/qq/weixin/mp/aes/PKCS7Encoder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * 对企业微信发送给企业后台的消息加解密示例代码.
- *
- * @copyright Copyright (c) 1998-2014 Tencent Inc.
- */
-
-// ------------------------------------------------------------------------
-
-package com.qq.weixin.mp.aes;
-
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-/**
- * 提供基于PKCS7算法的加解密接口.
- */
-class PKCS7Encoder {
-	static Charset CHARSET = Charset.forName("utf-8");
-	static int BLOCK_SIZE = 32;
-
-	/**
-	 * 获得对明文进行补位填充的字节.
-	 *
-	 * @param count 需要进行填充补位操作的明文字节个数
-	 * @return 补齐用的字节数组
-	 */
-	static byte[] encode(int count) {
-		// 计算需要填充的位数
-		int amountToPad = BLOCK_SIZE - (count % BLOCK_SIZE);
-		if (amountToPad == 0) {
-			amountToPad = BLOCK_SIZE;
-		}
-		// 获得补位所用的字符
-		char padChr = chr(amountToPad);
-		String tmp = new String();
-		for (int index = 0; index < amountToPad; index++) {
-			tmp += padChr;
-		}
-		return tmp.getBytes(CHARSET);
-	}
-
-	/**
-	 * 删除解密后明文的补位字符
-	 *
-	 * @param decrypted 解密后的明文
-	 * @return 删除补位字符后的明文
-	 */
-	static byte[] decode(byte[] decrypted) {
-		int pad = (int) decrypted[decrypted.length - 1];
-		if (pad < 1 || pad > 32) {
-			pad = 0;
-		}
-		return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
-	}
-
-	/**
-	 * 将数字转化成ASCII码对应的字符，用于对明文进行补码
-	 *
-	 * @param a 需要转化的数字
-	 * @return 转化得到的字符
-	 */
-	static char chr(int a) {
-		byte target = (byte) (a & 0xFF);
-		return (char) target;
-	}
-
-}
diff --git a/src/main/java/com/qq/weixin/mp/aes/SHA1.java b/src/main/java/com/qq/weixin/mp/aes/SHA1.java
deleted file mode 100644
index a6af45d..0000000
--- a/src/main/java/com/qq/weixin/mp/aes/SHA1.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 对企业微信发送给企业后台的消息加解密示例代码.
- *
- * @copyright Copyright (c) 1998-2014 Tencent Inc.
- */
-
-// ------------------------------------------------------------------------
-
-package com.qq.weixin.mp.aes;
-
-import java.security.MessageDigest;
-import java.util.Arrays;
-
-/**
- * SHA1 class
- *
- * 计算消息签名接口.
- */
-class SHA1 {
-
-	/**
-	 * 用SHA1算法生成安全签名
-	 * @param token 票据
-	 * @param timestamp 时间戳
-	 * @param nonce 随机字符串
-	 * @param encrypt 密文
-	 * @return 安全签名
-	 * @throws AesException
-	 */
-	public static String getSHA1(String token, String timestamp, String nonce, String encrypt) throws AesException
-			  {
-		try {
-			String[] array = new String[] { token, timestamp, nonce, encrypt };
-			StringBuffer sb = new StringBuffer();
-			// 字符串排序
-			Arrays.sort(array);
-			for (int i = 0; i < 4; i++) {
-				sb.append(array[i]);
-			}
-			String str = sb.toString();
-			// SHA1签名生成
-			MessageDigest md = MessageDigest.getInstance("SHA-1");
-			md.update(str.getBytes());
-			byte[] digest = md.digest();
-
-			StringBuffer hexstr = new StringBuffer();
-			String shaHex = "";
-			for (int i = 0; i < digest.length; i++) {
-				shaHex = Integer.toHexString(digest[i] & 0xFF);
-				if (shaHex.length() < 2) {
-					hexstr.append(0);
-				}
-				hexstr.append(shaHex);
-			}
-			return hexstr.toString();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new AesException(AesException.ComputeSignatureError);
-		}
-	}
-}
diff --git a/src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java b/src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java
deleted file mode 100644
index 74ef144..0000000
--- a/src/main/java/com/qq/weixin/mp/aes/WXBizJsonMsgCrypt.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- * 对企业微信发送给企业后台的消息加解密示例代码.
- *
- * @copyright Copyright (c) 1998-2014 Tencent Inc.
- */
-
-// ------------------------------------------------------------------------
-
-/**
- * 针对org.apache.commons.codec.binary.Base64，
- * 需要导入架包commons-codec-1.9（或commons-codec-1.8等其他版本）
- * 官方下载地址：http://commons.apache.org/proper/commons-codec/download_codec.cgi
- */
-package com.qq.weixin.mp.aes;
-
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.Random;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.commons.codec.binary.Base64;
-
-/**
- * 提供接收和推送给企业微信消息的加解密接口(UTF8编码的字符串).
- * <ol>
- * 	<li>第三方回复加密消息给企业微信</li>
- * 	<li>第三方收到企业微信发送的消息，验证消息的安全性，并对消息进行解密。</li>
- * </ol>
- * 说明：异常java.security.InvalidKeyException:illegal Key Size的解决方案
- * <ol>
- * 	<li>在官方网站下载JCE无限制权限策略文件（JDK7的下载地址：
- *      http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html</li>
- * 	<li>下载后解压，可以看到local_policy.jar和US_export_policy.jar以及readme.txt</li>
- * 	<li>如果安装了JRE，将两个jar文件放到%JRE_HOME%\lib\security目录下覆盖原来的文件</li>
- * 	<li>如果安装了JDK，将两个jar文件放到%JDK_HOME%\jre\lib\security目录下覆盖原来文件</li>
- * </ol>
- */
-public class WXBizJsonMsgCrypt {
-	static Charset CHARSET = Charset.forName("utf-8");
-	Base64 base64 = new Base64();
-	byte[] aesKey;
-	String token;
-	String receiveid;
-
-	/**
-	 * 构造函数
-	 * @param token 企业微信后台，开发者设置的token
-	 * @param encodingAesKey 企业微信后台，开发者设置的EncodingAESKey
-	 * @param receiveid, 不同场景含义不同，详见文档
-	 *
-	 * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
-	 */
-	public WXBizJsonMsgCrypt(String token, String encodingAesKey, String receiveid) throws AesException {
-		if (encodingAesKey.length() != 43) {
-			throw new AesException(AesException.IllegalAesKey);
-		}
-
-		this.token = token;
-		this.receiveid = receiveid;
-		aesKey = Base64.decodeBase64(encodingAesKey + "=");
-	}
-
-	// 生成4个字节的网络字节序
-	byte[] getNetworkBytesOrder(int sourceNumber) {
-		byte[] orderBytes = new byte[4];
-		orderBytes[3] = (byte) (sourceNumber & 0xFF);
-		orderBytes[2] = (byte) (sourceNumber >> 8 & 0xFF);
-		orderBytes[1] = (byte) (sourceNumber >> 16 & 0xFF);
-		orderBytes[0] = (byte) (sourceNumber >> 24 & 0xFF);
-		return orderBytes;
-	}
-
-	// 还原4个字节的网络字节序
-	int recoverNetworkBytesOrder(byte[] orderBytes) {
-		int sourceNumber = 0;
-		for (int i = 0; i < 4; i++) {
-			sourceNumber <<= 8;
-			sourceNumber |= orderBytes[i] & 0xff;
-		}
-		return sourceNumber;
-	}
-
-	// 随机生成16位字符串
-	String getRandomStr() {
-		String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-		Random random = new Random();
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < 16; i++) {
-			int number = random.nextInt(base.length());
-			sb.append(base.charAt(number));
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * 对明文进行加密.
-	 *
-	 * @param text 需要加密的明文
-	 * @return 加密后base64编码的字符串
-	 * @throws AesException aes加密失败
-	 */
-	String encrypt(String randomStr, String text) throws AesException {
-		ByteGroup byteCollector = new ByteGroup();
-		byte[] randomStrBytes = randomStr.getBytes(CHARSET);
-		byte[] textBytes = text.getBytes(CHARSET);
-		byte[] networkBytesOrder = getNetworkBytesOrder(textBytes.length);
-		byte[] receiveidBytes = receiveid.getBytes(CHARSET);
-
-		// randomStr + networkBytesOrder + text + receiveid
-		byteCollector.addBytes(randomStrBytes);
-		byteCollector.addBytes(networkBytesOrder);
-		byteCollector.addBytes(textBytes);
-		byteCollector.addBytes(receiveidBytes);
-
-		// ... + pad: 使用自定义的填充方式对明文进行补位填充
-		byte[] padBytes = PKCS7Encoder.encode(byteCollector.size());
-		byteCollector.addBytes(padBytes);
-
-		// 获得最终的字节流, 未加密
-		byte[] unencrypted = byteCollector.toBytes();
-
-		try {
-			// 设置加密模式为AES的CBC模式
-			Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
-			SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
-			IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16);
-			cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
-
-			// 加密
-			byte[] encrypted = cipher.doFinal(unencrypted);
-
-			// 使用BASE64对加密后的字符串进行编码
-			String base64Encrypted = base64.encodeToString(encrypted);
-
-			return base64Encrypted;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new AesException(AesException.EncryptAESError);
-		}
-	}
-
-	/**
-	 * 对密文进行解密.
-	 *
-	 * @param text 需要解密的密文
-	 * @return 解密得到的明文
-	 * @throws AesException aes解密失败
-	 */
-	String decrypt(String text) throws AesException {
-		byte[] original;
-		try {
-			// 设置解密模式为AES的CBC模式
-			Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
-			SecretKeySpec key_spec = new SecretKeySpec(aesKey, "AES");
-			IvParameterSpec iv = new IvParameterSpec(Arrays.copyOfRange(aesKey, 0, 16));
-			cipher.init(Cipher.DECRYPT_MODE, key_spec, iv);
-
-			// 使用BASE64对密文进行解码
-			byte[] encrypted = Base64.decodeBase64(text);
-
-			// 解密
-			original = cipher.doFinal(encrypted);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new AesException(AesException.DecryptAESError);
-		}
-
-		String jsonContent, from_receiveid;
-		try {
-			// 去除补位字符
-			byte[] bytes = PKCS7Encoder.decode(original);
-
-			// 分离16位随机字符串,网络字节序和receiveid
-			byte[] networkOrder = Arrays.copyOfRange(bytes, 16, 20);
-
-			int jsonLength = recoverNetworkBytesOrder(networkOrder);
-
-			jsonContent = new String(Arrays.copyOfRange(bytes, 20, 20 + jsonLength), CHARSET);
-			from_receiveid = new String(Arrays.copyOfRange(bytes, 20 + jsonLength, bytes.length),
-					CHARSET);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new AesException(AesException.IllegalBuffer);
-		}
-
-		// receiveid不相同的情况
-		if (!from_receiveid.equals(receiveid)) {
-			throw new AesException(AesException.ValidateCorpidError);
-		}
-		return jsonContent;
-
-	}
-
-	/**
-	 * 将企业微信回复用户的消息加密打包.
-	 * <ol>
-	 * 	<li>对要发送的消息进行AES-CBC加密</li>
-	 * 	<li>生成安全签名</li>
-	 * 	<li>将消息密文和安全签名打包成json格式</li>
-	 * </ol>
-	 *
-	 * @param replyMsg 企业微信待回复用户的消息，json格式的字符串
-	 * @param timeStamp 时间戳，可以自己生成，也可以用URL参数的timestamp
-	 * @param nonce 随机串，可以自己生成，也可以用URL参数的nonce
-	 *
-	 * @return 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的json格式的字符串
-	 * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
-	 */
-	public String EncryptMsg(String replyMsg, String timeStamp, String nonce) throws AesException {
-		// 加密
-		String encrypt = encrypt(getRandomStr(), replyMsg);
-
-		// 生成安全签名
-		if (timeStamp == "") {
-			timeStamp = Long.toString(System.currentTimeMillis());
-		}
-
-		String signature = SHA1.getSHA1(token, timeStamp, nonce, encrypt);
-
-		// System.out.println("发送给平台的签名是: " + signature[1].toString());
-		// 生成发送的json
-		String result = JsonParse.generate(encrypt, signature, timeStamp, nonce);
-		return result;
-	}
-
-	/**
-	 * 检验消息的真实性，并且获取解密后的明文.
-	 * <ol>
-	 * 	<li>利用收到的密文生成安全签名，进行签名验证</li>
-	 * 	<li>若验证通过，则提取json中的加密消息</li>
-	 * 	<li>对消息进行解密</li>
-	 * </ol>
-	 *
-	 * @param msgSignature 签名串，对应URL参数的msg_signature
-	 * @param timeStamp 时间戳，对应URL参数的timestamp
-	 * @param nonce 随机串，对应URL参数的nonce
-	 * @param postData 密文，对应POST请求的数据
-	 *
-	 * @return 解密后的原文
-	 * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
-	 */
-	public String DecryptMsg(String msgSignature, String timeStamp, String nonce, String postData)
-			throws AesException {
-
-		// 密钥，公众账号的app secret
-		// 提取密文
-		Object[] encrypt = JsonParse.extract(postData);
-
-		// 验证安全签名
-		String signature = SHA1.getSHA1(token, timeStamp, nonce, encrypt[1].toString());
-
-		// 和URL中的签名比较是否相等
-		// System.out.println("第三方收到URL中的签名：" + msg_sign);
-		// System.out.println("第三方校验签名：" + signature);
-		if (!signature.equals(msgSignature)) {
-			throw new AesException(AesException.ValidateSignatureError);
-		}
-
-		// 解密
-		String result = decrypt(encrypt[1].toString());
-		return result;
-	}
-
-	/**
-	 * 验证URL
-	 * @param msgSignature 签名串，对应URL参数的msg_signature
-	 * @param timeStamp 时间戳，对应URL参数的timestamp
-	 * @param nonce 随机串，对应URL参数的nonce
-	 * @param echoStr 随机串，对应URL参数的echostr
-	 *
-	 * @return 解密之后的echostr
-	 * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
-	 */
-	public String VerifyURL(String msgSignature, String timeStamp, String nonce, String echoStr)
-			throws AesException {
-		String signature = SHA1.getSHA1(token, timeStamp, nonce, echoStr);
-
-		if (!signature.equals(msgSignature)) {
-			throw new AesException(AesException.ValidateSignatureError);
-		}
-
-		String result = decrypt(echoStr);
-		return result;
-	}
-
-}
diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index f279613..0000000
--- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "properties": [
-    {
-      "name": "config.upload-path",
-      "type": "java.lang.String",
-      "description": "Description for config.upload-path."
-    },
-    {
-      "name": "alipay.appCertPath",
-      "type": "java.lang.String",
-      "description": "Description for alipay.appCertPath."
-    },
-    {
-      "name": "alipay.alipayCertPath",
-      "type": "java.lang.String",
-      "description": "Description for alipay.alipayCertPath."
-    },
-    {
-      "name": "alipay.serverUrl",
-      "type": "java.lang.String",
-      "description": "Description for alipay.serverUrl."
-    },
-    {
-      "name": "config.server-url",
-      "type": "java.lang.String",
-      "description": "Description for config.server-url."
-    },
-    {
-      "name": "config.upload-server",
-      "type": "java.lang.String",
-      "description": "Description for config.upload-server."
-    },
-    {
-      "name": "socketio.host",
-      "type": "java.lang.String",
-      "description": "Description for socketio.host."
-    },
-    {
-      "name": "socketio.port",
-      "type": "java.lang.String",
-      "description": "Description for socketio.port."
-    },
-    {
-      "name": "config.endpoint",
-      "type": "java.lang.String",
-      "description": "Description for config.endpoint."
-    },
-    {
-      "name": "config.accessKeyId",
-      "type": "java.lang.String",
-      "description": "Description for config.accessKeyId."
-    }
-  ] }
diff --git a/src/main/resources/alipay-sandbox.properties b/src/main/resources/alipay-sandbox.properties
deleted file mode 100644
index 08322e0..0000000
--- a/src/main/resources/alipay-sandbox.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# appId
-alipay.app-id=2016091100489486
-
-# sellerId
-alipay.seller-id=2088102175207292
-
-# ??
-alipay.gateway-url=https://openapi.alipaydev.com/gateway.do
-
-# ??
-alipay.merchant-private-key=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCRY5kTUJCdXdpFmeG5/FryFFirtvsDA0OZzjGiBrSqPm8d6NUWgFmHLVyS/NhpHVK/iaYgcu1tYhZdKrmSSKNp/bcsbExk7MKtZrWCVSqJxxC8TdS9l8/T41PMJc0MMW9kZiZVtv0qVBmkYmcc2CR4R126rzx/A/8Rvseh8KvcxBf2SAzAi4ucIl4SuyhVwzgRWHTsNM8AphiHmO94bZOepGstR6E48AAr2c5MPH3+RUQO+v+f+2RI+keh4GvyzJmCV357Tz2Fv8LjIgSO61OX+LOhJUtQNrsCuPpG3qYPZJTmEdi4N9Ejc+IY+JPCjbaHlp8605VqGY90nwxKybrjAgMBAAECggEAOg724wKqLV18O40e2gGPY9qCKlhQ1rwn87Sml1hsLwvtnZkL9wdcOSIBNOVpmlhOYhSa1Zxved3QpnXYUzVUpI/f5Qp+W1M8zrgURa6y5QAsi7Xc/bUxFiFSplR2FKdtHz+3kUUYxh19e+qb2KXrsmh1YoZ19xbmdfSkjeOpDehamEsrQLsuIyJ9SoWC3+TxPxfVqhHBrC/hweyMTLY6TLP2x6dxJaUA26GcD+4mj9/5zt+ZTC1WIMKgjhselvhmOG1bHhyFpZyibiKnjNTqKPDlQzurCxgkNWBWZrOONbPQEAOfotMirYB2pXacAIaOhSeaOGcdVWqY5UgqGy46EQKBgQDJxDs0dIpNaG194MxRxVizIIeeS3BkxDE9JJxCNWUpZl5jG/ve3sO7007LL6+LsCUhb9Hd9CvToRCNKtC7BngexcluJRRGjtdN3TxJqkR7/ZOjd7Z+NC19w1RdrOqtZdPxx0k4pbFku3fD60gEmPj5ors6hNpfkdvoZQhSd+9leQKBgQC4d/kSDLtX59Akr+88Pf8LicX2oBGRFI+P1/R8u1CTRljWVKvCiYj24J+EkZGCgi3aOlrj1SmBg0DNlNSfJhJ6yYKdHzsOG2G2TySPzy0UBFxV9DDor9FpVEgZktKOuQUhlNBvQbb+vGkL+aheBusmZ0ve8cQ3CuvOF27meWoYOwKBgQCwsaGrmVe43HfuodwszCeWjylVTfl6tXntcs9JCBu0esqz/sC/d9Rv+2hodjVEnpiVxKhEuN1csxOcnN84ujydrlZtmBk+hT82GEYAuRTKhNIzeNYfhbBFD7clZhYKjj9i4ERWUHyem7IRqE1kgVagv4s5fzkCMukjhr8YAaJr+QKBgBEn3zslgfrf7USsNBSnM2QQUR/prRiQD/XxwKQlC45W2YY9Y6f5AIrtQwiiPSUlFDyadr9/oJeR7GHyOIAAm3Fd8k7Ii8Z5F3JME/tn6ipVaXz489+AEnq4QuhV9k0dufNwkp32P52bSi2570WnYRE2RCEc3QG9e0a0eTToD8znAoGBAIXtfDz1GI2YkyYbXlaO2uV7zZpEwmCJYJ2+LYk/7Y9q+n2taHGRXCB8UFShftEZEWOWomelQ7msKuUGr+LNnPl8hplFvd20oPuRXjJivYQ/w07UHyMQRVG8NUwGOkCeNEnl6Z+9b/Y3OCvdGqId8fbzeF3INAWjNMew7Ou/5W7X
-
-# ??
-alipay.alipay-public-key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkMC5Y9MXXCMuK0CzYO9zZc40qile3IxNWonmKREP9GjWcVQaptMMUol4A0fjY8rg9lWnREenGhQ4QfWztpS66CPcR43NRq4sHOFwDfSQNpIf94q80MSggc61tP+oKRCCFRUivq3ggJg9L7TEyziAoVIZeDkg2Fi6VMxZiAmvbUTRg4T1Eq9PCRZ9g4V1t3lJzsyRJH+KsZ9xyA5SsAW+dAiYY5LgiFsSgcUXtaEMtsxHerXs6dNMb1uA0DqpEhxFuuNbFGwO57XJHThe1+RUBiqiqsKxcU0m5YsZP5pAcQJCI+3TPpPQKhba4Z859NbD9tTGMTzzoXXRpN4p3cHvQwIDAQAB
-
-# ????
-alipay.content-key=hNlmFfkrJX0tmIuNqeee0w==
-
-# ????
-alipay.return-url=
diff --git a/src/main/resources/application-jimei.yml b/src/main/resources/application-jimei.yml
deleted file mode 100644
index 7a6ad71..0000000
--- a/src/main/resources/application-jimei.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# 生产环境配置
-
-# 数据源配置
-spring:
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3318/jm_love?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-    username: jm_love
-    password: wHekGWckTYbLtfWh
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-
-# 日志配置
-logging:
-  file:
-    name: websoft-api.log
-  level:
-    root: WARN
-    com.gxwebsoft: ERROR
-    com.baomidou.mybatisplus: ERROR
-
-socketio:
-  host: 0.0.0.0 #IP地址
-
-# 框架配置
-config:
-  # 生产环境接口
-  server-url: https://server.jimeigroup.cn/api
-  file-server: https://file.jimeigroup.cn
-  upload-path: /wsdata/wwwroot/file.ws/
-
-  # 阿里云OSS云存储
-  endpoint: https://oss-cn-shenzhen.aliyuncs.com
-  accessKeyId: LTAI5tFcrUsMQQGyjAtGFj7Z
-  accessKeySecret: rlm9mMxFLmsnVZAvlFi7mjqGfgrawH
-  bucketName: file-jimei
-  bucketDomain: https://oss.jimeigroup.cn
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 0fac12c..3506c6e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -3,9 +3,9 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
-    username: com_gxwebsoft_oa
-    password: EZfW2R4YiWfbLHLw
+    url: jdbc:mysql://47.119.165.234:3308/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: modules
+    password: FYJGx7s8yt7K8xDH
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
diff --git a/src/main/resources/cert/alipayPublicCert.crt b/src/main/resources/cert/alipayPublicCert.crt
deleted file mode 100644
index 157614d..0000000
--- a/src/main/resources/cert/alipayPublicCert.crt
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIQICISFUe9Mqj+pWqb2fs9jDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCQ04xGzAZBgNVBAoMEkFudCBGaW5hbmNpYWwgdGVzdDElMCMGA1UECwwcQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkgdGVzdDE+MDwGA1UEAww1QW50IEZpbmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSBDbGFzcyAyIFIxIHRlc3QwHhcNMjIxMjE1MDExMjA0WhcNMjMxMjE1MDExMjA0WjB6
-MQswCQYDVQQGEwJDTjEVMBMGA1UECgwM5rKZ566x546v5aKDMQ8wDQYDVQQLDAZBbGlwYXkxQzBB
-BgNVBAMMOuaUr+S7mOWunSjkuK3lm70p572R57uc5oqA5pyv5pyJ6ZmQ5YWs5Y+4LTIwODgxMDIx
-NzUyMDcyOTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQwLlj0xdcIy4rQLNg73Nl
-zjSqKV7cjE1aieYpEQ/0aNZxVBqm0wxSiXgDR+NjyuD2VadER6caFDhB9bO2lLroI9xHjc1Griwc
-4XAN9JA2kh/3irzQxKCBzrW0/6gpEIIVFSK+reCAmD0vtMTLOIChUhl4OSDYWLpUzFmICa9tRNGD
-hPUSr08JFn2DhXW3eUnOzJEkf4qxn3HIDlKwBb50CJhjkuCIWxKBxRe1oQy2zEd6tezp00xvW4DQ
-OqkSHEW641sUbA7ntckdOF7X5FQGKqKqwrFxTSblixk/mkBxAkIj7dM+k9AqFtrhnzn01sP21MYx
-PPOhddGk3indwe9DAgMBAAGjEjAQMA4GA1UdDwEB/wQEAwIE8DANBgkqhkiG9w0BAQsFAAOCAQEA
-xJXsNQ5rDQBwn8BXYuSaj1Hkw8W3wKRr55Y2fDoQIx2kek9kI53PRvIVAdxlrLxZ6z+lTFrkThJ/
-rsH84ffkDvfSTca3QCB6c01jveQ+qGvGQSx/HPu92DMT/hJ0V8LstLlq6Q1r8hTvcjHOPyE9l3vF
-I0Ozbe2F3TCOFFjtEjHHOw9bo+tB8gtiY/bfidPbTtCClTTyPRTE8MuzQqDABhGl3khL4aue9h8g
-x0i0yAn15VBf9ruqlTrTnhuI5ak7AOwdxjKaMwVbTCy838rQjt4xKMD80h2go/6MLRGidnbeiTU2
-Uq3PVgEJo2kxE8ZSD7x4JtskZD07YCSA5DZtuw==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDszCCApugAwIBAgIQIBkIGbgVxq210KxLJ+YA/TANBgkqhkiG9w0BAQsFADCBhDELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxJTAjBgNVBAsMHENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IHRlc3QxNjA0BgNVBAMMLUFudCBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgUjEgdGVzdDAeFw0xOTA4MTkxMTE2MDBaFw0yNDA4MDExMTE2MDBaMIGRMQswCQYDVQQGEwJD
-TjEbMBkGA1UECgwSQW50IEZpbmFuY2lhbCB0ZXN0MSUwIwYDVQQLDBxDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSB0ZXN0MT4wPAYDVQQDDDVBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IENsYXNzIDIgUjEgdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMh4FKYO
-ZyRQHD6eFbPKZeSAnrfjfU7xmS9Yoozuu+iuqZlb6Z0SPLUqqTZAFZejOcmr07ln/pwZxluqplxC
-5+B48End4nclDMlT5HPrDr3W0frs6Xsa2ZNcyil/iKNB5MbGll8LRAxntsKvZZj6vUTMb705gYgm
-VUMILwi/ZxKTQqBtkT/kQQ5y6nOZsj7XI5rYdz6qqOROrpvS/d7iypdHOMIM9Iz9DlL1mrCykbBi
-t25y+gTeXmuisHUwqaRpwtCGK4BayCqxRGbNipe6W73EK9lBrrzNtTr9NaysesT/v+l25JHCL9tG
-wpNr1oWFzk4IHVOg0ORiQ6SUgxZUTYcCAwEAAaMSMBAwDgYDVR0PAQH/BAQDAgTwMA0GCSqGSIb3
-DQEBCwUAA4IBAQBWThEoIaQoBX2YeRY/I8gu6TYnFXtyuCljANnXnM38ft+ikhE5mMNgKmJYLHvT
-yWWWgwHoSAWEuml7EGbE/2AK2h3k0MdfiWLzdmpPCRG/RJHk6UB1pMHPilI+c0MVu16OPpKbg5Vf
-LTv7dsAB40AzKsvyYw88/Ezi1osTXo6QQwda7uefvudirtb8FcQM9R66cJxl3kt1FXbpYwheIm/p
-j1mq64swCoIYu4NrsUYtn6CV542DTQMI5QdXkn+PzUUly8F6kDp+KpMNd0avfWNL5+O++z+F5Szy
-1CPta1D7EQ/eYmMP+mOQ35oifWIoFCpN6qQVBS/Hob1J/UUyg7BW
------END CERTIFICATE-----
diff --git a/src/main/resources/cert/alipayRootCert.crt b/src/main/resources/cert/alipayRootCert.crt
deleted file mode 100644
index 76417c5..0000000
--- a/src/main/resources/cert/alipayRootCert.crt
+++ /dev/null
@@ -1,88 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
-EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
-MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
-UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
-MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
-V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
-W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
-MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
-53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
-pDoiVhsLwg==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
-MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
-BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
-rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
-xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
-dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
-vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
-YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
-Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
-DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
-SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
-PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
-9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
-AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
-tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
-nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
-tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
-JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
-IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
-05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
-T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
-kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
-PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
-1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
-jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
-77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
-kT9qhqn+lw==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
-EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
-WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
-CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
-YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
-WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
-rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
-4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
-zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
-wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
-Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
-BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
-E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
-MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
-MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
-bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
-b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
-nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
-4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
-wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
-WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
-z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
-KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
-uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
-emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
-U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
-UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
-DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
-1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
-Yf4Zr0fJsGuv
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/main/resources/cert/appPublicCert.crt b/src/main/resources/cert/appPublicCert.crt
deleted file mode 100644
index a12dea4..0000000
--- a/src/main/resources/cert/appPublicCert.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDjzCCAnegAwIBAgIQICISFPMNDPadFdV3VF7atzANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCQ04xGzAZBgNVBAoMEkFudCBGaW5hbmNpYWwgdGVzdDElMCMGA1UECwwcQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkgdGVzdDE+MDwGA1UEAww1QW50IEZpbmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSBDbGFzcyAyIFIxIHRlc3QwHhcNMjIxMjE0MTEzNjE3WhcNMjMxMjE5MTEzNjE3WjBh
-MQswCQYDVQQGEwJDTjEVMBMGA1UECgwM5rKZ566x546v5aKDMQ8wDQYDVQQLDAZBbGlwYXkxKjAo
-BgNVBAMMITIwODgxMDIxNzUyMDcyOTItMjAxNjA5MTEwMDQ4OTQ4NjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJFjmRNQkJ1d2kWZ4bn8WvIUWKu2+wMDQ5nOMaIGtKo+bx3o1RaAWYct
-XJL82GkdUr+JpiBy7W1iFl0quZJIo2n9tyxsTGTswq1mtYJVKonHELxN1L2Xz9PjU8wlzQwxb2Rm
-JlW2/SpUGaRiZxzYJHhHXbqvPH8D/xG+x6Hwq9zEF/ZIDMCLi5wiXhK7KFXDOBFYdOw0zwCmGIeY
-73htk56kay1HoTjwACvZzkw8ff5FRA76/5/7ZEj6R6Hga/LMmYJXfntPPYW/wuMiBI7rU5f4s6El
-S1A2uwK4+kbepg9klOYR2Lg30SNz4hj4k8KNtoeWnzrTlWoZj3SfDErJuuMCAwEAAaMSMBAwDgYD
-VR0PAQH/BAQDAgTwMA0GCSqGSIb3DQEBCwUAA4IBAQC9YAgw5uwHUgY73t8eABW8LzrhLoUafN/j
-WG6QataRgaTHbNCuCz5yWTMmD7hZGmb8NuZzaLOPD+/0yM5nz+w/nc+Emc6hzTCrBVtFX80nnM3j
-lIDBRGJRS2JlyrwL80DxoVCbY7JLkSRpGhc9RYLrNfPjpxhxchJ/8V1JU21rL5GKSdaR2YJDvANi
-Bth321Q0G6djxfLPjx3zXp8VTGDdhRZjblJ7EddK4kaQ3RKTm4+UivUYMMQ+esD8NnoHTGvDXRCi
-rqd+EtAZZ84yqW7YKKTjsh9a3tLBFwFMc2A2WM3s6fXtrFAiffsXwcyqaKTXibVTFE9t2sTUUaPF
-IoJu
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/main/resources/express.properties b/src/main/resources/express.properties
deleted file mode 100644
index c7ce1b5..0000000
--- a/src/main/resources/express.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-express.dev-id=1651421896
-express.dev-key=2f10570c5057570fe0e488a425a6d813
-express.server-host=https://openic.sf-express.com
-express.shop-id=3243279847393
diff --git a/src/main/resources/mp-alipay.properties b/src/main/resources/mp-alipay.properties
deleted file mode 100644
index e0d3d36..0000000
--- a/src/main/resources/mp-alipay.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# APPID
-alipay.app-id=2021003156628508
-
-# ??ID
-alipay.seller-id=2088431805524422
-
-# ?????
-alipay.gateway-url=https://openapi.alipay.com/gateway.do
-
-# ????
-alipay.merchant-private-key=MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCB0yG7GKPjNIEhpjS6T4um1W92BcgLKh2p28vB12dapWFB9eg3a1/jh66egKEyPR0NowZGvcaWOAZ/HXyCcDnpnFix/s/Yqb85Uwq9uFrkmB3ms2RHm3TM+WNnENcLy0wVCekcR1kcZZuYVWs/xHar/omoSAAhWdMWApVAwrFFCHZxCuIw0VaJbmlfFQedlVbfXgE94n+lNi5rG0JSnMo6MQimBCaeIfsZlWbKFBH9mrEpkte+Q4vJDH6p6odpG/hkhC+9VascMLwhW4N3+5g7GDRj1QGM7HjWou2cQ36w5LCU8xk55ur50c6HcxoQqZjFUvykfCYSNMThUhLHrnnHAgMBAAECggEACECplkEcueauhrsQAv/nerV6nmADtWH5/MAyFaJhuYtlwVGmb09uCwKnAQBgPtdPr3w7e+e4ZfgtwYrYTVpg9A6yPK5b/APeWgCDYEgFzx40WGPy7fJd3GHGBdk2MlO8BGJa5SdL7NgwqeBULvuIJ6rIiV/6UiRpnK6RWkqGBkNKO9AqQSGbvTI8jJ+NBAqmLeIk7Os9kCOiwZLqwPI9XVd+/exeOwsMTo/K5mKqpc1MltAhXYoeuzHGYtOyPCsgOOu3EBbivSCBN5gqy87JohJAScVmCyPTmDq1E2N6JkSujrBpS70VstnAt6g4fZQoidC9aSqF/i8xID8a0rI8wQKBgQDBsG/MQnLvvuonTLeHd7A737V4qRWTtntpxXJ8VWTl+M9PYoA7J4SKRicxvCHka2Cr1ITL62bEfl1MRFmz9BsKlpBVxhsOT49CPMIedpq3e92iOR/SqF161A1DBSVNYziTIbE6h5I1gZp+ZcFLKXXtsu0LpzNgYJlnS6V0e66UMQKBgQCrlwqNL+H5PPAOhiFswUK9ztjoAks7nBE8B//EJ29M3mUFf0isNMj8ta7DPQsQK1zmej/PQSKRoG/t55ao8Svrd29d2V4UYUNQWMb3YWN+QGdIy1ta25hJlwdkKbQJIYAQ8/8i5Y6BnCLwLuj7KMpWBuPWkl2YDfRjJlAhz85HdwKBgQCweVFjiieuyQQPSpbtlt+7rdhqV6SRMXLArGXjYurLnidE7Tpoq1jXo5OSfRdkR3GNHdTg91prLbdUBfK1Q3Rf8U8Q169PGq4sa69ykh3lj7YgWGvmRADoKMzsg4O5Pu4NIGWaLmvI1I0vHQdAtEX+jUftlin5ZgpfU00tFIO8AQKBgQClK45Hm9js3sDBalHQazQAm5TluBeNOMzKOXT073TOzKD3qq9cvK7fu0+PtjnpBaS2YuT7btqEzagQnMXEt+osDdrQvwU1nu558AsOY9uu0vXY949npUwxQkUmIJKh23J4Xzav88K6dn6XLsCry3cBWj6E9H1NedlOe7nU4kDRPwKBgQC1oK7oeO0qSNGE8bhnZLAyRnmWLGGSPMf+oBocox4nixcknrPjsWBEJcI0keGanaiam94VkftFnl2c6ZW8229bpimdYj9891VN+8NvBSYTR7lOuTXRZUtTLu9ocgJ/aGQJRXHs+hwZeHcY1PnEkCi6IJXb6e2+Kq2mbdz30mqOww==
-
-# ?????
-alipay.alipay-public-key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgdMhuxij4zSBIaY0uk+LptVvdgXICyodqdvLwddnWqVhQfXoN2tf44eunoChMj0dDaMGRr3GljgGfx18gnA56ZxYsf7P2Km/OVMKvbha5Jgd5rNkR5t0zPljZxDXC8tMFQnpHEdZHGWbmFVrP8R2q/6JqEgAIVnTFgKVQMKxRQh2cQriMNFWiW5pXxUHnZVW314BPeJ/pTYuaxtCUpzKOjEIpgQmniH7GZVmyhQR/ZqxKZLXvkOLyQx+qeqHaRv4ZIQvvVWrHDC8IVuDd/uYOxg0Y9UBjOx41qLtnEN+sOSwlPMZOebq+dHOh3MaEKmYxVL8pHwmEjTE4VISx655xwIDAQAB
-
-# ??????
-alipay.content-key=hNlmFfkrJX0tmIuNqeee0w==
-
-# ??????
-alipay.return-url=https://78d3-240e-355-73e-b300-4d34-1851-e9b7-3a3b.jp.ngrok.io
-#
-#alipay.app-cert-path=/Users/gxwebsoft/Documents/cert/appCertPublicKey.crt
-#
-#alipay.alipay-cert-path=/Users/gxwebsoft/Documents/cert/alipayCertPublicKey_RSA2.crt
-#
-#alipay.alipay-root-cert-path=/Users/gxwebsoft/Documents/cert/alipayRootCert.crt
-#
-#alipay.appPublicKey=/www/jar/com.gxwebsoft.server/cert/appCertPublicKey.crt
-#
-#alipay.alipayPublicCert=/www/jar/com.gxwebsoft.server/cert/alipayCertPublicKey_RSA2.crt
-#
-#alipay.alipayRootCert-path=/www/jar/com.gxwebsoft.server/cert/alipayRootCert.crt
diff --git a/src/main/resources/wxpay.properties b/src/main/resources/wxpay.properties
deleted file mode 100644
index 7cbf33e..0000000
--- a/src/main/resources/wxpay.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# ???
-wxpay.mch-id=1246610101
-
-# ?????
-wxpay.mch-serial-no=1296F3D7E17B5E6437B14F6CD4D84EFAC3537D19
-
-# ??????
-wxpay.key-path=apiclient_cert.pem
-
-# APIv3??
-wxpay.api-v3-key=zSYK4526prYmMTg2hfsHvPdRpufqhjZW
-
-# APPID
-wxpay.app-id=wxa67c676fc445590e
-
-# ???????
-wxpay.domain=https://api.mch.weixin.qq.com
-
-# ????????
-wxpay.notify-domain=https://78d3-240e-355-73e-b300-4d34-1851-e9b7-3a3b.jp.ngrok.io
diff --git a/src/test/java/com/gxwebsoft/TestMain.java b/src/test/java/com/gxwebsoft/TestMain.java
index 4bed4ab..86c1be2 100644
--- a/src/test/java/com/gxwebsoft/TestMain.java
+++ b/src/test/java/com/gxwebsoft/TestMain.java
@@ -1,283 +1,19 @@
 package com.gxwebsoft;
 
-import com.gxwebsoft.apps.service.HualalaService;
-import com.gxwebsoft.apps.service.TestDataService;
-import com.gxwebsoft.common.system.mapper.RoleMapper;
-import com.gxwebsoft.common.system.mapper.UserMapper;
-import com.gxwebsoft.common.system.service.SettingService;
-import com.gxwebsoft.common.system.service.UserService;
-import com.gxwebsoft.love.service.CertificateService;
-import com.gxwebsoft.shop.mapper.OrderGoodsMapper;
-import com.gxwebsoft.shop.mapper.OrderMapper;
-import com.gxwebsoft.shop.service.OrderService;
+import com.gxwebsoft.common.core.security.JwtUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-import javax.annotation.Resource;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 
 /**
  * Created by WebSoft on 2020-03-23 23:37
  */
 @SpringBootTest
 public class TestMain {
-  @Resource
-  private StringRedisTemplate stringRedisTemplate;
-  @Resource
-  private OrderService orderService;
-  @Resource
-  private OrderGoodsMapper orderGoodsMapper;
-  @Resource
-  private OrderMapper orderMapper;
-  @Resource
-  private TestDataService testDataService;
-  @Resource
-  private HualalaService hualalaService;
-  @Resource
-  private SettingService settingService;
-  @Resource
-  private UserService userService;
-  @Resource
-  private UserMapper userMapper;
-  @Resource
-  private RoleMapper roleMapper;
-
-  @Resource
-  private CertificateService certificateService;
-
   /**
    * 生成唯一的key用于jwt工具类
    */
-//  @Test
-//  public void testGenJwtKey() {
-//    System.out.println(JwtUtil.encodeKey(JwtUtil.randomKey()));
-//  }
-
-  /**
-   * 生成加密后的登录密码
-   * @return
-   */
   @Test
-  public void testEncodePassword() throws UnsupportedEncodingException {
-//    DateTime date = DateUtil.date();
-//    System.out.println("date = " + date);
-//    final String today = DateUtil.today();
-//    System.out.println("today = " + today);
-//    final DateTime dateTime = DateUtil.beginOfDay(date);
-//    System.out.println("dateTime = " + dateTime);
-//    System.out.println(new BCryptPasswordEncoder().encode("admin"));
-    String encodedReturnUrl = URLEncoder.encode("https://server.gxwebsoft.com/api/open/wx-work/saveAccessToken","UTF-8");
-//    System.out.println("encodedReturnUrl = " + encodedReturnUrl);
-//    System.out.println("encodedReturnUrl = " + encodedReturnUrl);
-//    log.info("生成加密后的登录密码:" + encodedReturnUrl);
-  }
-
-//  @Test
-//  public void test3() {
-//    String key = "test:user:10";
-//    HashMap<String, Object> map = new HashMap<>();
-//    map.put("name", "科技小王子");
-//    map.put("sex", "男");
-//    map.put("phone", "13737128880");
-//    map.put("money", "238585.215");
-//    stringRedisTemplate.opsForHash().putAll(key, map);
-//  }
-
-//      OrderParam param = new OrderParam();
-//      param.setPayStatus(30);
-//      param.setOrderNo("202303118310602");
-//      final List<Order> all = orderMapper.getAll(param);
-//      System.out.println("all = " + all);
-//      OrderParam param = new OrderParam();
-//      param.setOrderNo("2023031181184283");
-//      param.setPayStatus(20);
-//      boolean b = orderMapper.updatePayStatus(param);
-//      System.out.println("b = " + b);
-
-//      Order order = orderService.getByOutTradeNo("20230301761610059");
-//      OrderParam orderParam = new OrderParam();
-//      orderParam.setPayStatus(20);
-//      orderParam.setOrderNo("20230301761610059");
-//      orderMapper.updatePayStatus(orderParam);
-//      System.out.println("order = " + order);
-//      Order order = new Order();
-//      order.setOrderId(400);
-//      order.setComments("sdfsdfsdfs");
-//
-//      boolean update = orderService.lambdaUpdate()
-//        .eq(Order::getOrderId, order.getOrderId())
-//        .update(order);
-//      System.out.println("update = " + update);
-
-//      OrderParam param = new OrderParam();
-//      param.setOrderNo("20230301761610059");
-//      Order order = orderService.getByOutTradeNo("20230301761610059");
-//      System.out.println("order = " + order);
-//      final int i = orderMapper.updateById(order);
-//      System.out.println("i = " + i);
-
-
-//      final Order one = param.getOne(orderMapper.getOne(param));
-//      one.setTotalPrice(new BigDecimal("2.22"));
-//      one.setPayStatus(20);
-//      orderMapper.updateById(one);
-//      System.out.println("one = " + one);
-//      Order order = orderService.getByOutTradeNo("20230301761610059");
-//      order.setPayStatus(20);
-//      order.setTotalPrice(new BigDecimal("1.11"));
-//      if (orderService.updateById(order)) {
-//        System.out.println("成功");
-//      }
-
-//  @Test
-//  public void test() {
-//      final TestData testData = new TestData();
-//      testData.setTitle("测试");
-//      testData.setContent("内容...");
-//      testData.setTenantId(10);
-//      testDataService.save(testData);
-
-//    final boolean b = testDataService.removeById(2496);
-
-//  }
-
-//  @Test
-//  public void query() {
-//    HashMap<String, Object> params = new HashMap<>();
-//    params.put("shopID", Long.valueOf("76230180"));
-//    JSONObject response = hualalaService.doPost("/doc/getPaySubject", params);
-//    System.out.println("response = " + response);
-//  }
-
-  // 推送订单到哗啦啦
-//    @Test
-//    public void pushOrder(){
-//      Order orderInfo = orderService.getByOutTradeNo("202303118345835");
-//      final List<OrderGoods> goodsInfo = orderGoodsMapper.selectByOrderId(orderInfo.getOrderId());
-//      System.out.println("orderInfo = " + orderInfo);
-//      System.out.println("goodsInfo = " + goodsInfo);
-//      // 菜品信息
-//      ArrayList<Object> orderItem = new ArrayList<>();
-//      JSONObject item = new JSONObject();
-//      item.put("foodID",603798638);
-//      item.put("foodName","肉汁煲霜打萝卜.");
-//      item.put("foodUnit","份");
-//      item.put("foodUnitID","1748099318");
-//      item.put("isSetFood",0);
-//      item.put("isBatching",0);
-//      item.put("foodCount",1);
-//      item.put("originPrice","100");
-//      item.put("takeoutPackagingFee","1");
-//      item.put("isDiscount",0);
-//      item.put("duePrice","1");
-//      orderItem.add(item);
-//      // 支付信息
-//      ArrayList<Object> payInfo = new ArrayList<>();
-//      JSONObject payItem = new JSONObject();
-//      payItem.put("paymentSubjectID",Long.valueOf("51010440"));
-//      payItem.put("paymentSubjectName","微信小程序实收");
-//      payItem.put("dueAmount","1");
-//      payItem.put("paymentStatus",20);
-//      payItem.put("payWay",70);
-//      payInfo.add(payItem);
-//
-//      // 订单信息
-//      JSONObject order = new JSONObject();
-//      order.put("orderSubType",20);
-//      order.put("orderStatus",20);
-//      order.put("discountTotalAmount","1");
-//      order.put("dinners",1);
-//      // 期望送达时间
-//      SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddHHmm");
-//      order.put("orderTime",sdf1.format(orderInfo.getCreateTime()));
-//      order.put("orderItem",orderItem);
-//      order.put("takeoutAddress","外送地址:");
-//      order.put("deliveryAmount","0");
-//      order.put("serviceAmount","0");
-//      order.put("channelKey","399_weixin");
-//      order.put("isAlreadyPaid","1");
-//      order.put("orderMode",1);
-//      order.put("OrderRemark","");
-//      order.put("payment",payInfo);
-//
-//      HashMap<String,Object> params = new HashMap<>();
-//      params.put("shopID",Long.valueOf("76230180"));
-//      params.put("isCheackOut",0);
-//      params.put("isThirdPay",2);
-//      params.put("bankCode","weChat");
-//      params.put("order",order);
-//      params.put("isSentMsg",1);
-//      params.put("msgType",120);
-//      params.put("thirdOrderID",orderInfo.getOrderNo());
-//
-////      JSONObject response = hualalaService.doPost("/order/submitordernew", params);
-////      System.out.println("response = " + response);
-//    }
-
-
-//  @Test
-//  public void chat() {
-//
-//    String endpoint = "https://api.openai.com/v1/engines/davinci-codex/completions";
-//    String apiKey = "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";
-//
-//
-//    // 构建请求
-//    HttpRequest request = HttpRequest.get("https://api.openai.com/v1/engines/davinci-codex/completions")
-//      .header("Authorization", "Bearer ".concat(apiKey));
-//
-//    // 发送请求并获取响应
-//    HttpResponse response = request.execute();
-//
-//    // 处理响应结果
-//    int statusCode = response.getStatus();
-//    String body = response.body();
-//    System.out.println("body = " + body);
-//  }
-
-
-//  @Test
-//  public void chatGPT() {
-//    String abc = "{\"finish_reason\":\"stop\",\"index\":0,\"message\":{\"role\":\"assistant\",\"content\":\"您好！有什么我能为您效劳的吗？\"}}";
-//    final JSONObject jsonObject = JSONObject.parseObject(abc);
-//    final String message = jsonObject.getString("message");
-//    System.out.println("message = " + message);
-//    final JSONObject jsonObject1 = JSONObject.parseObject(message);
-//    final String content = jsonObject1.getString("content");
-//    System.out.println("content = " + content);
-//  }
-
-
-// 自定义参数，这部分是Hutool工具封装的
-//  @Test
-//  public void initQrConfig() {
-//    // 生成指定url对应的二维码到文件，宽和高都是300像素
-//    QrCodeUtil.generate("https://hutool.cn/", 300, 300, FileUtil.file("/Users/gxwebsoft/Documents/uploads/qrcode.jpg"));
-//  }
-
-
-  @Test
-  public void allIdCard() {
-//    List<User> users = userService.list(new QueryWrapper<>());
-//    System.out.println(users.size());
-//    List<Certificate> certificateList = new ArrayList<>();
-//    for (User user : users) {
-//      Certificate certificate = new Certificate();
-//      certificate.setFullName("xxx");
-//      certificate.setCertificateCode("XXX");
-//      certificate.setCertificateType("idCard");
-//      certificate.setExpirationTime(LocalDateTime.now());
-//      certificate.setAuthentication(1);
-//      certificate.setUserId(user.getUserId());
-//      certificate.setTenantId(10053);
-//      certificateService.save(certificate);
-//    }
-
-  }
-
-
-  public void setProfile(){
+  public void testGenJwtKey() {
+    System.out.println(JwtUtil.encodeKey(JwtUtil.randomKey()));
   }
 }
diff --git a/src/test/java/com/gxwebsoft/generator/AppsGenerator.java b/src/test/java/com/gxwebsoft/generator/AppsGenerator.java
deleted file mode 100644
index d120443..0000000
--- a/src/test/java/com/gxwebsoft/generator/AppsGenerator.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class AppsGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "apps";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//      "apps_equipment",
-//      "apps_equipment_fault",
-//      "apps_equipment_alarm",
-//      "apps_equipment_record"
-//      "apps_equipment_order"
-//      "apps_cashier",
-//        "apps_hualala_card",
-//        "apps_hualala_card_benefits",
-//        "apps_hualala_food",
-//        "apps_hualala_shop",
-//        "apps_hualala_cart_food",
-//        "apps_hualala_food_category",
-//      "apps_test_data",
-//      "apps_link",
-//      "apps_bc_agent",
-//      "apps_bc_temporary",
-//      "apps_link",
-//      "apps_bc_plan",
-//      "apps_bc_food",
-//      "apps_bc_equipment",
-//      "apps_bc_cookbook"
-      "apps_bc_export"
-//        "apps_equipment_order_goods"
-
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "apps_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}
diff --git a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java
index 0aad1da..fddd2df 100644
--- a/src/test/java/com/gxwebsoft/generator/CmsGenerator.java
+++ b/src/test/java/com/gxwebsoft/generator/CmsGenerator.java
@@ -31,22 +31,22 @@ public class CmsGenerator {
     // 是否在xml中添加二级缓存配置
     private static final boolean ENABLE_CACHE = false;
     // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
     private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    private static final String DB_USERNAME = "modules";
+    private static final String DB_PASSWORD = "FYJGx7s8yt7K8xDH";
     // 包名
     private static final String PACKAGE_NAME = "com.gxwebsoft";
     // 模块名
     private static final String MODULE_NAME = "cms";
     // 需要生成的表
     private static final String[] TABLE_NAMES = new String[]{
-//            "cms_article",
-//            "cms_article_category",
-//            "cms_article_like",
-              "cms_article_comment",
-//            "cms_docs",
-//            "cms_docs",
+            "cms_article",
+            "cms_article_category",
+            "cms_article_like",
+            "cms_article_comment",
+            "cms_docs",
+            "cms_ad",
 //            "cms_docs",
 //            "cms_docs",
 //            "cms_docs",
diff --git a/src/test/java/com/gxwebsoft/generator/HouseGenerator.java b/src/test/java/com/gxwebsoft/generator/HouseGenerator.java
deleted file mode 100644
index cc30971..0000000
--- a/src/test/java/com/gxwebsoft/generator/HouseGenerator.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class HouseGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "house";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-              "house_info"
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "house_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}
diff --git a/src/test/java/com/gxwebsoft/generator/LoveGenerator.java b/src/test/java/com/gxwebsoft/generator/LoveGenerator.java
deleted file mode 100644
index a321d3f..0000000
--- a/src/test/java/com/gxwebsoft/generator/LoveGenerator.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class LoveGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "love";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//        "love_user_profile",
-//          "love_user_plan",
-//          "love_user_plan_price",
-//          "love_user_plan_log",
-//            "love_user_plan_icon",
-//            "love_user_plan_equity",
-//            "love_certificate",
-              "love_profit"
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "love_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}
diff --git a/src/test/java/com/gxwebsoft/generator/OaGenerator.java b/src/test/java/com/gxwebsoft/generator/OaGenerator.java
deleted file mode 100644
index 5eb7c05..0000000
--- a/src/test/java/com/gxwebsoft/generator/OaGenerator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class OaGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "oa";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//      "oa_project",
-//      "oa_link",
-//      "oa_assets",
-//      "oa_customer",
-//      "oa_task",
-//      "oa_task_record",
-//      "oa_task_user",
-//      "sys_tenant",
-//      "oa_app",
-//      "oa_setting",
-//      "oa_assets",
-//      "oa_app_user",
-//      "oa_notice"
-      "oa_assets_user",
-
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "oa_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}
diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
deleted file mode 100644
index 594729f..0000000
--- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class ShopGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "shop";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//      "shop_order",
-//      "shop_goods",
-//      "shop_store",
-//      "shop_cart",
-//      "shop_express",
-//      "shop_category",
-//      "shop_goods_image",
-//      "shop_comment",
-//      "shop_goods_service"
-//      "shop_member"
-//      "shop_user_balance_log",
-//      "shop_user_address",
-//      "shop_user_coupon",
-//      "shop_user_follow",
-//      "shop_user_oauth",
-//      "shop_user_points_log",
-//      "shop_cart"
-//      "shop_info"
-//      "shop_coupon"
-//        "shop_clerk"
-//      "shop_merchant",
-//      "shop_merchant_clerk"
-//      "shop_merchant_withdraw"
-//      "shop_order_address"
-//      "shop_payment",
-//      "shop_payment_template",
-//      "shop_payment_trade"
-//      "shop_order_goods"
-//      "shop_user_oauth"
-//      "shop_order_renew"
-//        "shop_recharge_order",
-//        "shop_recharge_order_plan",
-//        "shop_recharge_plan",
-//        "shop_user_balance_log"
-//      "shop_user_referee",
-//        "shop_order_refund",
-//        "shop_order_refund_address",
-//      "shop_user_grade",
-//      "shop_user_grade_log",
-//        "shop_user_comment",
-//        "shop_user_like",
-//        "shop_user_look"
-          "shop_user_feedback"
-
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "shop_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}
diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java
deleted file mode 100644
index 94134f9..0000000
--- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.gxwebsoft.generator;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成工具
- *
- * @author WebSoft
- * @since 2021-09-05 00:31:14
- */
-public class TowerGenerator {
-    // 输出位置
-    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
-    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
-    // 输出目录
-    private static final String OUTPUT_DIR = "/src/main/java";
-    // 作者名称
-    private static final String AUTHOR = "科技小王子";
-    // 是否在xml中添加二级缓存配置
-    private static final boolean ENABLE_CACHE = false;
-    // 数据库连接配置
-    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
-    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
-    private static final String DB_USERNAME = "com_gxwebsoft_oa";
-    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
-    // 包名
-    private static final String PACKAGE_NAME = "com.gxwebsoft";
-    // 模块名
-    private static final String MODULE_NAME = "tower";
-    // 需要生成的表
-    private static final String[] TABLE_NAMES = new String[]{
-//      "tower_equipment",
-//      "tower_warehouse",
-//      "tower_accessory"
-//      "tower_project",
-//      "tower_model",
-//      "tower_project_user",
-//        "tower_project_order",
-//        "tower_place",
-//        "tower_place_safety",
-//        "tower_place_standard",
-        "tower_project_place"
-    };
-    // 需要去除的表前缀
-    private static final String[] TABLE_PREFIX = new String[]{
-            "sys_",
-            "tb_"
-    };
-    // 不需要作为查询参数的字段
-    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
-            "tenant_id",
-            "create_time",
-            "update_time"
-    };
-    // 查询参数使用String的类型
-    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
-            "Date",
-            "LocalDate",
-            "LocalTime",
-            "LocalDateTime"
-    };
-    // 查询参数使用EQ的类型
-    private static final String[] PARAM_EQ_TYPE = new String[]{
-            "Integer",
-            "Boolean",
-            "BigDecimal"
-    };
-    // 是否添加权限注解
-    private static final boolean AUTH_ANNOTATION = true;
-    // 是否添加日志注解
-    private static final boolean LOG_ANNOTATION = true;
-    // controller的mapping前缀
-    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
-    // 模板所在位置
-    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
-        gc.setAuthor(AUTHOR);
-        gc.setOpen(false);
-        gc.setFileOverride(true);
-        gc.setEnableCache(ENABLE_CACHE);
-        gc.setSwagger2(true);
-        gc.setIdType(IdType.AUTO);
-        gc.setServiceName("%sService");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl(DB_URL);
-        // dsc.setSchemaName("public");
-        dsc.setDriverName(DB_DRIVER);
-        dsc.setUsername(DB_USERNAME);
-        dsc.setPassword(DB_PASSWORD);
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setModuleName(MODULE_NAME);
-        pc.setParent(PACKAGE_NAME);
-        mpg.setPackageInfo(pc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setInclude(TABLE_NAMES);
-        strategy.setTablePrefix(TABLE_PREFIX);
-        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setLogicDeleteFieldName("deleted");
-        mpg.setStrategy(strategy);
-
-        // 模板配置
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
-        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
-        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
-        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
-        templateConfig.setService(TEMPLATES_DIR + "/service.java");
-        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
-        mpg.setTemplate(templateConfig);
-        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
-
-        // 自定义模板配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                Map<String, Object> map = new HashMap<>();
-                map.put("packageName", PACKAGE_NAME);
-                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
-                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
-                map.put("paramEqType", PARAM_EQ_TYPE);
-                map.put("authAnnotation", AUTH_ANNOTATION);
-                map.put("logAnnotation", LOG_ANNOTATION);
-                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
-                this.setMap(map);
-            }
-        };
-        String templatePath = TEMPLATES_DIR + "/param.java.btl";
-        List<FileOutConfig> focList = new ArrayList<>();
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
-                        + PACKAGE_NAME.replace(".", "/")
-                        + "/" + pc.getModuleName() + "/param/"
-                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
-            }
-        });
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        mpg.execute();
-    }
-
-}