机具管理列表查询，sn轨迹变动明细，机具卷管理，机具卷划拨记录分页查询接口添加

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/admin/machine/SysMachinePageDTO.java

@@ -0,0 +1,122 @@
+package com.kxs.product.api.dto.admin.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 仓库管理-机具管理列表-dto
+ *
+ * @author 系统
+ * @date 2024-07-02 18:04:09
+ */
+@Data
+public class SysMachinePageDTO {
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 是否激活 0未激活 1已激活
+     */
+    @Schema(description = "是否激活 0未激活 1已激活")
+    private Integer isAct;
+
+
+    /**
+     * 绑定状态 0未绑定 1已绑定 2已解绑
+     */
+    @Schema(description = "绑定状态 0未绑定 1已绑定 2已解绑")
+    private Integer bindStatus;
+
+
+    /**
+     * 状态 -1坏机 0在库 1出库 
+     */
+    @Schema(description = "状态 -1坏机 0在库 1出库 ")
+    private Integer status;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private String username;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private String userCode;
+
+
+    /**
+     * 仓库编号
+     */
+    @Schema(description = "仓库编号")
+    private String warehouseNo;
+
+
+    /**
+     * 仓库所属人创客编号
+     */
+    @Schema(description = "仓库所属人创客编号")
+    private String warehouseUserCode;
+
+
+    /**
+     * 运营中心编号
+     */
+    @Schema(description = "运营中心编号")
+    private String partnerNo;
+
+
+    /**
+     * 绑定时间['','']
+     */
+    @Schema(description = "绑定时间['','']")
+    private String[] bindTime;
+
+
+    /**
+     * 激活时间['','']
+     */
+    @Schema(description = "激活时间['','']")
+    private String[] actTime;
+
+
+    /**
+     * 出库时间['','']
+     */
+    @Schema(description = "出库时间['','']")
+    private String[] deliveryTime;
+
+    /**
+     * 用户userId集合
+     */
+    private List<Integer> userIds;
+
+
+    /**
+     * 用户warehouseIds集合
+     */
+    private List<Integer> warehouseIds;
+
+
+
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/admin/machineTrack/SysMachineTrackPageDTO.java

@@ -0,0 +1,12 @@
+package com.kxs.product.api.dto.admin.machineTrack;
+
+import lombok.Data;
+
+/**
+ * 仓库管理-SN轨迹变动明细信息-dto
+ * @author debao.yang
+ * @createTime 2024-07-03 13:53
+ */
+@Data
+public class SysMachineTrackPageDTO {
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/admin/so/SysSoPageDTO.java → kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/admin/order/SysSoPageDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.product.api.dto.admin.so;
+package com.kxs.product.api.dto.admin.order;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/admin/ticket/SysTicketPageDTO.java

@@ -0,0 +1,85 @@
+package com.kxs.product.api.dto.admin.ticket;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 仓库管理-机具卷管理列表-dto
+ *
+ * @author 系统
+ * @date 2024-07-03 13:51:27
+ */
+@Data
+public class SysTicketPageDTO {
+
+    /**
+     * 券码
+     */
+    @Schema(description = "券码")
+    private String ticketCode;
+
+
+    /**
+     * 券码类型 0电签 1大pos
+     */
+    @Schema(description = "券码类型 0电签 1大pos")
+    private Integer ticketType;
+
+
+    /**
+     * 状态 0未使用 1已使用 2已申请冻结
+     */
+    @Schema(description = "状态 0未使用 1已使用 2已申请冻结")
+    private Integer status;
+
+
+    /**
+     * 运营中心编号
+     */
+    @Schema(description = "运营中心编号")
+    private String partnerNo;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private String userCode;
+
+
+    /**
+     * 盟主创客编号
+     */
+    @Schema(description = "盟主创客编号")
+    private String leaderNo;
+
+
+    /**
+     * 兑换时间['','']
+     */
+    @Schema(description = "兑换时间['','']")
+    private String[] exchangeTime;
+
+
+    /**
+     * 创客id集合
+     */
+    private List<Integer> userIds;
+
+    /**
+     * 合伙人id集合
+     */
+    private List<Integer> partnerIds;
+
+    /**
+     * 盟主id集合
+     */
+    private List<Integer> leaderIds;
+
+
+
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/admin/ticketTransfer/SysTicketTransferPageDTO.java

@@ -0,0 +1,53 @@
+package com.kxs.product.api.dto.admin.ticketTransfer;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 仓库管理-机具卷划拨记录列表-dto
+ *
+ * @author 系统
+ * @date 2024-07-03 13:51:27
+ */
+@Data
+public class SysTicketTransferPageDTO {
+
+    /**
+     * 拨入用户姓名
+     */
+    @Schema(description = "拨入用户姓名")
+    private String toUserName;
+
+
+    /**
+     * 拨入用户编码
+     */
+    @Schema(description = "拨入用户编码")
+    private String toUserCode;
+
+
+    /**
+     * 拨出用户姓名
+     */
+    @Schema(description = "拨出用户姓名")
+    private String sendUserName;
+
+
+    /**
+     * 拨出用户编码
+     */
+    @Schema(description = "拨出用户编码")
+    private String sendUserCode;
+
+
+    /**
+     * 机具卷码
+     */
+    @Schema(description = "机具卷码")
+    private String ticketCode;
+
+
+
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/admin/machine/SysMachinePageVO.java

@@ -0,0 +1,46 @@
+package com.kxs.product.api.vo.admin.machine;
+
+
+import com.kxs.product.api.model.KxsMachine;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 仓库管理-机具管理列表vo
+ *
+ * @author 系统
+ * @date 2024-07-02 18:04:10
+ */
+@Data
+@Schema(description = "仓库管理-机具管理列表返回实体")
+public class SysMachinePageVO extends KxsMachine implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 仓库信息
+     */
+    @Schema(description = "仓库信息")
+    private Object warehouse;
+
+
+    /**
+     * 产品类型
+     */
+    @Schema(description = "产品类型")
+    private Object deviceType;
+
+
+
+
+
+	
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/admin/so/SysSoOrderDetailVO.java → kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/admin/order/SysSoOrderDetailVO.java

@@ -1,4 +1,4 @@
-package com.kxs.product.api.vo.admin.so;
+package com.kxs.product.api.vo.admin.order;
 
 
 import com.kxs.product.api.model.KxsShopGoods;
@@ -8,8 +8,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 商城订单-详情vo

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/admin/so/SysSoPageVO.java → kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/admin/order/SysSoPageVO.java

@@ -1,4 +1,4 @@
-package com.kxs.product.api.vo.admin.so;
+package com.kxs.product.api.vo.admin.order;
 
 
 import com.kxs.product.api.model.KxsShopOrder;
@@ -7,8 +7,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 商城订单-列表vo

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/admin/ticketTransfer/SysTicketTransferPageVO.java

@@ -0,0 +1,19 @@
+package com.kxs.product.api.vo.admin.ticketTransfer;
+
+import com.kxs.product.api.model.KxsTicketTransfer;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author debao.yang
+ * @createTime 2024-07-03 16:53
+ */
+@Data
+public class SysTicketTransferPageVO extends KxsTicketTransfer {
+
+    /**
+     * 机具卷码集合
+     */
+    private String ticketCodes;
+}

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysMachineController.java

@@ -0,0 +1,49 @@
+package com.kxs.product.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.machine.SysMachinePageDTO;
+import com.kxs.product.api.vo.admin.machine.SysMachinePageVO;
+import com.kxs.product.biz.service.KxsMachineService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 机具管理(SysMachine)控制层
+ *
+ * @author 系统
+ * @since 2024-07-02 18:04:10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysMachine")
+public class SysMachineController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsMachineService kxsMachineService;
+
+
+
+    /**
+     * 仓库管理-机具管理列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 仓库管理-机具管理列表
+     */
+    @GetMapping("/page")
+    public R machinePage(Page<SysMachinePageVO> page, SysMachinePageDTO param) {
+        kxsMachineService.machinePage(page, param);
+        return R.ok(page);
+    }
+
+
+
+
+
+}
+

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysMachineTrackController.java

@@ -0,0 +1,49 @@
+package com.kxs.product.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.machineTrack.SysMachineTrackPageDTO;
+import com.kxs.product.api.model.KxsMachineTrack;
+import com.kxs.product.biz.service.KxsMachineTrackService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * sn轨迹变动明细(SysMachineTrack)控制层
+ *
+ * @author 系统
+ * @since 2024-07-02 18:04:10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysMachineTrack")
+public class SysMachineTrackController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsMachineTrackService kxsMachineTrackService;
+
+
+
+    /**
+     * 仓库管理-SN轨迹变动明细信息
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 仓库管理-SN轨迹变动明细信息
+     */
+    @GetMapping("/page")
+    public R machineTrackPage(Page<KxsMachineTrack> page, SysMachineTrackPageDTO param) {
+        kxsMachineTrackService.machineTrackPage(page, param);
+        return R.ok(page);
+    }
+
+
+
+
+
+}
+

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysShopOrderController.java

@@ -2,8 +2,8 @@ package com.kxs.product.biz.controller.admin;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
-import com.kxs.product.api.dto.admin.so.SysSoPageDTO;
-import com.kxs.product.api.vo.admin.so.SysSoPageVO;
+import com.kxs.product.api.dto.admin.order.SysSoPageDTO;
+import com.kxs.product.api.vo.admin.order.SysSoPageVO;
 import com.kxs.product.biz.service.KxsShopOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysTicketController.java

@@ -0,0 +1,49 @@
+package com.kxs.product.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.ticket.SysTicketPageDTO;
+import com.kxs.product.api.model.KxsTicket;
+import com.kxs.product.biz.service.KxsTicketService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 机具卷管理(SysTicket)控制层
+ *
+ * @author 系统
+ * @since 2024-07-02 18:04:10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysTicket")
+public class SysTicketController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsTicketService kxsTicketService;
+
+
+
+    /**
+     * 仓库管理-机具卷管理列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 仓库管理-机具卷管理列表
+     */
+    @GetMapping("/page")
+    public R ticketPage(Page<KxsTicket> page, SysTicketPageDTO param) {
+        kxsTicketService.ticketPage(page, param);
+        return R.ok(page);
+    }
+
+
+
+
+
+}
+

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysTicketTransferController.java

@@ -0,0 +1,49 @@
+package com.kxs.product.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.ticketTransfer.SysTicketTransferPageDTO;
+import com.kxs.product.api.vo.admin.ticketTransfer.SysTicketTransferPageVO;
+import com.kxs.product.biz.service.KxsTicketTransferService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 机具卷划拨记录(SysTicketTransfer)控制层
+ *
+ * @author 系统
+ * @since 2024-07-02 18:04:10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysTicketTransfer")
+public class SysTicketTransferController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsTicketTransferService kxsTicketTransferService;
+
+
+
+    /**
+     * 仓库管理-机具卷划拨记录列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 仓库管理-机具卷划拨记录列表
+     */
+    @GetMapping("/page")
+    public R ticketTransferPage(Page<SysTicketTransferPageVO> page, SysTicketTransferPageDTO param) {
+        kxsTicketTransferService.ticketTransferPage(page, param);
+        return R.ok(page);
+    }
+
+
+
+
+
+}
+

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineMapper.java

@@ -3,11 +3,13 @@ package com.kxs.product.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.product.api.dto.admin.machine.SysMachinePageDTO;
 import com.kxs.product.api.dto.kxsapp.GetActivityMachineByIdAndTimeDTO;
 import com.kxs.product.api.dto.kxsapp.machine.*;
 import com.kxs.product.api.dto.kxsapp.merchant.MerchantListDTO;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.model.KxsMerchant;
+import com.kxs.product.api.vo.admin.machine.SysMachinePageVO;
 import com.kxs.product.api.vo.kxsapp.machine.*;
 import com.kxs.product.api.vo.kxsapp.merchant.MerchantListVO;
 import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
@@ -141,5 +143,14 @@ public interface KxsMachineMapper extends BaseMapper<KxsMachine> {
      * @return
      */
     Integer getActivityMachineByIdAndTime(@Param("param")GetActivityMachineByIdAndTimeDTO param,@Param("brandId") Long brandId);
+
+
+    /**
+     * 后台分页查询机具
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysMachinePageVO> machinePage(Page page,@Param("query") SysMachinePageDTO param);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsMachineTrackMapper.java

@@ -1,8 +1,13 @@
 package com.kxs.product.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.product.api.dto.admin.machineTrack.SysMachineTrackPageDTO;
 import com.kxs.product.api.model.KxsMachineTrack;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 客小爽机具轨迹记录表(KxsMachineTrack)表数据库访问层
@@ -13,5 +18,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KxsMachineTrackMapper extends BaseMapper<KxsMachineTrack> {
 
+    /**
+     * 机具轨迹记录表分页查询
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsMachineTrack> machineTrackPage(Page page,@Param("query") SysMachineTrackPageDTO param);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsShopOrderMapper.java

@@ -2,9 +2,9 @@ package com.kxs.product.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.product.api.dto.admin.so.SysSoPageDTO;
+import com.kxs.product.api.dto.admin.order.SysSoPageDTO;
 import com.kxs.product.api.model.KxsShopOrder;
-import com.kxs.product.api.vo.admin.so.SysSoPageVO;
+import com.kxs.product.api.vo.admin.order.SysSoPageVO;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderListVO;
 import org.apache.ibatis.annotations.Mapper;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsTicketMapper.java

@@ -3,6 +3,7 @@ package com.kxs.product.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.product.api.dto.admin.ticket.SysTicketPageDTO;
 import com.kxs.product.api.model.KxsTicket;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketListVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -38,5 +39,12 @@ public interface KxsTicketMapper extends BaseMapper<KxsTicket> {
     void updateBatchTransfer(@Param("ticketCodes") List<String> ticketCodes, @Param("userId") Integer userId);
 
 
+    /**
+     * 兑换券分页查询
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsTicket> ticketPage(Page<KxsTicket> page,@Param("query") SysTicketPageDTO param);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mapper/KxsTicketTransferMapper.java

@@ -3,13 +3,17 @@ package com.kxs.product.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.product.api.dto.admin.ticketTransfer.SysTicketTransferPageDTO;
 import com.kxs.product.api.dto.kxsapp.ticket.TicketTransferQuery;
 import com.kxs.product.api.model.KxsTicketTransfer;
+import com.kxs.product.api.vo.admin.ticketTransfer.SysTicketTransferPageVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferDetailVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 客小爽券码划拨记录表(KxsTicketTransfer)表数据库访问层
  *
@@ -29,5 +33,13 @@ public interface KxsTicketTransferMapper extends BaseMapper<KxsTicketTransfer> {
     IPage<TicketTransferListVO> getByPage(Page<TicketTransferListVO> page, @Param("query") TicketTransferQuery ticketTransferQuery);
 
 
+    /**
+     * 券码划拨记录表分页
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysTicketTransferPageVO> ticketTransferPage(Page page, @Param("query") SysTicketTransferPageDTO param);
+
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineService.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.machine.SysMachinePageDTO;
 import com.kxs.product.api.dto.kxsapp.GetActivityMachineByIdAndTimeDTO;
 import com.kxs.product.api.dto.kxsapp.machine.*;
 import com.kxs.product.api.dto.kxsapp.merchant.MachineRatioDTO;
 import com.kxs.product.api.model.KxsMachine;
+import com.kxs.product.api.vo.admin.machine.SysMachinePageVO;
 import com.kxs.product.api.vo.kxsapp.machine.*;
 import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
@@ -164,5 +166,14 @@ public interface KxsMachineService extends IService<KxsMachine> {
      */
     R updatePledge(MachineUpdatePledgeDTO param);
 
+
+    /**
+     * 机具后台分页查询
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysMachinePageVO> machinePage(Page page, SysMachinePageDTO param );
+
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsMachineTrackService.java

@@ -1,8 +1,12 @@
 package com.kxs.product.biz.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.dto.admin.machineTrack.SysMachineTrackPageDTO;
 import com.kxs.product.api.model.KxsMachineTrack;
 
+import java.util.List;
+
 /**
  * 客小爽机具轨迹记录表(KxsMachineTrack)表服务接口
  *
@@ -11,5 +15,12 @@ import com.kxs.product.api.model.KxsMachineTrack;
  */
 public interface KxsMachineTrackService extends IService<KxsMachineTrack> {
 
+    /**
+     * 机具轨迹记录表分页
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsMachineTrack> machineTrackPage(Page page, SysMachineTrackPageDTO param);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsShopOrderService.java

@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
-import com.kxs.product.api.dto.admin.so.SysSoPageDTO;
+import com.kxs.product.api.dto.admin.order.SysSoPageDTO;
 import com.kxs.product.api.dto.kxsapp.shop.PayOrderDTO;
 import com.kxs.product.api.model.KxsShopOrder;
 import com.kxs.product.api.dto.kxsapp.shop.GoodsSubmitDTO;
-import com.kxs.product.api.vo.admin.so.SysSoOrderDetailVO;
-import com.kxs.product.api.vo.admin.so.SysSoPageVO;
+import com.kxs.product.api.vo.admin.order.SysSoOrderDetailVO;
+import com.kxs.product.api.vo.admin.order.SysSoPageVO;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderCountVO;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderDetailVO;
 import com.kxs.product.api.vo.kxsapp.shop.ShopOrderGoodsUserVO;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsTicketService.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.ticket.SysTicketPageDTO;
 import com.kxs.product.api.model.KxsTicket;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketListVO;
 
+import java.util.List;
+
 /**
  * 客小爽券码表(KxsTicket)表服务接口
  *
@@ -46,5 +49,13 @@ public interface KxsTicketService extends IService<KxsTicket> {
      * @param number 购买数量
      */
     Boolean userBuyTicket(Long userId, Integer ticketType, Integer orderId, Integer number);
+
+    /**
+     * 机具卷分页查询
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsTicket> ticketPage(Page<KxsTicket> page, SysTicketPageDTO param);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsTicketTransferService.java

@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.product.api.dto.admin.ticketTransfer.SysTicketTransferPageDTO;
 import com.kxs.product.api.dto.kxsapp.ticket.TicketTransferDTO;
 import com.kxs.product.api.dto.kxsapp.ticket.TicketTransferQuery;
 import com.kxs.product.api.model.KxsTicketTransfer;
+import com.kxs.product.api.vo.admin.ticketTransfer.SysTicketTransferPageVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferDetailVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferListVO;
 
+import java.util.List;
+
 /**
  * 客小爽券码划拨记录表(KxsTicketTransfer)表服务接口
  *
@@ -42,5 +46,13 @@ public interface KxsTicketTransferService extends IService<KxsTicketTransfer> {
      * @return {@link TicketTransferDetailVO}
      */
     TicketTransferDetailVO getByData(Integer id);
+
+    /**
+     * 机具卷划拨记录分页
+     * @param page
+     * @param param
+     * @return
+     */
+    List<SysTicketTransferPageVO> ticketTransferPage(Page page, SysTicketTransferPageDTO param);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -1,10 +1,12 @@
 package com.kxs.product.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.crypto.symmetric.AES;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,11 +17,13 @@ import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.dto.admin.machine.SysMachinePageDTO;
 import com.kxs.product.api.dto.kxsapp.GetActivityMachineByIdAndTimeDTO;
 import com.kxs.product.api.dto.kxsapp.machine.*;
 import com.kxs.product.api.dto.kxsapp.merchant.MachineRatioDTO;
 import com.kxs.product.api.model.*;
 import com.kxs.product.api.req.kxs.DepositSetReq;
+import com.kxs.product.api.vo.admin.machine.SysMachinePageVO;
 import com.kxs.product.api.vo.kxsapp.machine.*;
 import com.kxs.common.core.constant.enums.MachineTypeEnum;
 import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;
@@ -27,9 +31,12 @@ import com.kxs.product.biz.mapper.*;
 import com.kxs.product.biz.service.KxsMachineService;
 import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
+import com.kxs.store.api.dto.admin.machine.WarehouseSearchDTO;
 import com.kxs.store.api.feign.RemoteKxsStoreService;
+import com.kxs.store.api.feign.RemoteKxsWarehouseService;
 import com.kxs.system.api.feign.RemoteOldService;
 import com.kxs.system.api.vo.kxsapp.RecycleBrandListVO;
+import com.kxs.user.api.dto.admin.user.UserSearchDTO;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.kxs.user.api.model.KxsUser;
 import lombok.RequiredArgsConstructor;
@@ -74,6 +81,8 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
 
     private final AES cryptoOldAes;
 
+    private final RemoteKxsWarehouseService remoteKxsWarehouseService;
+
     @Override
     public IPage<MachineStoreListVO> machineStoreList(Page<MachineStoreListVO> page, MachineStoreListDTO param) {
 
@@ -385,6 +394,84 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
 
     }
 
+    @Override
+    public List<SysMachinePageVO> machinePage(Page page, SysMachinePageDTO param) {
+        //如果有用户名称或用户编号的搜索条件，先去查用户，再根据用户id搜索机具
+        String userCode = param.getUserCode();
+        String username = param.getUsername();
+        List<Integer> searchUserIds = param.getUserIds();
+        if(StringUtils.isNotBlank(userCode) || StringUtils.isNotBlank(username)){
+            UserSearchDTO userSearchDTO = new UserSearchDTO();
+            userSearchDTO.setUsername(username);
+            userSearchDTO.setUserCode(userCode);
+            List<Integer> userIds = getUserIdsSearch(userSearchDTO);
+            if(CollectionUtil.isNotEmpty(userIds)){
+                if(searchUserIds == null){
+                    searchUserIds = new ArrayList<>();
+                }
+                searchUserIds.addAll(userIds);
+            }else{
+                return new ArrayList<>();
+            }
+        }
+        //设置用户userIds
+        param.setUserIds(searchUserIds);
+
+        //如果有仓库编号或仓库所属人创客编号的搜索条件，先去查仓库信息，再根据仓库id搜索机具
+        String warehouseNo = param.getWarehouseNo();
+        String warehouseUserCode = param.getWarehouseUserCode();
+        List<Integer> searchWarehouseIds = param.getWarehouseIds();
+        if(StringUtils.isNotBlank(warehouseNo) || StringUtils.isNotBlank(warehouseUserCode)){
+            WarehouseSearchDTO warehouseSearchDTO = new WarehouseSearchDTO();
+            warehouseSearchDTO.setWarehouseNo(warehouseNo);
+            warehouseSearchDTO.setWarehouseUserCode(warehouseUserCode);
+            List<Integer> warehouseIds = getWarehouseIdsSearch(warehouseSearchDTO);
+            if(CollectionUtil.isNotEmpty(warehouseIds)){
+                if(searchWarehouseIds == null){
+                    searchWarehouseIds = new ArrayList<>();
+                }
+                searchWarehouseIds.addAll(warehouseIds);
+            }else{
+                return new ArrayList<>();
+            }
+        }
+        //设置仓库warehouseIds
+        param.setWarehouseIds(searchWarehouseIds);
+
+        List<SysMachinePageVO> list = baseMapper.machinePage(page, param);
+
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
+    /**
+     * 通过条件获取用户id数据
+     * @return
+     */
+    private List<Integer> getUserIdsSearch(UserSearchDTO userSearchDTO){
+        R<List<Integer>> rList = remoteKxsUserService.searchUserList(userSearchDTO, SecurityConstants.FROM_IN);
+        if (rList.getStatus() != 1) {
+            throw new GlobalCustomerException("用户服务请求异常");
+        }else{
+            return rList.getData();
+        }
+    }
+
+    /**
+     * 通过条件获取用户id数据
+     * @return
+     */
+    private List<Integer> getWarehouseIdsSearch(WarehouseSearchDTO warehouseSearchDTO){
+        R<List<Integer>> rList = remoteKxsWarehouseService.searchWarehouseList(warehouseSearchDTO, SecurityConstants.FROM_IN);
+        if (rList.getStatus() != 1) {
+            throw new GlobalCustomerException("用户服务请求异常");
+        }else{
+            return rList.getData();
+        }
+    }
+
 
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineTrackServiceImpl.java

@@ -1,11 +1,15 @@
 package com.kxs.product.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.api.dto.admin.machineTrack.SysMachineTrackPageDTO;
 import com.kxs.product.biz.mapper.KxsMachineTrackMapper;
 import com.kxs.product.api.model.KxsMachineTrack;
 import com.kxs.product.biz.service.KxsMachineTrackService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 客小爽机具轨迹记录表(KxsMachineTrack)表服务实现类
  *
@@ -15,5 +19,13 @@ import org.springframework.stereotype.Service;
 @Service("kxsMachineTrackService")
 public class KxsMachineTrackServiceImpl extends ServiceImpl<KxsMachineTrackMapper, KxsMachineTrack> implements KxsMachineTrackService {
 
+    @Override
+    public List<KxsMachineTrack> machineTrackPage(Page page, SysMachineTrackPageDTO param) {
+        List<KxsMachineTrack> list = baseMapper.machineTrackPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsShopOrderServiceImpl.java

@@ -21,12 +21,12 @@ import com.kxs.common.pay.model.PayResponse;
 import com.kxs.common.pay.model.YuePayMessage;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.product.api.amqp.rabbit.RabbitShopTimeoutQueueMQ;
-import com.kxs.product.api.dto.admin.so.SysSoPageDTO;
+import com.kxs.product.api.dto.admin.order.SysSoPageDTO;
 import com.kxs.product.api.dto.kxsapp.shop.GoodsSubmitDTO;
 import com.kxs.product.api.dto.kxsapp.shop.PayOrderDTO;
 import com.kxs.product.api.model.*;
-import com.kxs.product.api.vo.admin.so.SysSoOrderDetailVO;
-import com.kxs.product.api.vo.admin.so.SysSoPageVO;
+import com.kxs.product.api.vo.admin.order.SysSoOrderDetailVO;
+import com.kxs.product.api.vo.admin.order.SysSoPageVO;
 import com.kxs.product.api.vo.kxsapp.shop.*;
 import com.kxs.product.biz.constant.enums.KxsShopEnum;
 import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsTicketServiceImpl.java

@@ -1,12 +1,17 @@
 package com.kxs.product.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 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.kxs.common.core.constant.CommonConstants;
+import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.exception.GlobalCustomerException;
+import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.dto.admin.ticket.SysTicketPageDTO;
 import com.kxs.product.api.model.KxsBrand;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.model.KxsShopOrder;
@@ -18,9 +23,12 @@ import com.kxs.product.biz.mapper.KxsMachineMapper;
 import com.kxs.product.biz.mapper.KxsShopOrderMapper;
 import com.kxs.product.biz.mapper.KxsTicketMapper;
 import com.kxs.product.biz.service.KxsTicketService;
+import com.kxs.user.api.dto.admin.user.UserSearchDTO;
+import com.kxs.user.api.feign.RemoteKxsUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -37,6 +45,7 @@ public class KxsTicketServiceImpl extends ServiceImpl<KxsTicketMapper, KxsTicket
     private final KxsBrandMapper kxsBrandMapper;
     private final KxsShopOrderMapper kxsShopOrderMapper;
     private final KxsMachineMapper kxsMachineMapper;
+    private final RemoteKxsUserService remoteKxsUserService;
     @Override
     public IPage<TicketListVO> getByPage(Page<TicketListVO> page, Integer ticketType) {
 
@@ -111,5 +120,75 @@ public class KxsTicketServiceImpl extends ServiceImpl<KxsTicketMapper, KxsTicket
         }
         return Boolean.TRUE;
     }
+
+    @Override
+    public List<KxsTicket> ticketPage(Page<KxsTicket> page, SysTicketPageDTO param) {
+        String userCode = param.getUserCode();
+        String partnerNo = param.getPartnerNo();
+        String leaderNo = param.getLeaderNo();
+        List<Integer> searchUserIds = param.getUserIds();
+        List<Integer> partnerIds = param.getPartnerIds();
+        List<Integer> leaderIds = param.getLeaderIds();
+        //如果有用户编号的搜索条件，先去查用户，再根据用户id搜索机具卷
+        if(StringUtils.isNotBlank(userCode)){
+            searchUserIds = getUserIds(userCode, searchUserIds);
+            if(CollectionUtil.isEmpty(searchUserIds)){
+                return new ArrayList<>();
+            }
+        }
+        //如果有合伙人编号的搜索条件，先去查用户，再根据用户id搜索机具卷
+        if(StringUtils.isNotBlank(partnerNo)){
+            partnerIds = getUserIds(partnerNo, partnerIds);
+            if(CollectionUtil.isEmpty(partnerIds)){
+                return new ArrayList<>();
+            }
+        }
+        //如果有盟主编号的搜索条件，先去查用户，再根据用户id搜索机具卷
+        if(StringUtils.isNotBlank(leaderNo)){
+            leaderIds = getUserIds(leaderNo, leaderIds);
+            if(CollectionUtil.isEmpty(leaderIds)){
+                return new ArrayList<>();
+            }
+        }
+        //设置用户userIds
+        param.setUserIds(searchUserIds);
+        //设置合伙人partnerIds
+        param.setPartnerIds(partnerIds);
+        //设置合伙人leaderIds
+        param.setLeaderIds(leaderIds);
+        List<KxsTicket> list = baseMapper.ticketPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
+    private List<Integer> getUserIds(String userCode,List<Integer> searchUserIds){
+        UserSearchDTO userSearchDTO = new UserSearchDTO();
+        userSearchDTO.setUserCode(userCode);
+        List<Integer> userIds = getUserIdsSearch(userSearchDTO);
+        if(CollectionUtil.isNotEmpty(userIds)){
+            if(searchUserIds == null){
+                searchUserIds = new ArrayList<>();
+            }
+            searchUserIds.addAll(userIds);
+        }else{
+            return new ArrayList<>();
+        }
+        return searchUserIds;
+    }
+
+    /**
+     * 通过条件获取用户id数据
+     * @return
+     */
+    private List<Integer> getUserIdsSearch(UserSearchDTO userSearchDTO){
+        R<List<Integer>> rList = remoteKxsUserService.searchUserList(userSearchDTO, SecurityConstants.FROM_IN);
+        if (rList.getStatus() != 1) {
+            throw new GlobalCustomerException("用户服务请求异常");
+        }else{
+            return rList.getData();
+        }
+    }
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsTicketTransferServiceImpl.java

@@ -13,10 +13,12 @@ import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.dto.admin.ticketTransfer.SysTicketTransferPageDTO;
 import com.kxs.product.api.dto.kxsapp.ticket.TicketTransferDTO;
 import com.kxs.product.api.dto.kxsapp.ticket.TicketTransferQuery;
 import com.kxs.product.api.model.KxsTicket;
 import com.kxs.product.api.model.KxsTicketTransferInfo;
+import com.kxs.product.api.vo.admin.ticketTransfer.SysTicketTransferPageVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferDetailVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferListVO;
 import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;
@@ -186,10 +188,14 @@ public class KxsTicketTransferServiceImpl extends ServiceImpl<KxsTicketTransferM
         return transferDetailVO;
     }
 
-
-
-
-
+    @Override
+    public List<SysTicketTransferPageVO> ticketTransferPage(Page page, SysTicketTransferPageDTO param) {
+        List<SysTicketTransferPageVO> list = baseMapper.ticketTransferPage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
 
 
 }

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -232,5 +232,63 @@
         </if>
     </select>
 
+    <select id="machinePage" resultMap="KxsMachineMap">
+        SELECT
+            km.*
+        FROM
+            kxs_machine km
+        <where>
+            and km.del_flag = 0
+            <if test="query.posSn != null and query.posSn != ''">
+                <bind name="posSnLike" value="'%'+query.posSn+'%'"/>
+                AND km.pos_sn LIKE #{posSnLike}
+            </if>
+            <if test="query.brandId != null and query.brandId != ''">
+                <bind name="brandIdLike" value="'%'+query.brandId+'%'"/>
+                AND km.brand_id LIKE #{brandIdLike}
+            </if>
+            <if test="query.isAct != null">
+                AND km.is_act = #{query.isAct}
+            </if>
+            <if test="query.bindStatus != null">
+                AND km.bind_status = #{query.bindStatus}
+            </if>
+            <if test="query.status != null">
+                AND km.status = #{query.status}
+            </if>
+            <if test="query.userIds != null and query.userIds.size()>0">
+                and km.user_id in
+                <foreach collection="query.userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="query.warehouseIds != null and query.warehouseIds.size()>0">
+                and km.warehouse_id in
+                <foreach collection="query.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="query.bindTime != null and query.bindTime.length > 1">
+                and (
+                DATE_FORMAT(km.bind_time,'%Y-%m-%d') >= DATE_FORMAT(#{query.bindTime.[0]},'%Y-%m-%d') and
+                DATE_FORMAT(#{query.bindTime.[1]},'%Y-%m-%d')  >= DATE_FORMAT(km.bind_time,'%Y-%m-%d')
+                )
+            </if>
+            <if test="query.actTime != null and query.actTime.length > 1">
+                and (
+                DATE_FORMAT(km.act_time,'%Y-%m-%d') >= DATE_FORMAT(#{query.actTime.[0]},'%Y-%m-%d') and
+                DATE_FORMAT(#{query.actTime.[1]},'%Y-%m-%d')  >= DATE_FORMAT(km.act_time,'%Y-%m-%d')
+                )
+            </if>
+            <if test="query.deliveryTime != null and query.deliveryTime.length > 1">
+                and (
+                DATE_FORMAT(km.delivery_time,'%Y-%m-%d') >= DATE_FORMAT(#{query.deliveryTime.[0]},'%Y-%m-%d') and
+                DATE_FORMAT(#{query.deliveryTime.[1]},'%Y-%m-%d')  >= DATE_FORMAT(km.delivery_time,'%Y-%m-%d')
+                )
+            </if>
+        </where>
+        order by km.create_time desc
+    </select>
+
 
 </mapper>

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineTrackMapper.xml

@@ -19,4 +19,18 @@
 
     </resultMap>
 
+    <select id="machineTrackPage" resultMap="KxsMachineTrackMap">
+        SELECT
+            *
+        FROM
+            kxs_machine_track kmt
+        <where>
+            and kmt.del_flag = 0
+            <if test="query.posSn != null and query.posSn != ''">
+                <bind name="posSnLike" value="'%'+query.posSn+'%'"/>
+                AND kmt.pos_sn LIKE #{posSnLike}
+            </if>
+        </where>
+        order by kmt.create_time desc
+    </select>
 </mapper>

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsShopOrderMapper.xml

@@ -51,7 +51,7 @@
         </collection>
     </resultMap>
 
-    <resultMap id="WebKxsShopOrderMap" extends="KxsShopOrderMap" type="com.kxs.product.api.vo.admin.so.SysSoPageVO"></resultMap>
+    <resultMap id="WebKxsShopOrderMap" extends="KxsShopOrderMap" type="com.kxs.product.api.vo.admin.order.SysSoPageVO"></resultMap>
 
     <select id="getByPage" resultMap="KxsShopOrderPageMap">
         SELECT a.id, a.create_time, a.order_sn, a.status, a.return_status, a.total_price, a.pay_price, a.warehouse_id, a.order_type,

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsTicketMapper.xml

@@ -15,6 +15,8 @@
         <result column="order_id" property="orderId" />
         <result column="is_leader" property="isLeader" />
         <result column="status" property="status" />
+        <result column="partner_id" property="partnerId" />
+        <result column="leader_id" property="leaderId" />
 
     </resultMap>
     <update id="updateBatchTransfer">
@@ -35,4 +37,42 @@
         where user_id = #{userId} and status = 0 and ticket_type = #{ticketType}
     </select>
 
+    <select id="ticketPage" resultMap="KxsTicketMap">
+        SELECT
+            kt.*
+        FROM
+            kxs_ticket kt
+        <where>
+            and kt.del_flag = 0
+            <if test="query.ticketCode != null and query.ticketCode != ''">
+                <bind name="ticketCodeLike" value="'%'+query.ticketCode+'%'"/>
+                AND kt.ticket_code LIKE #{ticketCodeLike}
+            </if>
+            <if test="query.ticketType != null">
+                AND kt.ticket_type = #{query.ticketType}
+            </if>
+            <if test="query.status != null">
+                AND kt.status = #{status}
+            </if>
+            <if test="query.userIds != null and query.userIds.size()>0">
+                and kt.user_id in
+                <foreach collection="query.userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="query.partnerIds != null and query.partnerIds.size()>0">
+                and kt.partner_id in
+                <foreach collection="query.partnerIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="query.leaderIds != null and query.leaderIds.size()>0">
+                and kt.leader_id in
+                <foreach collection="query.leaderIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsTicketTransferMapper.xml

@@ -20,6 +20,10 @@
         <result column="ticket_type" property="ticketType" />
 
     </resultMap>
+
+    <resultMap id="WebKxsTicketTransferMap" type="com.kxs.product.api.vo.admin.ticketTransfer.SysTicketTransferPageVO" extends="KxsTicketTransferMap">
+        <result column="ticketCodes" property="ticketCodes" />
+    </resultMap>
     <select id="getByPage" resultType="com.kxs.product.api.vo.kxsapp.ticket.TicketTransferListVO">
         select a.id, a.transfer_num, a.ticket_type, a.to_user_id, a.send_user_id, a.create_time,
         <if test="query.transferType == 1">
@@ -40,5 +44,38 @@
         order by a.create_time desc
     </select>
 
+    <select id="ticketTransferPage" resultMap="WebKxsTicketTransferMap">
+        SELECT
+        ktt.*,
+        t.ticketCodes
+        FROM
+        kxs_ticket_transfer ktt
+        LEFT JOIN
+        ( SELECT group_concat( ktti.ticket_code ) ticketCodes, ktti.order_sn AS orderSn FROM kxs_ticket_transfer_info ktti GROUP BY ktti.order_sn )  t ON ktt.order_sn = t.orderSn
+        <where>
+            and ktt.del_flag = 0
+            <if test="query.toUserName != null and query.toUserName != ''">
+                <bind name="toUserNameLike" value="'%'+query.toUserName+'%'"/>
+                AND ktt.to_user_name LIKE #{toUserNameLike}
+            </if>
+            <if test="query.toUserCode != null and query.toUserCode != ''">
+                <bind name="toUserCodeLike" value="'%'+query.toUserCode+'%'"/>
+                AND ktt.to_user_code LIKE #{toUserCodeLike}
+            </if>
+            <if test="query.sendUserName != null and query.sendUserName != ''">
+                <bind name="sendUserNameLike" value="'%'+query.sendUserName+'%'"/>
+                AND ktt.send_user_name LIKE #{sendUserNameLike}
+            </if>
+            <if test="query.sendUserCode != null and query.sendUserCode != ''">
+                <bind name="sendUserCodeLike" value="'%'+query.sendUserCode+'%'"/>
+                AND ktt.send_user_code LIKE #{sendUserCodeLike}
+            </if>
+            <if test="query.ticketCode != null and query.ticketCode != ''">
+                <bind name="ticketCodeLike" value="'%'+query.ticketCode+'%'"/>
+                AND t.ticketCodes LIKE #{ticketCodeLike}
+            </if>
+        </where>
+    </select>
+
 
 </mapper>

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/admin/machine/SysWarehousePageDTO.java

@@ -0,0 +1,53 @@
+package com.kxs.store.api.dto.admin.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 仓库管理-仓库信息列表-dto
+ *
+ * @author 系统
+ * @date 2024-07-03 10:41:47
+ */
+@Data
+public class SysWarehousePageDTO {
+
+    /**
+     * 仓库编号
+     */
+    @Schema(description = "仓库编号")
+    private String warehouseNo;
+
+
+    /**
+     * 仓库归属人
+     */
+    @Schema(description = "仓库归属人")
+    private String warehouseUserName;
+
+
+    /**
+     * 仓库归属人编号
+     */
+    @Schema(description = "仓库归属人编号")
+    private String warehouseUserCode;
+
+
+    /**
+     * 仓库管理员创客编号
+     */
+    @Schema(description = "仓库管理员创客编号")
+    private String warehouseAdminNo;
+
+    /**
+     * 仓库管理员id集合
+     */
+    private List<Integer> warehouseAdminIds;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/admin/machine/WarehouseSearchDTO.java

@@ -0,0 +1,22 @@
+package com.kxs.store.api.dto.admin.machine;
+
+import lombok.Data;
+
+/**
+ * 仓库搜索
+ * @author debao.yang
+ * @createTime 2024-07-03 11:34
+ */
+@Data
+public class WarehouseSearchDTO {
+
+    /**
+     * 仓库编号
+     */
+    private String warehouseNo;
+
+    /**
+     * 仓库所属人创客编号
+     */
+    private String warehouseUserCode;
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/admin/SysMachineApplyPageDTO.java → kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/admin/machineApply/SysMachineApplyPageDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.store.api.dto.admin;
+package com.kxs.store.api.dto.admin.machineApply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/feign/RemoteKxsWarehouseService.java

@@ -0,0 +1,26 @@
+package com.kxs.store.api.feign;
+
+import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.util.R;
+import com.kxs.store.api.dto.admin.machine.WarehouseSearchDTO;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.service.annotation.PostExchange;
+
+import java.util.List;
+
+/**
+ * @author debao.yang
+ * @createTime 2024-07-03 10:32
+ */
+public interface RemoteKxsWarehouseService {
+
+    /**
+     * 查询仓库id集合（最多100条）
+     * @param warehouseSearchDTO
+     * @param from
+     * @return
+     */
+    @PostExchange("/sysWarehouse/search/list")
+    R<List<Integer>> searchWarehouseList(@RequestBody WarehouseSearchDTO warehouseSearchDTO, @RequestHeader(SecurityConstants.FROM) String from);
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/feign/config/KxsStoreFeignClientConfiguration.java

@@ -3,6 +3,7 @@ package com.kxs.store.api.feign.config;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.kxs.common.core.constant.ServiceNameConstants;
 import com.kxs.store.api.feign.RemoteKxsStoreService;
+import com.kxs.store.api.feign.RemoteKxsWarehouseService;
 import io.seata.core.context.RootContext;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
@@ -82,4 +83,15 @@ public class KxsStoreFeignClientConfiguration {
 		return factory.createClient(RemoteKxsStoreService.class);
 	}
 
+	/**
+	 * 仓库数据调用模块服务
+	 * @param client
+	 * @return
+	 */
+	@Bean
+	RemoteKxsWarehouseService remoteKxsWarehouseService(@Qualifier("kxsStoreFeignClient") WebClient client) {
+		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+		return factory.createClient(RemoteKxsWarehouseService.class);
+	}
+
 }

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/admin/SysMachineApplyController.java

@@ -2,7 +2,7 @@ package com.kxs.store.biz.controller.admin;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
-import com.kxs.store.api.dto.admin.SysMachineApplyPageDTO;
+import com.kxs.store.api.dto.admin.machineApply.SysMachineApplyPageDTO;
 import com.kxs.store.api.vo.admin.machineApply.SysMachineApplyPageVO;
 import com.kxs.store.biz.service.KxsMachineApplyService;
 import lombok.RequiredArgsConstructor;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/admin/SysWarehouseController.java

@@ -0,0 +1,62 @@
+package com.kxs.store.biz.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.common.security.annotation.Inner;
+import com.kxs.store.api.dto.admin.machine.SysWarehousePageDTO;
+import com.kxs.store.api.dto.admin.machine.WarehouseSearchDTO;
+import com.kxs.store.api.model.KxsWarehouse;
+import com.kxs.store.biz.service.KxsWarehouseService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
+
+/**
+ * 仓库管理(SysWarehouse)控制层
+ *
+ * @author 系统
+ * @since 2024-07-03 10:41:47
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysWarehouse")
+public class SysWarehouseController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsWarehouseService kxsWarehouseService;
+
+
+
+    /**
+     * 仓库管理-仓库信息列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 仓库管理-仓库信息列表
+     */
+    @GetMapping("/page")
+    public R page(Page<KxsWarehouse> page, SysWarehousePageDTO param) {
+        kxsWarehouseService.warehousePage(page, param);
+        return R.ok(page);
+    }
+
+    /**
+     * 通过搜索条件查询用户数据
+     * @param warehouseSearchDTO
+     * @return
+     */
+    @Inner
+    @PostMapping("/search/list")
+    public R searchWarehouseList(@RequestBody WarehouseSearchDTO warehouseSearchDTO) {
+        return R.ok(kxsWarehouseService.searchWarehouseList(warehouseSearchDTO));
+    }
+
+
+
+}
+

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsMachineApplyMapper.java

@@ -3,7 +3,7 @@ package com.kxs.store.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.store.api.dto.admin.SysMachineApplyPageDTO;
+import com.kxs.store.api.dto.admin.machineApply.SysMachineApplyPageDTO;
 import com.kxs.store.api.dto.kxsapp.storeOrder.OrderMonthTotalDTO;
 import com.kxs.store.api.dto.kxsapp.storeOrder.OrderMonthTotalDetailDTO;
 import com.kxs.store.api.dto.kxsapp.storeOrder.StoreOrderListDTO;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsWarehouseMapper.java

@@ -3,6 +3,7 @@ package com.kxs.store.biz.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.store.api.dto.admin.machine.SysWarehousePageDTO;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.KxsWarehouse;
 import com.kxs.store.api.vo.kxsapp.store.StoreBrandListVO;
@@ -39,5 +40,16 @@ public interface KxsWarehouseMapper extends BaseMapper<KxsWarehouse> {
      */
     List<StoreListVO> userStoreList(Long userId);
 
+
+    /**
+     * 分页查询仓库列表
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsWarehouse> warehousePage(Page page, @Param("query") SysWarehousePageDTO param);
+
+    List<Integer> searchWarehouseList();
+
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsMachineApplyService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
-import com.kxs.store.api.dto.admin.SysMachineApplyPageDTO;
+import com.kxs.store.api.dto.admin.machineApply.SysMachineApplyPageDTO;
 import com.kxs.store.api.dto.kxsapp.storeOrder.*;
 import com.kxs.store.api.model.KxsMachineApply;
 import com.kxs.store.api.vo.admin.machineApply.SysMachineApplyApplyDetailVO;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/KxsWarehouseService.java

@@ -3,11 +3,14 @@ package com.kxs.store.biz.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.store.api.dto.admin.machine.SysWarehousePageDTO;
+import com.kxs.store.api.dto.admin.machine.WarehouseSearchDTO;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.KxsWarehouse;
 import com.kxs.store.api.vo.kxsapp.store.StoreDataVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreSearchListVO;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -43,5 +46,21 @@ public interface KxsWarehouseService extends IService<KxsWarehouse> {
      */
     StoreDataVO storeData(Integer warehouseId);
 
+
+    /**
+     * 分页查询仓库信息
+     * @param page
+     * @param param
+     * @return
+     */
+    List<KxsWarehouse> warehousePage(Page page, SysWarehousePageDTO param);
+
+
+    /**
+     * 通过搜索条件查询仓库id集合
+     * @param warehouseSearchDTO
+     * @return
+     */
+    List<Integer> searchWarehouseList(WarehouseSearchDTO warehouseSearchDTO);
 }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -3,7 +3,6 @@ package com.kxs.store.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.IdUtil;
@@ -22,8 +21,7 @@ import com.kxs.product.api.model.KxsBrand;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.model.KxsMachineCirculationLog;
 import com.kxs.product.api.model.KxsTicket;
-import com.kxs.product.api.vo.admin.so.SysSoPageVO;
-import com.kxs.store.api.dto.admin.SysMachineApplyPageDTO;
+import com.kxs.store.api.dto.admin.machineApply.SysMachineApplyPageDTO;
 import com.kxs.store.api.dto.kxsapp.storeOrder.*;
 import com.kxs.store.api.model.*;
 import com.kxs.store.api.vo.admin.machineApply.SysMachineApplyApplyDetailVO;
@@ -54,8 +52,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsWarehouseServiceImpl.java

@@ -1,7 +1,10 @@
 package com.kxs.store.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +15,8 @@ import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.RetOps;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.product.api.feign.RemoteKxsProductService;
+import com.kxs.store.api.dto.admin.machine.SysWarehousePageDTO;
+import com.kxs.store.api.dto.admin.machine.WarehouseSearchDTO;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.*;
 import com.kxs.store.api.vo.kxsapp.store.StoreDataVO;
@@ -20,12 +25,15 @@ import com.kxs.store.api.vo.kxsapp.store.StoreSearchListVO;
 import com.kxs.store.biz.constant.enums.MachineOrderStatusEnum;
 import com.kxs.store.biz.mapper.*;
 import com.kxs.store.biz.service.KxsWarehouseService;
+import com.kxs.user.api.dto.admin.user.UserSearchDTO;
 import com.kxs.user.api.feign.RemoteKxsUserService;
 import com.kxs.user.api.model.KxsUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 客小爽仓库表(KxsWarehouse)表服务实现类
@@ -116,6 +124,58 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
         return storeDataVO;
     }
 
+    @Override
+    public List<KxsWarehouse> warehousePage(Page page, SysWarehousePageDTO param) {
+        String warehouseAdminNo = param.getWarehouseAdminNo();
+        List<Integer> searchUserIds = param.getWarehouseAdminIds();
+        if(StringUtils.isNotBlank(warehouseAdminNo)){
+            UserSearchDTO userSearchDTO = new UserSearchDTO();
+            userSearchDTO.setUserCode(warehouseAdminNo);
+            List<Integer> userIds = getUserIdsSearch(userSearchDTO);
+            if(CollectionUtil.isNotEmpty(userIds)){
+                if(searchUserIds == null){
+                    searchUserIds = new ArrayList<>();
+                }
+                searchUserIds.addAll(userIds);
+            }else{
+                return new ArrayList<>();
+            }
+        }
+        //设置用户userIds
+        param.setWarehouseAdminIds(searchUserIds);
+        List<KxsWarehouse> list = baseMapper.warehousePage(page, param);
+        if(page != null){
+            page.setRecords(list);
+        }
+        return list;
+    }
+
+    @Override
+    public List<Integer> searchWarehouseList(WarehouseSearchDTO warehouseSearchDTO) {
+        LambdaQueryWrapper<KxsWarehouse> query = new LambdaQueryWrapper();
+        query.like(StringUtils.isNotBlank(warehouseSearchDTO.getWarehouseNo()),KxsWarehouse::getWarehouseNo,warehouseSearchDTO.getWarehouseNo());
+        query.like(StringUtils.isNotBlank(warehouseSearchDTO.getWarehouseUserCode()),KxsWarehouse::getWarehouseUserCode,warehouseSearchDTO.getWarehouseUserCode());
+        query.last("limit 100");
+        List<Integer> ids = new ArrayList<>();
+        List<KxsWarehouse> warehouseList = this.list(query);
+        if(CollectionUtil.isNotEmpty(warehouseList)){
+            ids = warehouseList.stream().map(o -> o.getId()).collect(Collectors.toList());
+        }
+        return ids;
+    }
+
+    /**
+     * 通过条件获取用户id数据
+     * @return
+     */
+    private List<Integer> getUserIdsSearch(UserSearchDTO userSearchDTO){
+        R<List<Integer>> rList = remoteKxsUserService.searchUserList(userSearchDTO, SecurityConstants.FROM_IN);
+        if (rList.getStatus() != 1) {
+            throw new GlobalCustomerException("用户服务请求异常");
+        }else{
+            return rList.getData();
+        }
+    }
 
 }
 

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsWarehouseMapper.xml

@@ -63,5 +63,37 @@
           and  warehouse_type < 2
     </select>
 
+    <select id="warehousePage" resultMap="KxsWarehouseMap">
+        SELECT
+            kw.*
+        FROM
+            kxs_warehouse kw
+        <where>
+            and kw.del_flag = 0
+            <if test="query.warehouseNo != null and query.warehouseNo != ''">
+                <bind name="warehouseNoLike" value="'%'+query.warehouseNo+'%'"/>
+                AND kw.warehouse_no LIKE #{warehouseNoLike}
+            </if>
+            <if test="query.warehouseUserName != null and query.warehouseUserName != ''">
+                <bind name="warehouseUserNameLike" value="'%'+query.warehouseUserName+'%'"/>
+                AND kw.warehouse_user_name LIKE #{warehouseUserNameLike}
+            </if>
+            <if test="query.warehouseUserCode != null and query.warehouseUserCode != ''">
+                <bind name="warehouseUserCodeLike" value="'%'+query.warehouseUserCode+'%'"/>
+                AND kw.warehouse_user_code LIKE #{warehouseUserCodeLike}
+            </if>
+            <if test="query.warehouseUserCode != null and query.warehouseUserCode != ''">
+                <bind name="warehouseUserCodeLike" value="'%'+query.warehouseUserCode+'%'"/>
+                AND kw.warehouse_user_code LIKE #{warehouseUserCodeLike}
+            </if>
+            <if test="query.warehouseAdminIds != null and query.warehouseAdminIds.size()>0">
+                and kw.warehouse_admin_id in
+                <foreach collection="query.warehouseAdminIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 
 </mapper>

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserPageDTO.java

@@ -38,7 +38,7 @@ public class SysUserPageDTO {
      * 身份证号
      */
     @Schema(description = "身份证号")
-    private Object idCard;
+    private String idCard;
 
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/admin/user/SysUserWhereListDTO.java

@@ -26,7 +26,7 @@ public class SysUserWhereListDTO {
      * 0上级创客 1下级直属创客
      */
     @Schema(description = "0上级创客 1下级直属创客")
-    private Object queryType;
+    private Integer queryType;
 
     /**
      * 父id

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserServiceImpl.java

@@ -64,6 +64,7 @@ import com.kxs.user.api.vo.admin.user.SysTopUserVO;
 import com.kxs.user.api.vo.admin.user.SysUserPageVO;
 import com.kxs.user.api.vo.admin.user.SysUserUserAccountListVO;
 import com.kxs.user.api.vo.kxsapp.user.RealUserInfoVO;
+import com.kxs.user.api.vo.kxsapp.user.SearchMyUserListVO;
 import com.kxs.user.api.vo.kxsapp.user.UserCodeInfoVO;
 import com.kxs.user.api.vo.kxsapp.user.UserInfoVO;
 import com.kxs.user.api.vo.kxsapp.user.UserMyUserDetailVO;