仓库预发机接口代码

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/BrandTypeEnum.java

@@ -0,0 +1,30 @@
+package com.kxs.common.core.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 机器类型enum
+ *
+ * @author Lxq
+ * @date 2023-10-25
+ */
+@Getter
+@AllArgsConstructor
+public enum BrandTypeEnum {
+
+
+    /**
+     * 产品类型
+     */
+    DQ_PRICE(200, "电签价格"),
+    DJ_PRICE(300, "大机价格"),
+    DIANQIAN(0, "电签"),
+    DAJI(1, "大POS");
+
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/ErrorTypeEnum.java

@@ -22,6 +22,7 @@ public enum ErrorTypeEnum {
 
 	SYS_PARAM_DELETE_SYSTEM(-1, "系统内置参数不能删除"), SYS_DICT_DELETE_SYSTEM(-1, "系统内置字典不允许删除"),
 	SYS_MENU_DELETE_EXISTING(-1, "菜单存在下级节点 删除失败"), SYS_USER_USERNAME_EXISTING(-1, "用户名已存在"),
+	REMOTE_DATA_ERROR(-1, "远程数据调用错误"),
 	SYS_USER_UPDATE_PASSWORD_ERROR(-1, "用户原密码错误"), SYS_DICT_UPDATE_SYSTEM(-1, "系统内置字典不能修改");
 
 	private final int code;

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/KindTypeEnum.java

@@ -0,0 +1,28 @@
+package com.kxs.common.core.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 变动类型enum
+ *
+ * @author Lxq
+ * @date 2023-10-25
+ */
+@Getter
+@AllArgsConstructor
+public enum KindTypeEnum {
+
+
+    /**
+     * 变动类型
+     */
+    ADD("add", "加"),
+    SUB("sub", "减");
+
+
+    //状态码
+    private final String type;
+    //状态码码描述
+    private final String description;
+}

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/MachineTypeEnum.java → kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/MachineTypeEnum.java

@@ -1,4 +1,4 @@
-package com.kxs.product.biz.constant.enums;
+package com.kxs.common.core.constant.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -20,6 +20,7 @@ public enum MachineTypeEnum {
     STATUS_OUT(1, "已出库"),
     STATUS_REFUND(2, "已退回"),
     STATUS_RECYCLE(3, "可回收"),
+    STATUS_RE_OVER(4, "已回收"),
     /**
      * 机具类型
      */

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/enums/TotalTypeEnum.java

@@ -0,0 +1,28 @@
+package com.kxs.common.core.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 统计存储类型
+ *
+ * @author Lxq
+ * @date 2023-10-25
+ */
+@Getter
+@AllArgsConstructor
+public enum TotalTypeEnum {
+
+
+    /**
+     * 统计存储类型
+     */
+    date(1, "天"),
+    month(0, "月");
+
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/util/TotalDateUtil.java

@@ -0,0 +1,37 @@
+package com.kxs.common.core.util;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+
+import java.time.LocalDate;
+
+/**
+ * 仓库模块 日期操作
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-11
+ */
+public class TotalDateUtil {
+
+    /**
+     * 获取日期 格式 20240110
+     *
+     * @return {@link String}
+     */
+    public static Integer getDateNumber(LocalDate date){
+
+        return Integer.valueOf(LocalDateTimeUtil.format(date, DatePattern.PURE_DATE_PATTERN));
+    }
+
+    /**
+     * 获取月份 格式 202401
+     *
+     * @return {@link String}
+     */
+
+    public static Integer getMonthNumber(LocalDate date){
+
+        return Integer.valueOf(LocalDateTimeUtil.format(date, DatePattern.SIMPLE_MONTH_PATTERN));
+    }
+
+}

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/util/SecurityUtils.java

@@ -13,6 +13,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
+ * 安全实用程序
  * 安全工具類
  *
  * @author 没秃顶的码农

kxs-product/kxs-product-api/pom.xml

@@ -35,6 +35,15 @@
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
         </dependency>
-
+        <!-- LB 扩展 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+        <!--caffeine 替换LB 默认缓存实现-->
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
     </dependencies>
 </project>

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/StoreActMachineDayDetailDTO.java

@@ -0,0 +1,51 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * 订单管理-激活统计明细-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:18
+ */
+@Data
+public class StoreActMachineDayDetailDTO {
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+    /**
+     * 品牌id
+     */
+    @Schema(description = "品牌id")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 月份
+     */
+    @Schema(description = "月份")
+    @NotNull(message = "月份不能为空")
+    private String month;
+
+
+    /**
+     * 开始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/machine/StoreActMachineMonthTotalDTO.java

@@ -0,0 +1,35 @@
+package com.kxs.product.api.dto.kxsapp.machine;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * 订单管理-激活统计-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:18
+ */
+@Data
+public class StoreActMachineMonthTotalDTO {
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+    /**
+     * 品牌id
+     */
+    @Schema(description = "品牌id")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/RemoteKxsProductService.java

@@ -0,0 +1,100 @@
+
+package com.kxs.product.api.feign;
+
+import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.util.R;
+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 org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.service.annotation.GetExchange;
+import org.springframework.web.service.annotation.PostExchange;
+
+/**
+ * @author Lxq
+ * @date 2021/6/22
+ */
+public interface RemoteKxsProductService {
+
+	/**
+	 * 查询品牌
+	 * @param id id
+	 * @param from 调用标志
+	 * @return R
+	 */
+	@GetExchange("/brand/loadByBrand")
+	R<KxsBrand> loadByBrand(@RequestParam("id") Integer id, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 通过sn查询券码信息
+	 * @param sn 券码
+	 * @param from 调用标志
+	 * @return R
+	 */
+	@GetExchange("/ticket/loadTicketBySn")
+	R<KxsTicket> loadTicketBySn(@RequestParam("sn") String sn, @RequestHeader(SecurityConstants.FROM) String from);
+
+
+	/**
+	 * 更新券
+	 *
+	 * @param ticket 券码
+	 * @param from   调用标志
+	 * @return {@link R}<{@link KxsTicket}>
+	 */
+	@PostExchange("/ticket/updateByTicket")
+	R<Boolean> updateByTicket(@RequestBody KxsTicket ticket, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 通过sn查询机具信息
+	 * @param sn 券码
+	 * @param from 调用标志
+	 * @return R
+	 */
+	@GetExchange("/machine/loadMachineBySn")
+	R<KxsMachine> loadMachineBySn(@RequestParam("sn") String sn, @RequestHeader(SecurityConstants.FROM) String from);
+
+
+	/**
+	 * 更新机具
+	 *
+	 * @param machine 机具
+	 * @param from    调用标志
+	 * @return {@link R}<{@link Boolean}>
+	 */
+	@PostExchange("/machine/updateByMachine")
+	R<Boolean> updateByMachine(@RequestBody KxsMachine machine, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 按 ID 查询机具
+	 *
+	 * @param machineId 机具 ID
+	 * @param from      调用标志
+	 * @return {@link R}<{@link KxsMachine}>
+	 */
+	@GetExchange("/machine/loadMachineById")
+	R<KxsMachine> loadMachineById(@RequestParam("id") Integer machineId, @RequestHeader(SecurityConstants.FROM) String from);
+
+
+	/**
+	 * 查询机具循环记录
+	 *
+	 * @param machineId 机具 ID
+	 * @return {@link R}<{@link KxsMachine}>
+	 */
+	@GetExchange("/machineCirculationLog/loadCirculationLogByMachineId")
+	R<KxsMachineCirculationLog> loadCirculationLogByMachineId(@RequestParam("machineId") Integer machineId, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 可回收机具数量
+	 *
+	 * @param from   调用标志
+	 * @param userId 用户 ID
+	 * @return {@link R}<{@link Integer}>
+	 */
+	@GetExchange("/machine/loadRecoverableData")
+	R<Integer> loadRecoverableData(@RequestParam("userId") Long userId, @RequestHeader(SecurityConstants.FROM) String from);
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/config/KxsProductFeignClientConfiguration.java

@@ -0,0 +1,77 @@
+package com.kxs.product.api.feign.config;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import com.kxs.common.core.constant.ServiceNameConstants;
+import com.kxs.product.api.feign.RemoteKxsProductService;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.cloud.client.loadbalancer.reactive.ReactorLoadBalancerExchangeFilterFunction;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.support.WebClientAdapter;
+import org.springframework.web.service.invoker.HttpServiceProxyFactory;
+
+/**
+ * <p>
+ * 当前服务的webClient配置
+ * 服务下的远程调用统一在此配置
+ * 使用注册中心 需配置远程调用器 以实现负载均衡
+ * </p>
+ *
+ * @author 没秃顶的码农
+ * @date 2023/11/13
+ */
+@Configuration
+@RequiredArgsConstructor
+public class KxsProductFeignClientConfiguration {
+
+	/**
+	 * 负载均衡器
+	 */
+	private final ReactorLoadBalancerExchangeFilterFunction reactorLoadBalancerExchangeFilterFunction;
+
+	private static final String SERVICE_NAME = ServiceNameConstants.CLIENT_NAME + ServiceNameConstants.USER_SERVICE;
+
+	@Bean("kxsProductFeignClient")
+	public WebClient oauthRequestInterceptor() {
+
+		return WebClient.builder()
+			// 给请求添加过滤器，添加自定义的认证头
+			.filter((request, next) -> {
+				ClientRequest.Builder filtered = ClientRequest.from(request);
+
+				ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder
+					.getRequestAttributes();
+				// 不是web请求不传递token
+				if (requestAttributes != null) {
+					HttpServletRequest httpServletRequest = requestAttributes.getRequest();
+					String token = httpServletRequest.getHeader(HttpHeaders.AUTHORIZATION);
+					if (!CharSequenceUtil.isBlank(token)) {
+						// 传递token
+						filtered.header(HttpHeaders.AUTHORIZATION, token);
+					}
+				}
+				return next.exchange(filtered.build());
+			}).filter(reactorLoadBalancerExchangeFilterFunction)
+			.baseUrl(SERVICE_NAME)
+			.build();
+	}
+
+	/**
+	 * 远程日志服务
+	 * @param client 客户端
+	 * @return 远程日志服务
+	 */
+	@Bean
+	RemoteKxsProductService remoteKxsUserService(@Qualifier("kxsProductFeignClient") WebClient client) {
+		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+		return factory.createClient(RemoteKxsProductService.class);
+	}
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineCirculationLog.java

@@ -0,0 +1,115 @@
+package com.kxs.product.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽循环机记录表(KxsMachineCirculationLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-04 16:20:11
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineCirculationLog extends Model<KxsMachineCirculationLog> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 上级ID
+     */
+    @Schema(description = "上级ID")
+    private Integer pid;
+
+
+    /**
+     * 上级路径
+     */
+    @Schema(description = "上级路径")
+    private String pidPath;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 订单ID
+     */
+    @Schema(description = "订单ID")
+    private Integer orderId;
+
+
+    /**
+     * 源sn
+     */
+    @Schema(description = "源sn")
+    private String sourceSn;
+
+
+
+
+}
+

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsTicket.java

@@ -66,6 +66,12 @@ public class KxsTicket extends Model<KxsTicket> implements Serializable {
     @Schema(description = "版本")
     private Integer version;
 
+    /**
+     * 状态 0未使用 1已使用 2已申请冻结
+     */
+    @Schema(description = "状态 0未使用 1已使用 2已申请冻结")
+    private Integer status;
+
 
     /**
      * 用户ID

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/StoreActMachineDayDetailVO.java

@@ -0,0 +1,43 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 订单管理-激活统计明细vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:18
+ */
+@Data
+@Schema(description = "订单管理-激活统计明细返回实体")
+public class StoreActMachineDayDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 时间
+     */
+    @Schema(description = "时间")
+    private Object date;
+
+
+    /**
+     * 激活总数
+     */
+    @Schema(description = "激活总数")
+    private Object totalNumber;
+
+
+
+
+
+	
+
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/StoreActMachineMonthTotalVO.java

@@ -0,0 +1,43 @@
+package com.kxs.product.api.vo.kxsapp.machine;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 订单管理-激活统计vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:18
+ */
+@Data
+@Schema(description = "订单管理-激活统计返回实体")
+public class StoreActMachineMonthTotalVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 激活月份
+     */
+    @Schema(description = "激活月份")
+    private String month;
+
+
+    /**
+     * 激活总数量
+     */
+    @Schema(description = "激活总数量")
+    private Integer totalNumber;
+
+
+
+
+
+	
+
+}

kxs-product/kxs-product-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.kxs.product.api.feign.config.KxsProductFeignClientConfiguration

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/constant/enums/ProductErrorTypeEnum.java

@@ -16,7 +16,7 @@ public enum ProductErrorTypeEnum {
 	ORDER_EMPTY(-1, "订单不存在"),
 	ORDER_NO_CANCEL(-1, "订单已不能取消"),
 	ORDER_NO_CONFIRM(-1, "订单已不能收货"),
-	USER_IS_NOT_FIND(-1, "该创客不是下级"),
+	USER_IS_NOT_FIND(-1, "划拨对象不在您的权限范围"),
 	USER_IS_NOT_AUTH(-1, "该创客未实名认证"),
 	MACHINE_NOT_FOUND(-1, "SN码不存在"),
 	MACHINE_BIND(-1, "该机具已绑定"),

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/BrandController.java → kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/BrandController.java

@@ -1,6 +1,7 @@
-package com.kxs.product.biz.controller;
+package com.kxs.product.biz.controller.kxsapp;
 
 import com.kxs.common.core.util.R;
+import com.kxs.common.security.annotation.Inner;
 import com.kxs.product.biz.service.KxsBrandService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -38,6 +39,20 @@ public class BrandController {
     }
 
 
+    /**
+     * 按品牌id
+     *
+     * @param id id
+     * @return {@link R}
+     */
+    @Inner
+    @GetMapping("/loadByBrand")
+    public R loadByBrand(@RequestParam("id") Integer id) {
+
+        return R.ok(kxsBrandService.getById(id));
+    }
+
+
     /**
      * 品牌排序
      *

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineCirculationLogController.java

@@ -0,0 +1,41 @@
+package com.kxs.product.biz.controller.kxsapp;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kxs.common.core.util.R;
+import com.kxs.common.security.annotation.Inner;
+import com.kxs.product.api.model.KxsMachineCirculationLog;
+import com.kxs.product.biz.service.KxsMachineCirculationLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 机器循环记录控制器
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-08
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("machineCirculationLog")
+public class MachineCirculationLogController {
+
+    private final KxsMachineCirculationLogService kxsMachineCirculationLogService;
+
+    /**
+     * 查询机具循环记录
+     *
+     * @param machineId 机具ID
+     * @return 机具循环记录
+     */
+    @Inner
+    @GetMapping("/loadCirculationLogByMachineId")
+    public R loadCirculationLogBySn(@RequestParam("machineId") Integer machineId) {
+
+        return R.ok(kxsMachineCirculationLogService.getOne(Wrappers.<KxsMachineCirculationLog>lambdaQuery().eq(KxsMachineCirculationLog::getMachineId, machineId)));
+    }
+
+
+}

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/MachineController.java → kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MachineController.java

@@ -1,8 +1,13 @@
-package com.kxs.product.biz.controller;
+package com.kxs.product.biz.controller.kxsapp;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.constant.enums.MachineTypeEnum;
 import com.kxs.common.core.util.R;
+import com.kxs.common.security.annotation.Inner;
 import com.kxs.product.api.dto.kxsapp.machine.*;
+import com.kxs.product.api.model.KxsMachine;
+import com.kxs.product.api.model.KxsTicket;
 import com.kxs.product.api.vo.kxsapp.machine.*;
 import com.kxs.product.biz.service.KxsBrandService;
 import com.kxs.product.biz.service.KxsMachineService;
@@ -163,6 +168,21 @@ public class MachineController {
         return R.ok(kxsMachineService.recycleList(page, param));
     }
 
+    /**
+     * 可回收数量 内部调用
+     *
+     * @param userId 分页对象
+     * @return 可回收数量
+     */
+    @Inner
+    @GetMapping("/loadRecoverableData")
+    public R loadRecoverableData(@RequestParam("userId") Long userId) {
+
+        return R.ok(kxsMachineService.count(Wrappers.<KxsMachine>lambdaQuery()
+                .eq(KxsMachine::getStatus, MachineTypeEnum.STATUS_RECYCLE.getType())
+                .eq(KxsMachine::getUserId, userId)));
+    }
+
 
     /**
      * 仓库库存机具列表
@@ -193,7 +213,72 @@ public class MachineController {
 
 
 
+    /**
+     * 通过sn查询信息
+     *
+     * @param sn sn
+     * @return 兑换券划拨详情
+     */
+    @Inner
+    @GetMapping("/loadTicketBySn")
+    public R loadTicketBySn(@RequestParam("sn") Integer sn) {
+
+        return R.ok(kxsMachineService.getOne(Wrappers.<KxsMachine>lambdaQuery().eq(KxsMachine::getPosSn, sn)));
+    }
+
+    /**
+     * 通过id查询信息
+     *
+     * @param id sn
+     * @return 兑换券划拨详情
+     */
+    @Inner
+    @GetMapping("/loadMachineById")
+    public R loadMachineById(@RequestParam("id") Integer id) {
+
+        return R.ok(kxsMachineService.getById(id));
+    }
+
+
+    /**
+     * 更新机具
+     *
+     * @param machine 机具
+     * @return {@link R}<{@link KxsTicket}>
+     */
+    @Inner
+    @PostMapping("/updateByMachine")
+    public R updateByMachine(@RequestBody KxsMachine machine) {
+
+        return R.ok(kxsMachineService.updateById(machine));
+    }
+
+    /**
+     * 订单管理-激活统计
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 订单管理-激活统计
+     */
+    @GetMapping("/activateMachineMonthTotal")
+    public R activateMachineMonthTotal(@ParameterObject Page<StoreActMachineMonthTotalVO> page, @Valid @ParameterObject StoreActMachineMonthTotalDTO param) {
+
+        return R.ok(kxsMachineService.activateMachineMonthTotal(page, param));
+    }
+
+
+    /**
+     * 订单管理-激活统计明细
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 订单管理-激活统计明细
+     */
+    @GetMapping("/activateMachineMonthTotalDetail")
+    public R activateMachineMonthTotalDetail(@ParameterObject Page<StoreActMachineDayDetailVO> page, @Valid @ParameterObject StoreActMachineDayDetailDTO param) {
 
+        return R.ok(kxsMachineService.activateMachineMonthTotalDetail(page, param));
+    }
 
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/MerchantController.java → kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/MerchantController.java

@@ -1,4 +1,4 @@
-package com.kxs.product.biz.controller;
+package com.kxs.product.biz.controller.kxsapp;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/ShopController.java → kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/ShopController.java

@@ -1,4 +1,4 @@
-package com.kxs.product.biz.controller;
+package com.kxs.product.biz.controller.kxsapp;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/TicketController.java → kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/TicketController.java

@@ -1,9 +1,12 @@
-package com.kxs.product.biz.controller;
+package com.kxs.product.biz.controller.kxsapp;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.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.vo.kxsapp.ticket.TicketListVO;
 import com.kxs.product.api.vo.kxsapp.ticket.TicketTransferListVO;
 import com.kxs.product.biz.service.KxsTicketService;
@@ -83,6 +86,33 @@ public class TicketController {
     }
 
 
+    /**
+     * 通过sn查询券码信息
+     *
+     * @param sn 券码
+     * @return 兑换券划拨详情
+     */
+    @Inner
+    @GetMapping("/loadTicketBySn")
+    public R loadTicketBySn(@RequestParam("sn") Integer sn) {
+
+        return R.ok(kxsTicketService.getOne(Wrappers.<KxsTicket>lambdaQuery().eq(KxsTicket::getTicketCode, sn)));
+    }
+
+
+    /**
+     * 更新券
+     *
+     * @param ticket 券码
+     * @return {@link R}<{@link KxsTicket}>
+     */
+    @Inner
+    @PostMapping("/updateByTicket")
+    public R updateByTicket(@RequestBody KxsTicket ticket) {
+
+        return R.ok(kxsTicketService.updateById(ticket));
+    }
+
 
 
 

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

@@ -0,0 +1,17 @@
+package com.kxs.product.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.product.api.model.KxsMachineCirculationLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客小爽循环机记录表(KxsMachineCirculationLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-01-04 16:20:11
+ */
+@Mapper
+public interface KxsMachineCirculationLogMapper extends BaseMapper<KxsMachineCirculationLog> {
+
+}
+

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

@@ -3,10 +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.kxsapp.machine.MachineStoreListDTO;
-import com.kxs.product.api.dto.kxsapp.machine.MachineUserListDTO;
-import com.kxs.product.api.dto.kxsapp.machine.RecycleMachineQuery;
-import com.kxs.product.api.dto.kxsapp.machine.SearchUserMachineDTO;
+import com.kxs.product.api.dto.kxsapp.machine.*;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.vo.kxsapp.machine.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -84,5 +81,23 @@ public interface KxsMachineMapper extends BaseMapper<KxsMachine> {
      * @return {@link IPage}<{@link MachineRecycleListVO}>
      */
     IPage<MachineRecycleListVO> recyclePageList(Page<MachineRecycleListVO> page, @Param("query") RecycleMachineQuery query);
+
+    /**
+     * 仓库激活统计
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActMachineMonthTotalVO}>
+     */
+    IPage<StoreActMachineMonthTotalVO> activateMachineMonthTotal(Page<StoreActMachineMonthTotalVO> page, @Param("query") StoreActMachineMonthTotalDTO param);
+
+    /**
+     * 仓库-激活统计明细
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActMachineDayDetailVO}>
+     */
+    IPage<StoreActMachineDayDetailVO> activateMachineMonthTotalDetail(Page<StoreActMachineDayDetailVO> page, @Param("query") StoreActMachineDayDetailDTO param);
 }
 

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

@@ -0,0 +1,15 @@
+package com.kxs.product.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.product.api.model.KxsMachineCirculationLog;
+
+/**
+ * 客小爽循环机记录表(KxsMachineCirculationLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-01-04 16:20:11
+ */
+public interface KxsMachineCirculationLogService extends IService<KxsMachineCirculationLog> {
+
+}
+

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

@@ -103,5 +103,23 @@ public interface KxsMachineService extends IService<KxsMachine> {
      * @return {@link IPage}<>
      */
     IPage<MachineRecycleListVO> recycleList(Page<MachineRecycleListVO> page, RecycleMachineQuery param);
+
+    /**
+     * 仓库-激活统计
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link StoreActMachineMonthTotalVO}>
+     */
+    IPage<StoreActMachineMonthTotalVO> activateMachineMonthTotal(Page<StoreActMachineMonthTotalVO> page, StoreActMachineMonthTotalDTO param);
+
+    /**
+     * 仓库-激活统计明细
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<>
+     */
+    IPage<StoreActMachineDayDetailVO> activateMachineMonthTotalDetail(Page<StoreActMachineDayDetailVO> page, StoreActMachineDayDetailDTO param);
 }
 

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

@@ -0,0 +1,19 @@
+package com.kxs.product.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.product.api.model.KxsMachineCirculationLog;
+import com.kxs.product.biz.mapper.KxsMachineCirculationLogMapper;
+import com.kxs.product.biz.service.KxsMachineCirculationLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 客小爽循环机记录表(KxsMachineCirculationLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-01-04 16:20:11
+ */
+@Service("kxsMachineCirculationLogService")
+public class KxsMachineCirculationLogServiceImpl extends ServiceImpl<KxsMachineCirculationLogMapper, KxsMachineCirculationLog> implements KxsMachineCirculationLogService {
+
+}
+

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

@@ -1,5 +1,6 @@
 package com.kxs.product.biz.service.impl;
 
+import cn.hutool.core.date.DatePattern;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,7 +14,7 @@ import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.product.api.dto.kxsapp.machine.*;
 import com.kxs.product.api.model.*;
 import com.kxs.product.api.vo.kxsapp.machine.*;
-import com.kxs.product.biz.constant.enums.MachineTypeEnum;
+import com.kxs.common.core.constant.enums.MachineTypeEnum;
 import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;
 import com.kxs.product.biz.mapper.KxsBrandMapper;
 import com.kxs.product.biz.mapper.KxsMachineMapper;
@@ -26,7 +27,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 /**
@@ -201,6 +204,27 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
         return baseMapper.recyclePageList(page, param);
     }
 
+    @Override
+    public IPage<StoreActMachineMonthTotalVO> activateMachineMonthTotal(Page<StoreActMachineMonthTotalVO> page, StoreActMachineMonthTotalDTO param) {
+
+        return baseMapper.activateMachineMonthTotal(page, param);
+    }
+
+    @Override
+    public IPage<StoreActMachineDayDetailVO> activateMachineMonthTotalDetail(Page<StoreActMachineDayDetailVO> page, StoreActMachineDayDetailDTO param) {
+
+        String month = param.getMonth();
+        //根据月份获取本月开始时间和结束时间
+        LocalDate date = LocalDate.parse(month, DatePattern.NORM_MONTH_FORMATTER);
+        LocalDateTime startTime = LocalDateTime.of(date, LocalTime.MIN);
+        LocalDateTime endTime = LocalDateTime.of(date.plusMonths(1), LocalTime.MAX);
+
+        param.setStartDate(String.valueOf(startTime));
+        param.setEndDate(String.valueOf(endTime));
+
+        return baseMapper.activateMachineMonthTotalDetail(page, param);
+    }
+
 
 }
 

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

@@ -0,0 +1,20 @@
+<?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.kxs.product.biz.mapper.KxsMachineCirculationLogMapper">
+
+    <resultMap type="com.kxs.product.api.model.KxsMachineCirculationLog" id="KxsMachineCirculationLogMap">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+        <result column="machine_id" property="machineId" />
+        <result column="pid" property="pid" />
+        <result column="pid_path" property="pidPath" />
+        <result column="user_id" property="userId" />
+        <result column="order_id" property="orderId" />
+        <result column="source_sn" property="sourceSn" />
+
+    </resultMap>
+
+</mapper>

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

@@ -129,5 +129,36 @@
         </if>
         order by recycle_end_time desc
     </select>
+    <select id="activateMachineMonthTotal" resultType="com.kxs.product.api.vo.kxsapp.machine.StoreActMachineMonthTotalVO">
+        select * from
+        (
+        select count(id) as totalNumber, DATE_FORMAT(act_time,'%Y-%m') AS `month`
+        from kxs_machine a
+        <where>
+            and a.brand_id = #{query.brandId}
+            and a.warehouse_id = #{query.warehouseId}
+            and a.is_act = 1
+        </where>
+        GROUP BY `month`
+        ) as tmp
+        ORDER BY `date` desc
+    </select>
+    <select id="activateMachineMonthTotalDetail" resultType="com.kxs.product.api.vo.kxsapp.machine.StoreActMachineDayDetailVO">
+        SELECT *
+        FROM (
+        SELECT count(id) as number, DATE_FORMAT(act_time,'%Y-%m-%d') AS `date`
+        FROM kxs_machine a
+        <where>
+            and a.brand_id = #{query.brandId}
+            and a.warehouse_id = #{query.warehouseId}
+            and a.is_act = 1
+            <if test="query.startDate != null and query.endDate != null">
+                and a.act_time between #{query.startDate} and #{query.endDate}
+            </if>
+        </where>
+        GROUP BY `date`
+        ) AS tmp
+        ORDER BY `date` desc
+    </select>
 
 </mapper>

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

@@ -14,6 +14,7 @@
         <result column="ticket_allot_path" property="ticketAllotPath" />
         <result column="order_id" property="orderId" />
         <result column="is_leader" property="isLeader" />
+        <result column="status" property="status" />
 
     </resultMap>
     <update id="updateBatchTransfer">

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/store/StoreSearchListDTO.java

@@ -0,0 +1,34 @@
+package com.kxs.store.api.dto.kxsapp.store;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * 搜索仓库列表-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:17
+ */
+@Data
+public class StoreSearchListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private Object keyword;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeAdvance/StoreAdvanceAddAdvanceDTO.java

@@ -0,0 +1,52 @@
+package com.kxs.store.api.dto.kxsapp.storeAdvance;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 小分仓-预发货到小分仓-dto
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:17
+ */
+@Data
+public class StoreAdvanceAddAdvanceDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotBlank(message = "品牌不能为空")
+    private Integer brandId;
+
+    /**
+     * 发货仓库ID
+     */
+    @Schema(description = "发货仓库ID")
+    @NotBlank(message = "发货仓库不能为空")
+    private Integer sendWarehouseId;
+
+    /**
+     * 用户编号
+     */
+    @Schema(description = "用户编号")
+    @NotBlank(message = "用户编号不能为空")
+    private String userCode;
+
+
+    /**
+     * 机具sn集合
+     */
+    @Schema(description = "机具sn集合")
+    @NotEmpty(message = "机具不能为空")
+    private List<String> snList;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeAdvance/StoreAdvanceGetUserDetailDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.store.api.dto.kxsapp.storeAdvance;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 小分仓-查询用户-dto
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:17
+ */
+@Data
+public class StoreAdvanceGetUserDetailDTO {
+
+    /**
+     * 用户编号
+     */
+    @Schema(description = "用户编号")
+    private String userCode;
+
+
+    /**
+     * 本次预发额度
+     */
+    @Schema(description = "本次预发额度")
+    private BigDecimal amount;
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeLimit/ForAmountWithdrawDTO.java

@@ -0,0 +1,41 @@
+package com.kxs.store.api.dto.kxsapp.storeLimit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 申请补货-减少临额-dto
+ *
+ * @author 系统
+ * @date 2024-01-10 18:14:57
+ */
+@Data
+public class ForAmountWithdrawDTO {
+
+    /**
+     * 银行卡提现金额
+     */
+    @Schema(description = "银行卡提现金额")
+    private BigDecimal bankAmount;
+
+
+    /**
+     * 提现类型 0分仓 1小分仓
+     */
+    @Schema(description = "提现类型 0分仓 1小分仓")
+    private Integer withdrawType;
+
+
+    /**
+     * 余额提现金额
+     */
+    @Schema(description = "余额提现金额")
+    private BigDecimal yueAmount;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeLimit/WarehouseApplySubmitDTO.java

@@ -0,0 +1,44 @@
+package com.kxs.store.api.dto.kxsapp.storeLimit;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 仓库 申请补货 DTO
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-11
+ */
+@Data
+public class WarehouseApplySubmitDTO {
+
+    /**
+     * 申请数量
+     */
+    @NotNull(message = "申请数量不能为空")
+    private Integer applyNum;
+
+    private List<applyBrandInfoDTO> applyData;
+
+}
+
+@Data
+class applyBrandInfoDTO{
+
+    /**
+     * 品牌 ID
+     */
+    private Integer brandId;
+
+    /**
+     * 品牌
+     */
+    private String brandName;
+
+    /**
+     * 数量
+     */
+    private Integer number;
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/ApplyMachineDTO.java

@@ -0,0 +1,100 @@
+package com.kxs.store.api.dto.kxsapp.storeOrder;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 订单管理-申请机具-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:03
+ */
+@Data
+public class ApplyMachineDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+    /**
+     * 提货方式 0自提 1邮寄
+     */
+    @Schema(description = "提货方式 0自提 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    @NotNull(message = "申请数量不能为空")
+    private Integer applyNum;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String contacts;
+
+
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String phone;
+
+
+    /**
+     * 收货地址
+     */
+    @Schema(description = "收货地址")
+    private String address;
+
+
+    /**
+     * 申请类型 0循环申请 1兑换券
+     */
+    @Schema(description = "申请类型 0循环申请 1兑换券")
+    private Integer applyType;
+
+
+    /**
+     * 券码、机具号集合
+     */
+    @Schema(description = "券码、机具号集合")
+    @NotEmpty(message = "券码、机具号集合不能为空")
+    private List<String> snList;
+
+    /**
+     * 预发机列表
+     */
+    @Schema(description = "预发机列表")
+    private List<String> advanceList;
+
+    /**
+     * 是否预发机订单 0否 1是
+     */
+    @Schema(description = "是否预发机订单 0否 1是")
+    @NotNull(message = "是否预发机不能为空")
+    private Integer isAdvance;
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/OrderMonthTotalDTO.java

@@ -0,0 +1,35 @@
+package com.kxs.store.api.dto.kxsapp.storeOrder;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * 订单管理-发货统计-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:01
+ */
+@Data
+public class OrderMonthTotalDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/OrderMonthTotalDetailDTO.java

@@ -0,0 +1,52 @@
+package com.kxs.store.api.dto.kxsapp.storeOrder;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * 订单管理-发货统计明细-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:01
+ */
+@Data
+public class OrderMonthTotalDetailDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+    /**
+     * 查询月份
+     */
+    @Schema(description = "查询月份")
+    @NotBlank(message = "查询月份不能为空")
+    private String month;
+
+    /**
+     * 开始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/StoreOrderListDTO.java

@@ -0,0 +1,49 @@
+package com.kxs.store.api.dto.kxsapp.storeOrder;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+
+/**
+ * 订单管理-订单列表-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:01
+ */
+@Data
+public class StoreOrderListDTO {
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+    /**
+     * 订单状态 0待审核 1申请成功 2已驳回
+     */
+    @Schema(description = "订单状态 0待审核 1申请成功 2已驳回")
+    private Integer status;
+
+
+    /**
+     * 关键字搜索
+     */
+    @Schema(description = "关键字搜索")
+    private Object keyword;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/StoreOrderTransferUserDTO.java

@@ -0,0 +1,38 @@
+package com.kxs.store.api.dto.kxsapp.storeOrder;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 订单管理-划拨-dto
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:00
+ */
+@Data
+public class StoreOrderTransferUserDTO {
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    @NotBlank(message = "订单号不能为空")
+    private String orderSn;
+
+
+    /**
+     * 机具码集合
+     */
+    @Schema(description = "机具码集合")
+    @NotEmpty(message = "发货机具不能为空")
+    private List<String> snList;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeRecycle/RecycleConfirmDTO.java

@@ -0,0 +1,32 @@
+package com.kxs.store.api.dto.kxsapp.storeRecycle;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 回收确认 DTO
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-09
+ */
+@Data
+@Schema(description = "待回收机具-回收确认")
+public class RecycleConfirmDTO {
+
+
+    /**
+     * 订单ID
+     */
+    @Schema(description = "订单ID")
+    private Integer id;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    private List<String> snList;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeRecycle/RecycleSubmitDTO.java

@@ -0,0 +1,61 @@
+package com.kxs.store.api.dto.kxsapp.storeRecycle;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 回收确认 DTO
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-09
+ */
+@Data
+@Schema(description = "待回收机具-回收确认")
+public class RecycleSubmitDTO {
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    @NotNull(message = "品牌ID不能为空")
+    private Integer brandId;
+
+
+    /**
+     * 送回方式 0送货上门 1邮寄
+     */
+    @Schema(description = "送回方式 0送货上门 1邮寄")
+    @NotNull(message = "提货方式不能为空")
+    private Integer getMode;
+
+
+    /**
+     * 回收仓库ID
+     */
+    @Schema(description = "回收仓库ID")
+    @NotNull(message = "仓库ID不能为空")
+    private Integer warehouseId;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    @NotBlank(message = "快递单号不能为空")
+    private String trackNo;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    @NotEmpty(message = "机具号不能为空")
+    private List<String> snList;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeRecycle/StoreRecycleMachineListDTO.java

@@ -0,0 +1,37 @@
+package com.kxs.store.api.dto.kxsapp.storeRecycle;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 待回收机具-列表DTO
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-09
+ */
+@Data
+@Schema(description = "待回收机具-列表DTO")
+public class StoreRecycleMachineListDTO {
+
+
+    /**
+     * 状态 0待发货 1已发货 2已完成 3已取消
+     */
+    @Schema(description = "状态 0待发货 1已发货 2已完成 3已取消")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+
+    /**
+     * 关键字
+     */
+    @Schema(description = "关键字")
+    private String keyword;
+
+    /**
+     * 仓库用户ID
+     */
+    @Schema(description = "仓库用户ID")
+    private Long warehouseUserId;
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/userAdvance/ConfirmAdvanceMachineDTO.java

@@ -0,0 +1,45 @@
+package com.kxs.store.api.dto.kxsapp.userAdvance;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 接收预发机-dto
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:18
+ */
+@Data
+public class ConfirmAdvanceMachineDTO {
+
+    /**
+     * 预发机订单ID
+     */
+    @Schema(description = "预发机订单ID")
+    @NotNull(message = "ID不能为空")
+    private Integer id;
+
+    /**
+     * 机具号集合
+     */
+    @Schema(description = "机具号集合")
+    @NotEmpty(message = "机具号不能为空")
+    private List<String> snList;
+
+
+    /**
+     * 1同意 2拒绝
+     */
+    @Schema(description = "1同意 2拒绝")
+    @NotNull(message = "确认类型不能为空")
+    private Integer confirmType;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/userAdvance/ForAmountWithdrawDTO.java

@@ -0,0 +1,41 @@
+package com.kxs.store.api.dto.kxsapp.userAdvance;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 临额提现-dto
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:18
+ */
+@Data
+public class ForAmountWithdrawDTO {
+
+    /**
+     * 银行卡提现金额
+     */
+    @Schema(description = "银行卡提现金额")
+    private BigDecimal bankAmount;
+
+
+    /**
+     * 提现类型 0分仓 1小分仓
+     */
+    @Schema(description = "提现类型 0分仓 1小分仓")
+    private Integer withdrawType;
+
+
+    /**
+     * 余额提现金额
+     */
+    @Schema(description = "余额提现金额")
+    private BigDecimal yueAmount;
+
+
+
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsForAmountWithdraw.java

@@ -0,0 +1,101 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库临额提现申请表(KxsForAmountWithdraw)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsForAmountWithdraw extends Model<KxsForAmountWithdraw> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 银行卡提现金额
+     */
+    @Schema(description = "银行卡提现金额")
+    private BigDecimal bankAmount;
+
+
+    /**
+     * 状态 0申请中 1提现成功 2驳回
+     */
+    @Schema(description = "状态 0申请中 1提现成功 2驳回")
+    private Integer status;
+
+
+    /**
+     * 提现类型 0分仓 1小分仓
+     */
+    @Schema(description = "提现类型 0分仓 1小分仓")
+    private Integer withdrawType;
+
+
+    /**
+     * 余额提现金额
+     */
+    @Schema(description = "余额提现金额")
+    private BigDecimal yueAmount;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineAdvance.java

@@ -0,0 +1,115 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽预发机表(KxsMachineAdvance)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-10 18:14:55
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineAdvance extends Model<KxsMachineAdvance> {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 发货人ID
+     */
+    @Schema(description = "发货人ID")
+    private Integer sendUserId;
+
+
+    /**
+     * 接收人ID
+     */
+    @Schema(description = "接收人ID")
+    private Integer toUserId;
+
+
+    /**
+     * 发货仓库ID
+     */
+    @Schema(description = "发货仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+    /**
+     * 仓库名称
+     */
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineAdvanceInfo.java

@@ -0,0 +1,142 @@
+package com.kxs.store.api.model;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 客小爽预发机明细表(KxsMachineAdvanceInfo)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-10 18:14:55
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineAdvanceInfo extends Model<KxsMachineAdvanceInfo> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 机具ID
+     */
+    @Schema(description = "机具ID")
+    private Integer machineId;
+
+
+    /**
+     * 是否申请机具 0未申请 1已申请
+     */
+    @Schema(description = "是否申请机具 0未申请 1已申请")
+    private Integer isApply;
+
+
+    /**
+     * 是否撤回 0未撤回 1已撤回
+     */
+    @Schema(description = "是否撤回 0未撤回 1已撤回")
+    private Integer isReturn;
+
+
+    /**
+     * 撤回时间
+     */
+    @Schema(description = "撤回时间")
+    private LocalDateTime returnTime;
+
+
+    /**
+     * 是否确认收货 0未确认 1已确认 2已拒绝
+     */
+    @Schema(description = "是否确认收货 0未确认 1已确认 2已拒绝")
+    private Integer isConfirm;
+
+
+    /**
+     * 是否占用预发额度 0否 1是
+     */
+    @Schema(description = "是否占用预发额度 0否 1是")
+    private Integer isUseAmount;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 是否预扣款 0否 1是
+     */
+    @Schema(description = "是否预扣款 0否 1是")
+    private Integer isAdvance;
+
+
+    /**
+     * 预扣款表ID
+     */
+    @Schema(description = "预扣款表ID")
+    private Integer advanceId;
+
+
+    /**
+     * 预发机主表ID
+     */
+    @Schema(description = "预发机主表ID")
+    private Integer orderId;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApply.java

@@ -0,0 +1,182 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽机具申请表(KxsMachineApply)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineApply extends Model<KxsMachineApply> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    private String orderSn;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 提货方式 0自提 1邮寄
+     */
+    @Schema(description = "提货方式 0自提 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    private Integer applyNum;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String contacts;
+
+
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String phone;
+
+
+    /**
+     * 收货地址
+     */
+    @Schema(description = "收货地址")
+    private String address;
+
+
+    /**
+     * 申请类型 0循环申请 1兑换券
+     */
+    @Schema(description = "申请类型 0循环申请 1兑换券")
+    private Integer applyType;
+
+
+    /**
+     * 订单状态 0待审核 1申请成功 2已驳回
+     */
+    @Schema(description = "订单状态 0待审核 1申请成功 2已驳回")
+    private Integer status;
+
+
+    /**
+     * 顶级创客ID
+     */
+    @Schema(description = "顶级创客ID")
+    private Integer topUserId;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 是否预发机订单 0否 1是
+     */
+    @Schema(description = "是否预发机订单 0否 1是")
+    private Integer isAdvance;
+
+    /**
+     * 申请用户名称
+     */
+    @Schema(description = "申请用户名称")
+    private String username;
+
+    /**
+     * 申请用户编号
+     */
+    @Schema(description = "申请用户编号")
+    private String userCode;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApplyDetail.java

@@ -0,0 +1,120 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽机具申请详情表(KxsMachineApplyDetail)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineApplyDetail extends Model<KxsMachineApplyDetail> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 申请订单ID
+     */
+    @Schema(description = "申请订单ID")
+    private Integer orderId;
+
+
+    /**
+     * 循环机具ID
+     */
+    @Schema(description = "循环机具ID")
+    private Integer recycleMachineId;
+
+
+    /**
+     * 券码ID
+     */
+    @Schema(description = "券码ID")
+    private Integer ticketId;
+
+
+    /**
+     * 申请类型 0循环申请 1兑换券
+     */
+    @Schema(description = "申请类型 0循环申请 1兑换券")
+    private Integer applyType;
+
+
+    /**
+     * 兑换券码
+     */
+    @Schema(description = "兑换券码")
+    private String ticketCode;
+
+
+    /**
+     * 发货机具号
+     */
+    @Schema(description = "发货机具号")
+    private String posSn;
+
+    /**
+     * 发货机具ID
+     */
+    @Schema(description = "发货机具ID")
+    private Integer machineId;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineRecycle.java

@@ -0,0 +1,160 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库机具回收申请表(KxsMachineRecycle)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineRecycle extends Model<KxsMachineRecycle> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 申请单号
+     */
+    @Schema(description = "申请单号")
+    private String orderSn;
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+    /**
+     * 申请人ID
+     */
+    @Schema(description = "申请人ID")
+    private Integer userId;
+
+
+    /**
+     * 送回方式 0送货上门 1邮寄
+     */
+    @Schema(description = "送回方式 0送货上门 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 回收仓库ID
+     */
+    @Schema(description = "回收仓库ID")
+    private Integer warehouseId;
+
+    /**
+     * 回收仓库所属用户ID
+     */
+    @Schema(description = "回收仓库所属用户ID")
+    private Integer warehouseUserId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    private String trackNo;
+
+
+    /**
+     * 创客姓名
+     */
+    @Schema(description = "创客姓名")
+    private String username;
+
+
+    /**
+     * 创客编号
+     */
+    @Schema(description = "创客编号")
+    private String userCode;
+
+    /**
+     * 创客电话
+     */
+    @Schema(description = "创客电话")
+    private String phone;
+
+
+    /**
+     * 状态 0待发货 1待确认 2已完成
+     */
+    @Schema(description = "状态 0待发货 1待确认 2已完成")
+    private Integer status;
+
+
+    /**
+     * 操作时间
+     */
+    @Schema(description = "操作时间")
+    private LocalDateTime operatingDate;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineRecycleInfo.java

@@ -0,0 +1,121 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库机具回收申请明细表(KxsMachineRecycleInfo)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-09 16:29:20
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsMachineRecycleInfo extends Model<KxsMachineRecycleInfo> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 循环结束时间
+     */
+    @Schema(description = "循环结束时间")
+    private LocalDateTime recycleEndTime;
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * sn
+     */
+    @Schema(description = "sn")
+    private String posSn;
+
+
+    /**
+     * 申请订单ID
+     */
+    @Schema(description = "申请订单ID")
+    private Integer orderId;
+
+
+    /**
+     * 确认收货时间
+     */
+    @Schema(description = "确认收货时间")
+    private LocalDateTime confirmTime;
+
+
+    /**
+     * 驳回时间
+     */
+    @Schema(description = "驳回时间")
+    private LocalDateTime cancelTime;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 状态 0未确认 1已确认 2已驳回 3已取消
+     */
+    @Schema(description = "状态 0未确认 1已确认 2已驳回 3已取消")
+    private Integer status;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsSendTotal.java

@@ -0,0 +1,107 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库发货统计表(KxsSendTotal)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsSendTotal extends Model<KxsSendTotal> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 统计日期 202311格式
+     */
+    @Schema(description = "统计日期 202311格式")
+    private Integer totalDate;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 发货数量
+     */
+    @Schema(description = "发货数量")
+    private Integer totalNum;
+
+
+    /**
+     * 统计类型 0月 1天
+     */
+    @Schema(description = "统计类型 0月 1天")
+    private Integer totalType;
+
+
+    /**
+     * 品牌id
+     */
+    @Schema(description = "品牌id")
+    private Integer brandId;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsToForAmount.java

@@ -0,0 +1,115 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库临额充值表(KxsToForAmount)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsToForAmount extends Model<KxsToForAmount> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 充值额度
+     */
+    @Schema(description = "充值额度")
+    private BigDecimal amount;
+
+
+    /**
+     * 付款金额
+     */
+    @Schema(description = "付款金额")
+    private BigDecimal payAmount;
+
+
+    /**
+     * 支付渠道 0余额 1支付宝
+     */
+    @Schema(description = "支付渠道 0余额 1支付宝")
+    private Integer payType;
+
+
+    /**
+     * 状态 0未支付 1已支付 2取消订单
+     */
+    @Schema(description = "状态 0未支付 1已支付 2取消订单")
+    private Integer status;
+
+
+    /**
+     * 充值类型 0分仓充值 1小分仓充值
+     */
+    @Schema(description = "充值类型 0分仓充值 1小分仓充值")
+    private Integer forType;
+
+
+    /**
+     * 商城订单id
+     */
+    @Schema(description = "商城订单id")
+    private Integer orderId;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouse.java

@@ -0,0 +1,206 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库表(KxsWarehouse)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:01
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouse extends Model<KxsWarehouse> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 仓库所属用户ID
+     */
+    @Schema(description = "仓库所属用户ID")
+    private Integer userId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 仓库联系人
+     */
+    @Schema(description = "仓库联系人")
+    private String contacts;
+
+
+    /**
+     * 仓库电话
+     */
+    @Schema(description = "仓库电话")
+    private String warehousePhone;
+
+
+    /**
+     * 仓库地址
+     */
+    @Schema(description = "仓库地址")
+    private String warehouseAddress;
+
+
+    /**
+     * 仓库编号
+     */
+    @Schema(description = "仓库编号")
+    private String warehouseNo;
+
+
+    /**
+     * 仓库管理员ID
+     */
+    @Schema(description = "仓库管理员ID")
+    private Integer warehouseAdminId;
+
+
+    /**
+     * 仓库类型 0总仓 1分仓 2运营仓
+     */
+    @Schema(description = "仓库类型 0总仓 1分仓 2运营仓")
+    private Integer warehouseType;
+
+
+    /**
+     * 上级总仓ID
+     */
+    @Schema(description = "上级总仓ID")
+    private Integer pid;
+
+
+    /**
+     * 押金
+     */
+    @Schema(description = "押金")
+    private BigDecimal pledgeAmount;
+
+
+    /**
+     * 状态 0禁用 1启用
+     */
+    @Schema(description = "状态 0禁用 1启用")
+    private Integer status;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+    /**
+     * 管理者邮箱
+     */
+    @Schema(description = "管理者邮箱")
+    private String adminEmail;
+
+
+    /**
+     * 附件地址
+     */
+    @Schema(description = "附件地址")
+    private String fileUrl;
+
+
+    /**
+     * 省份
+     */
+    @Schema(description = "省份")
+    private String province;
+
+
+    /**
+     * 城市
+     */
+    @Schema(description = "城市")
+    private String city;
+
+
+    /**
+     * 区县
+     */
+    @Schema(description = "区县")
+    private String area;
+
+
+    /**
+     * 仓库名称
+     */
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseCreditAmount.java

@@ -0,0 +1,113 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽分仓担保明细记录表(KxsWarehousePromiss)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:03
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseCreditAmount extends Model<KxsWarehouseCreditAmount> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 担保人
+     */
+    @Schema(description = "担保人")
+    private Integer creditUserId;
+
+
+    /**
+     * 担保金额
+     */
+    @Schema(description = "担保金额")
+    private BigDecimal creditAmount;
+
+
+    /**
+     * 被担保人id
+     */
+    @Schema(description = "被担保人id")
+    private Integer toCreditUserId;
+
+    /**
+     * 被担保人姓名
+     */
+    @Schema(description = "被担保人姓名")
+    private Object username;
+
+
+    /**
+     * 被担保人编号
+     */
+    @Schema(description = "被担保人编号")
+    private Object userCode;
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private Integer createBy;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseLimit.java

@@ -0,0 +1,157 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库额度表(KxsWarehouseLimit)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseLimit extends Model<KxsWarehouseLimit> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 可用额度
+     */
+    @Schema(description = "可用额度")
+    private BigDecimal validAmount;
+
+
+    /**
+     * 固定额度
+     */
+    @Schema(description = "固定额度")
+    private BigDecimal fixedAmount;
+
+
+    /**
+     * 临时额度
+     */
+    @Schema(description = "临时额度")
+    private BigDecimal forAmount;
+
+
+    /**
+     * 担保额度
+     */
+    @Schema(description = "担保额度")
+    private BigDecimal creditAmount;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+    /**
+     * 银行卡充值总额度
+     */
+    @Schema(description = "银行卡充值总额度")
+    private BigDecimal bankRechargeAmount;
+
+
+    /**
+     * 余额充值总额
+     */
+    @Schema(description = "余额充值总额")
+    private BigDecimal yueRechargeAmount;
+
+
+    /**
+     * 银行卡提现总额
+     */
+    @Schema(description = "银行卡提现总额")
+    private BigDecimal bankWithdrawAmount;
+
+
+    /**
+     * 余额提现总额
+     */
+    @Schema(description = "余额提现总额")
+    private BigDecimal yueWithdrawAmount;
+
+
+    /**
+     * 已用额度
+     */
+    @Schema(description = "已用额度")
+    private BigDecimal usedAmount;
+
+
+    /**
+     * 仓库类型 0 分仓  1 小分仓
+     */
+    @Schema(description = "仓库类型 0 分仓  1 小分仓")
+    private Integer warehouseType;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseMachineApply.java

@@ -0,0 +1,155 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽分仓申请补货订单表(KxsWarehouseMachineApply)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseMachineApply extends Model<KxsWarehouseMachineApply> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 申请订单号
+     */
+    @Schema(description = "申请订单号")
+    private String orderSn;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    private Integer applyNum;
+
+
+    /**
+     * 申请品牌数量json
+     */
+    @Schema(description = "申请品牌数量json")
+    private String applyData;
+
+
+    /**
+     * 发货数量
+     */
+    @Schema(description = "发货数量")
+    private Integer sendNum;
+
+
+    /**
+     * 使用额度
+     */
+    @Schema(description = "使用额度")
+    private BigDecimal useAmount;
+
+
+    /**
+     * 申请创客ID
+     */
+    @Schema(description = "申请创客ID")
+    private Integer userId;
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+    /**
+     * 用户编号
+     */
+    @Schema(description = "用户编号")
+    private String userCode;
+
+
+    /**
+     * 发货方式 0送货上门 1邮寄
+     */
+    @Schema(description = "发货方式 0送货上门 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    private String trackNo;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 状态 0待配货 1已发货 2已驳回
+     */
+    @Schema(description = "状态 0待配货 1已发货 2已驳回")
+    private Integer status;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseMachineApplyDetail.java

@@ -0,0 +1,93 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽分仓申请补货订单详情表(KxsWarehouseMachineApplyDetail)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:03
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseMachineApplyDetail extends Model<KxsWarehouseMachineApplyDetail> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 品牌
+     */
+    @Schema(description = "品牌")
+    private Integer brandId;
+
+
+    /**
+     * 机具sn
+     */
+    @Schema(description = "机具sn")
+    private String posSn;
+
+
+    /**
+     * 对应订单id
+     */
+    @Schema(description = "对应订单id")
+    private Integer orderId;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseStock.java

@@ -0,0 +1,111 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库库存统计表(KxsWarehouseStock)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseStock extends Model<KxsWarehouseStock> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 总库存数
+     */
+    @Schema(description = "总库存数")
+    private Integer stockTotal;
+
+
+    /**
+     * 库存数
+     */
+    @Schema(description = "库存数")
+    private Integer stockNum;
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+    /**
+     * 出库总数
+     */
+    @Schema(description = "出库总数")
+    private Integer deliveryNum;
+
+
+    /**
+     * 分仓数量
+     */
+    @Schema(description = "分仓数量")
+    private Integer branchNum;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseStockLog.java

@@ -0,0 +1,145 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽仓库库存变动记录表(KxsWarehouseStockLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseStockLog extends Model<KxsWarehouseStockLog> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 仓库ID
+     */
+    @Schema(description = "仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 操作数量
+     */
+    @Schema(description = "操作数量")
+    private Integer changeNum;
+
+
+    /**
+     * 变动类型 0入库 1出库 2调拨
+     */
+    @Schema(description = "变动类型 0入库 1出库 2调拨")
+    private Integer changeType;
+
+
+    /**
+     * 操作前总库存数
+     */
+    @Schema(description = "操作前总库存数")
+    private Integer beforeStockTotal;
+
+
+    /**
+     * 操作后库存数
+     */
+    @Schema(description = "操作后库存数")
+    private Integer afterStockTotal;
+
+
+    /**
+     * 操作前剩余库存数
+     */
+    @Schema(description = "操作前剩余库存数")
+    private Integer beforeStockNum;
+
+
+    /**
+     * 操作后剩余库存数
+     */
+    @Schema(description = "操作后剩余库存数")
+    private Integer afterStockNum;
+
+
+    /**
+     * 操作前出库数
+     */
+    @Schema(description = "操作前出库数")
+    private Integer beforeDeliveryNum;
+
+
+    /**
+     * 操作后出库数
+     */
+    @Schema(description = "操作后出库数")
+    private Integer afterDeliveryNum;
+
+    /**
+     * 操作 add加 sub减
+     */
+    private String kind;
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseUser.java

@@ -0,0 +1,86 @@
+package com.kxs.store.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客小爽小分仓表(KxsWarehouseUser)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-08 09:46:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsWarehouseUser extends Model<KxsWarehouseUser> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private Integer delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 所属仓库用户ID
+     */
+    @Schema(description = "所属仓库用户ID")
+    private Integer warehouseUserId;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+
+
+}
+

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreAdvanceMachineVO.java

@@ -0,0 +1,66 @@
+package com.kxs.store.api.vo.kxsapp.store;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 仓库预发机vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:18
+ */
+@Data
+@Schema(description = "仓库预发机返回实体")
+public class StoreAdvanceMachineVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+
+    /**
+     * 是否占用预发额度 0否 1是
+     */
+    @Schema(description = "是否占用预发额度 0否 1是")
+    private Integer isUseAmount;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 是否预扣款 0否 1是
+     */
+    @Schema(description = "是否预扣款 0否 1是")
+    private Integer isAdvance;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreDataVO.java

@@ -0,0 +1,49 @@
+package com.kxs.store.api.vo.kxsapp.store;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 仓库数据vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:17
+ */
+@Data
+@Schema(description = "仓库数据返回实体")
+public class StoreDataVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 库存数
+     */
+    @Schema(description = "库存数")
+    private Integer stockNum;
+
+
+    /**
+     * 待发货订单数
+     */
+    @Schema(description = "待发货订单数")
+    private Integer unSendCount;
+
+    /**
+     * 预发机数量
+     */
+    @Schema(description = "预发机数量")
+    private Integer preMachineCount;
+
+    /**
+     * 待回收机具数量
+     */
+    @Schema(description = "待回收机具数量")
+    private Integer recycleCount;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreFixedAmountVO.java

@@ -0,0 +1,52 @@
+package com.kxs.store.api.vo.kxsapp.store;
+
+
+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-01-08 09:46:05
+ */
+@Data
+@Schema(description = "可调降额度返回实体")
+public class StoreFixedAmountVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 银行卡可提现金额
+     */
+    @Schema(description = "银行卡可提现金额")
+    private Object bankAmount;
+
+
+    /**
+     * 余额可提现金额
+     */
+    @Schema(description = "余额可提现金额")
+    private Object yueAmount;
+
+
+    /**
+     * 可提现总金额
+     */
+    @Schema(description = "可提现总金额")
+    private Object totalAmount;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreListVO.java

@@ -0,0 +1,72 @@
+package com.kxs.store.api.vo.kxsapp.store;
+
+
+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-01-08 10:33:17
+ */
+@Data
+@Schema(description = "用户所属仓库返回实体")
+public class StoreListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 仓库电话
+     */
+    @Schema(description = "仓库电话")
+    private String warehousePhone;
+
+
+    /**
+     * 仓库编号
+     */
+    @Schema(description = "仓库编号")
+    private String warehouseNo;
+
+
+    /**
+     * 仓库名称
+     */
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreSearchListVO.java

@@ -0,0 +1,119 @@
+package com.kxs.store.api.vo.kxsapp.store;
+
+
+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-01-08 10:33:17
+ */
+@Data
+@Schema(description = "搜索仓库列表返回实体")
+public class StoreSearchListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 仓库所属用户ID
+     */
+    @Schema(description = "仓库所属用户ID")
+    private Integer userId;
+
+
+    /**
+     * 仓库联系人
+     */
+    @Schema(description = "仓库联系人")
+    private String contacts;
+
+
+    /**
+     * 仓库电话
+     */
+    @Schema(description = "仓库电话")
+    private String warehousePhone;
+
+
+    /**
+     * 仓库地址
+     */
+    @Schema(description = "仓库地址")
+    private String warehouseAddress;
+
+
+    /**
+     * 仓库编号
+     */
+    @Schema(description = "仓库编号")
+    private String warehouseNo;
+
+
+    /**
+     * 仓库类型 0总仓 1分仓 2运营仓
+     */
+    @Schema(description = "仓库类型 0总仓 1分仓 2运营仓")
+    private Integer warehouseType;
+
+
+    /**
+     * 状态 0禁用 1启用
+     */
+    @Schema(description = "状态 0禁用 1启用")
+    private Integer status;
+
+
+    /**
+     * 省份
+     */
+    @Schema(description = "省份")
+    private String province;
+
+
+    /**
+     * 城市
+     */
+    @Schema(description = "城市")
+    private String city;
+
+
+    /**
+     * 区县
+     */
+    @Schema(description = "区县")
+    private String area;
+
+
+    /**
+     * 仓库名称
+     */
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+
+    /**
+     * 库存数量
+     */
+    @Schema(description = "库存数量")
+    private Integer stockNum;
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeAdvance/AdvanceUserDetailVO.java

@@ -0,0 +1,51 @@
+package com.kxs.store.api.vo.kxsapp.storeAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 小分仓-查询用户vo
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:17
+ */
+@Data
+@Schema(description = "小分仓-查询用户返回实体")
+public class AdvanceUserDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 用户所属预发机数量
+     */
+    @Schema(description = "用户所属预发机数量")
+    private Integer advanceTotal;
+
+
+    /**
+     * 用户预发机额度
+     */
+    @Schema(description = "用户预发机额度")
+    private BigDecimal advanceAmount;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeAdvance/StoreAdvanceGetMyAdvanceAmountVO.java

@@ -0,0 +1,60 @@
+package com.kxs.store.api.vo.kxsapp.storeAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 我的预发机-我的小分仓额度vo
+ *
+ * @author 系统
+ * @date 2024-01-10 09:47:16
+ */
+@Data
+@Schema(description = "我的预发机-我的小分仓额度返回实体")
+public class StoreAdvanceGetMyAdvanceAmountVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 可用额度
+     */
+    @Schema(description = "可用额度")
+    private BigDecimal validAmount;
+
+
+    /**
+     * 固定额度
+     */
+    @Schema(description = "固定额度")
+    private BigDecimal fixedAmount;
+
+
+    /**
+     * 临时额度
+     */
+    @Schema(description = "临时额度")
+    private BigDecimal forAmount;
+
+
+    /**
+     * 总额度
+     */
+    @Schema(description = "总额度")
+    private Object totalAmount;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeAdvance/StoreAdvanceGetMyAdvanceVO.java

@@ -0,0 +1,59 @@
+package com.kxs.store.api.vo.kxsapp.storeAdvance;
+
+
+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-01-10 09:47:16
+ */
+@Data
+@Schema(description = "我的预发机-预发机列表返回实体")
+public class StoreAdvanceGetMyAdvanceVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brand;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeAdvance/UserWarehouseListVO.java

@@ -0,0 +1,85 @@
+package com.kxs.store.api.vo.kxsapp.storeAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 小分仓-列表vo
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:17
+ */
+@Data
+@Schema(description = "小分仓-列表返回实体")
+public class UserWarehouseListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 用户编号
+     */
+    @Schema(description = "用户编号")
+    private String userCode;
+
+
+    /**
+     * 头像地址
+     */
+    @Schema(description = "头像地址")
+    private String avatar;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 用户等级
+     */
+    @Schema(description = "用户等级")
+    private Integer userLevel;
+
+
+    /**
+     * 品牌列表
+     */
+    @Schema(description = "品牌列表")
+    private Object brandList;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeLimit/StoreLimitGetMahcineApplyDetailVO.java

@@ -0,0 +1,108 @@
+package com.kxs.store.api.vo.kxsapp.storeLimit;
+
+
+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-01-10 18:14:57
+ */
+@Data
+@Schema(description = "申请补货-申请记录明细返回实体")
+public class StoreLimitGetMahcineApplyDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 申请订单号
+     */
+    @Schema(description = "申请订单号")
+    private String orderSn;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    private Integer applyNum;
+
+
+    /**
+     * 申请品牌数量json
+     */
+    @Schema(description = "申请品牌数量json")
+    private String applySn;
+
+
+    /**
+     * 发货数量
+     */
+    @Schema(description = "发货数量")
+    private Integer sendNum;
+
+
+    /**
+     * 发货方式 0送货上门 1邮寄
+     */
+    @Schema(description = "发货方式 0送货上门 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    private String trackNo;
+
+
+    /**
+     * 状态 0待配货 1已发货 2已驳回
+     */
+    @Schema(description = "状态 0待配货 1已发货 2已驳回")
+    private Integer status;
+
+
+    /**
+     * 使用额度
+     */
+    @Schema(description = "使用额度")
+    private Object amount;
+
+
+    /**
+     * 客小爽分仓申请补货订单详情表
+     */
+    @Schema(description = "客小爽分仓申请补货订单详情表")
+    private List<Object> snDetail;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeLimit/WarehouseAmountVO.java

@@ -0,0 +1,104 @@
+package com.kxs.store.api.vo.kxsapp.storeLimit;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 申请补货-额度详情vo
+ *
+ * @author 系统
+ * @date 2024-01-10 18:14:57
+ */
+@Data
+@Schema(description = "申请补货-额度详情返回实体")
+public class WarehouseAmountVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 可用额度
+     */
+    @Schema(description = "可用额度")
+    private BigDecimal validAmount;
+
+
+    /**
+     * 固定额度
+     */
+    @Schema(description = "固定额度")
+    private BigDecimal fixedAmount;
+
+
+    /**
+     * 临时额度
+     */
+    @Schema(description = "临时额度")
+    private BigDecimal forAmount;
+
+
+    /**
+     * 担保额度
+     */
+    @Schema(description = "担保额度")
+    private BigDecimal creditAmount;
+
+
+    /**
+     * 已用额度
+     */
+    @Schema(description = "已用额度")
+    private BigDecimal usedAmount;
+
+
+    /**
+     * 总额度
+     */
+    @Schema(description = "总额度")
+    private Object totalAmount;
+
+
+    /**
+     * 为他人担保额度
+     */
+    @Schema(description = "为他人担保额度")
+    private Object toCreditAmount;
+
+    /**
+     * 银行卡充值总额度
+     */
+    @Schema(description = "银行卡充值总额度")
+    private BigDecimal bankRechargeAmount;
+
+
+    /**
+     * 余额充值总额
+     */
+    @Schema(description = "余额充值总额")
+    private BigDecimal yueRechargeAmount;
+
+
+    /**
+     * 银行卡提现总额
+     */
+    @Schema(description = "银行卡提现总额")
+    private BigDecimal bankWithdrawAmount;
+
+
+    /**
+     * 余额提现总额
+     */
+    @Schema(description = "余额提现总额")
+    private BigDecimal yueWithdrawAmount;
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeLimit/WarehouseMachineApplyListVO.java

@@ -0,0 +1,58 @@
+package com.kxs.store.api.vo.kxsapp.storeLimit;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 申请补货-申请记录vo
+ *
+ * @author 系统
+ * @date 2024-01-10 18:14:57
+ */
+@Data
+@Schema(description = "申请补货-申请记录返回实体")
+public class WarehouseMachineApplyListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    private Integer applyNum;
+
+
+    /**
+     * 状态 0待配货 1已发货 2已驳回
+     */
+    @Schema(description = "状态 0待配货 1已发货 2已驳回")
+    private Integer status;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeOrder/OrderMonthTotalDetailVO.java

@@ -0,0 +1,51 @@
+package com.kxs.store.api.vo.kxsapp.storeOrder;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 订单管理-发货统计明细vo
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:01
+ */
+@Data
+@Schema(description = "订单管理-发货统计明细返回实体")
+public class OrderMonthTotalDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 日期
+     */
+    @Schema(description = "日期")
+    private String date;
+
+
+    /**
+     * 数量
+     */
+    @Schema(description = "数量")
+    private Integer number;
+
+
+    /**
+     * 机具集合
+     */
+    @Schema(description = "机具集合")
+    private List<String> snList;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeOrder/OrderMonthTotalVO.java

@@ -0,0 +1,43 @@
+package com.kxs.store.api.vo.kxsapp.storeOrder;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 订单管理-发货统计vo
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:01
+ */
+@Data
+@Schema(description = "订单管理-发货统计返回实体")
+public class OrderMonthTotalVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 月份
+     */
+    @Schema(description = "月份")
+    private Object month;
+
+
+    /**
+     * 总发货数量
+     */
+    @Schema(description = "总发货数量")
+    private Object totalNumber;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeOrder/StoreOrderDetailVO.java

@@ -0,0 +1,121 @@
+package com.kxs.store.api.vo.kxsapp.storeOrder;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 订单管理-未发货订单详情vo
+ *
+ * @author 系统
+ * @date 2024-01-08 11:15:01
+ */
+@Data
+@Schema(description = "订单管理-未发货订单详情返回实体")
+public class StoreOrderDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    private String orderSn;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 提货方式 0自提 1邮寄
+     */
+    @Schema(description = "提货方式 0自提 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    private Integer applyNum;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String contacts;
+
+
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String phone;
+
+
+    /**
+     * 收货地址
+     */
+    @Schema(description = "收货地址")
+    private String address;
+
+
+    /**
+     * 申请类型 0循环申请 1兑换券
+     */
+    @Schema(description = "申请类型 0循环申请 1兑换券")
+    private Integer applyType;
+
+
+    /**
+     * 订单状态 0待审核 1申请成功 2已驳回
+     */
+    @Schema(description = "订单状态 0待审核 1申请成功 2已驳回")
+    private Integer status;
+
+
+    /**
+     * 用户姓名
+     */
+    @Schema(description = "用户姓名")
+    private Object username;
+
+
+    /**
+     * 用户编号
+     */
+    @Schema(description = "用户编号")
+    private Object userCode;
+
+
+    /**
+     * 创业帮机具申请订单明细
+     */
+    @Schema(description = "创业帮机具申请订单明细")
+    private List<String> snList;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeOrder/StoreOrderListVO.java

@@ -0,0 +1,122 @@
+package com.kxs.store.api.vo.kxsapp.storeOrder;
+
+
+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-01-08 11:15:01
+ */
+@Data
+@Schema(description = "订单管理-订单列表返回实体")
+public class StoreOrderListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    private String orderSn;
+
+
+    /**
+     * 提货方式 0自提 1邮寄
+     */
+    @Schema(description = "提货方式 0自提 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 申请数量
+     */
+    @Schema(description = "申请数量")
+    private Integer applyNum;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String contacts;
+
+
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String phone;
+
+
+    /**
+     * 收货地址
+     */
+    @Schema(description = "收货地址")
+    private String address;
+
+
+    /**
+     * 申请类型 0循环申请 1兑换券
+     */
+    @Schema(description = "申请类型 0循环申请 1兑换券")
+    private Integer applyType;
+
+
+    /**
+     * 订单状态 0待审核 1申请成功 2已驳回
+     */
+    @Schema(description = "订单状态 0待审核 1申请成功 2已驳回")
+    private Integer status;
+
+
+    /**
+     * 申请用户
+     */
+    @Schema(description = "申请用户")
+    private Object username;
+
+
+    /**
+     * 申请用户编号
+     */
+    @Schema(description = "申请用户编号")
+    private Object userCode;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    private List<String> snList;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeRecycle/NeedConfirmRecycleVO.java

@@ -0,0 +1,35 @@
+package com.kxs.store.api.vo.kxsapp.storeRecycle;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 仓库数据vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:17
+ */
+@Data
+@Schema(description = "仓库数据返回实体")
+public class NeedConfirmRecycleVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 循环结束时间
+     */
+    @Schema(description = "循环结束时间")
+    private Integer recycleEndTime;
+
+    /**
+     * sn
+     */
+    @Schema(description = "sn")
+    private String posSn;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeRecycle/RecycleInfoVO.java

@@ -0,0 +1,35 @@
+package com.kxs.store.api.vo.kxsapp.storeRecycle;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 仓库数据vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:17
+ */
+@Data
+@Schema(description = "仓库数据返回实体")
+public class RecycleInfoVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 状态 0未确认 1已确认 2已驳回态
+     */
+    @Schema(description = "状态 0未确认 1已确认 2已驳回")
+    private Integer confirmStatus;
+
+    /**
+     * sn
+     */
+    @Schema(description = "sn")
+    private String posSn;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeRecycle/RecycleUserListVO.java

@@ -0,0 +1,114 @@
+package com.kxs.store.api.vo.kxsapp.storeRecycle;
+
+
+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-01-10 09:47:17
+ */
+@Data
+@Schema(description = "用户寄回记录返回实体")
+public class RecycleUserListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 申请单号
+     */
+    @Schema(description = "申请单号")
+    private String orderSn;
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "申请单号")
+    private String trackNo;
+
+
+    /**
+     * 送回方式 0送货上门 1邮寄
+     */
+    @Schema(description = "送回方式 0送货上门 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 回收仓库ID
+     */
+    @Schema(description = "回收仓库ID")
+    private Integer warehouseId;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+    /**
+     * 仓库名称
+     */
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+
+    /**
+     * 仓库联系人
+     */
+    @Schema(description = "仓库联系人")
+    private String contacts;
+
+
+    /**
+     * 仓库联系电话
+     */
+    @Schema(description = "仓库联系电话")
+    private String warehousePhone;
+
+
+    /**
+     * 仓库地址
+     */
+    @Schema(description = "仓库地址")
+    private String warehouseAddress;
+
+
+    /**
+     * 机具号
+     */
+    @Schema(description = "机具号")
+    private List<RecycleInfoVO> snList;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeRecycle/StoreRecycleDataVO.java

@@ -0,0 +1,35 @@
+package com.kxs.store.api.vo.kxsapp.storeRecycle;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 仓库数据vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:17
+ */
+@Data
+@Schema(description = "仓库数据返回实体")
+public class StoreRecycleDataVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 已完成数量
+     */
+    @Schema(description = "已完成数量")
+    private Integer recyclableCount;
+
+    /**
+     * 待回收机具数量
+     */
+    @Schema(description = "待回收机具数量")
+    private Integer recycleCount;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeRecycle/StoreRecycleMachineListVO.java

@@ -0,0 +1,126 @@
+package com.kxs.store.api.vo.kxsapp.storeRecycle;
+
+
+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;
+import java.util.Map;
+
+/**
+ * 待回收机具-已确认vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:19
+ */
+@Data
+@Schema(description = "待回收机具-已确认返回实体")
+public class StoreRecycleMachineListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 申请单号
+     */
+    @Schema(description = "申请单号")
+    private String orderSn;
+
+
+    /**
+     * 送回方式 0送货上门 1邮寄
+     */
+    @Schema(description = "送回方式 0送货上门 1邮寄")
+    private Integer getMode;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+    /**
+     * 快递单号
+     */
+    @Schema(description = "快递单号")
+    private String trackNo;
+
+
+    /**
+     * 状态 0待发货 1已发货 2已完成 3已取消
+     */
+    @Schema(description = "状态 0待发货 1已发货 2已完成 3已取消")
+    private Integer status;
+
+
+    /**
+     * 操作时间
+     */
+    @Schema(description = "操作时间")
+    private LocalDateTime operatingDate;
+
+
+    /**
+     * 申请用户姓名
+     */
+    @Schema(description = "申请用户姓名")
+    private String username;
+
+
+    /**
+     * 申请用户编号
+     */
+    @Schema(description = "申请用户编号")
+    private String userCode;
+
+
+    /**
+     * 申请用户电话
+     */
+    @Schema(description = "申请用户电话")
+    private String phone;
+
+
+    /**
+     * 寄回机具数量
+     */
+    @Schema(description = "寄回机具数量")
+    private String totalNumber;
+
+    /**
+     * 寄回机具数量
+     */
+    @Schema(description = "寄回机具数量")
+    private List<RecycleInfoVO> snList;
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/storeRecycle/recoverableDataVO.java

@@ -0,0 +1,35 @@
+package com.kxs.store.api.vo.kxsapp.storeRecycle;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 可回收数据vo
+ *
+ * @author 系统
+ * @date 2024-01-08 10:33:17
+ */
+@Data
+@Schema(description = "可回收数据实体")
+public class recoverableDataVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 可回收数量
+     */
+    @Schema(description = "可回收数量")
+    private Integer recoverableCount;
+
+    /**
+     * 待确认数量
+     */
+    @Schema(description = "待确认数量")
+    private Integer needConfirmCount;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/AdvanceAmountVO.java

@@ -0,0 +1,86 @@
+package com.kxs.store.api.vo.kxsapp.userAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 预发机额度详情vo
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:18
+ */
+@Data
+@Schema(description = "预发机额度详情返回实体")
+public class AdvanceAmountVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 可用额度
+     */
+    @Schema(description = "可用额度")
+    private BigDecimal validAmount;
+
+
+    /**
+     * 固定额度
+     */
+    @Schema(description = "固定额度")
+    private BigDecimal fixedAmount;
+
+
+    /**
+     * 临时额度
+     */
+    @Schema(description = "临时额度")
+    private BigDecimal forAmount;
+
+
+    /**
+     * 银行卡充值总额度
+     */
+    @Schema(description = "银行卡充值总额度")
+    private BigDecimal bankRechargeAmount;
+
+
+    /**
+     * 余额充值总额
+     */
+    @Schema(description = "余额充值总额")
+    private BigDecimal yueRechargeAmount;
+
+
+    /**
+     * 银行卡提现总额
+     */
+    @Schema(description = "银行卡提现总额")
+    private BigDecimal bankWithdrawAmount;
+
+
+    /**
+     * 余额提现总额
+     */
+    @Schema(description = "余额提现总额")
+    private BigDecimal yueWithdrawAmount;
+
+
+    /**
+     * 已用额度
+     */
+    @Schema(description = "已用额度")
+    private BigDecimal usedAmount;
+
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/AdvanceDevModalInfoVO.java

@@ -0,0 +1,33 @@
+package com.kxs.store.api.vo.kxsapp.userAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 接收预发机弹窗vo
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:18
+ */
+@Data
+@Schema(description = "接收预发机弹窗返回实体")
+@Builder
+public class AdvanceDevModalInfoVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/AdvanceDevModalVO.java

@@ -0,0 +1,57 @@
+package com.kxs.store.api.vo.kxsapp.userAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 接收预发机弹窗vo
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:18
+ */
+@Data
+@Schema(description = "接收预发机弹窗返回实体")
+@Builder
+public class AdvanceDevModalVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 仓库 ID
+     */
+    @Schema(description = "仓库 ID")
+    private Integer warehouseId;
+
+    /**
+     * 仓库名称
+     */
+    @Schema(description = "仓库名称")
+    private String warehouseName;
+
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+    /**
+     * SN列表
+     */
+    private List<AdvanceDevModalInfoVO> snList;
+
+
+
+
+	
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/UserAdvanceListInfoVO.java

@@ -0,0 +1,48 @@
+package com.kxs.store.api.vo.kxsapp.userAdvance;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 预发机列表vo
+ *
+ * @author 系统
+ * @date 2024-01-10 11:43:18
+ */
+@Data
+@Schema(description = "预发机列表返回实体")
+public class UserAdvanceListInfoVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 机具码
+     */
+    @Schema(description = "机具码")
+    private String posSn;
+
+    /**
+     * 是否占用预发额度 0否 1是
+     */
+    @Schema(description = "是否占用预发额度 0否 1是")
+    private Integer isUseAmount;
+
+    /**
+     * 是否预扣款 0否 1是
+     */
+    @Schema(description = "是否预扣款 0否 1是")
+    private Integer isAdvance;
+
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userAdvance/UserAdvanceListVO.java

@@ -0,0 +1,45 @@
+package com.kxs.store.api.vo.kxsapp.userAdvance;
+
+
+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-01-10 11:43:18
+ */
+@Data
+@Schema(description = "预发机列表返回实体")
+public class UserAdvanceListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Schema(description = "id")
+    private Integer id;
+
+    /**
+     * 品牌名称
+     */
+    @Schema(description = "品牌名称")
+    private String brandName;
+
+
+    /**
+     * sn列表
+     */
+    @Schema(description = "sn列表")
+    private List<UserAdvanceListInfoVO> snList;
+
+
+}

kxs-store/kxs-store-biz/pom.xml

@@ -28,6 +28,16 @@
             <groupId>com.kxs</groupId>
             <artifactId>kxs-store-api</artifactId>
         </dependency>
+        <!-- 产品模块 -->
+        <dependency>
+            <groupId>com.kxs</groupId>
+            <artifactId>kxs-product-api</artifactId>
+        </dependency>
+        <!-- 用户模块 -->
+        <dependency>
+            <groupId>com.kxs</groupId>
+            <artifactId>kxs-user-api</artifactId>
+        </dependency>
         <!--core 工具类-->
         <dependency>
             <groupId>com.kxs</groupId>

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/StoreConstants.java

@@ -0,0 +1,12 @@
+package com.kxs.store.biz.constant;
+
+/**
+ * 公共常量
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-08
+ */
+public class StoreConstants {
+
+    public static final Integer RECYC_MAX_DAY = 365;
+}

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/MachineOrderEnum.java

@@ -0,0 +1,31 @@
+package com.kxs.store.biz.constant.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 机具申请相关枚举
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-08
+ */
+@Getter
+@RequiredArgsConstructor
+public enum MachineOrderEnum {
+    /**
+     * 订单状态
+     */
+    UNDER_REVIEW(0, "待审核"),
+    APPLY_SUCCESSFUL(1, "申请成功"),
+    REJECTED(2, "已驳回"),
+    /**
+     * 申请类型
+     */
+    M_TYPE_SN(0, "兑换券申请"),
+    M_TYPE_RE(1, "循环机申请");
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/MachineRecycleStatusEnum.java

@@ -0,0 +1,23 @@
+package com.kxs.store.biz.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 机具循环状态
+ *
+ * @author Lxq
+ * @date 2023-10-25
+ */
+@Getter
+@AllArgsConstructor
+public enum MachineRecycleStatusEnum {
+
+    UN_RECYCLE_STATUS(0, "不可循环"),
+    CAN_RECYCLE_STATUS(1, "可循环");
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/RecycleOrderEnum.java

@@ -0,0 +1,33 @@
+package com.kxs.store.biz.constant.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 机具回收状态字段
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-09
+ */
+@Getter
+@RequiredArgsConstructor
+public enum RecycleOrderEnum {
+
+    /**
+     * 主订单状态
+     */
+    RE_UNSEND(0, "待发货"),
+    RE_UNCONFIRM(1, "待确认"),
+    RE_OVER(2, "已完成"),
+    /**
+     * 机具状态
+     */
+    INFO_UNCONFIRM(0, "未确认"),
+    INFO_CONFIRM(1, "已确认"),
+    INFO_CANCEL(2, "已驳回");
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/StoreErrorTypeEnum.java

@@ -0,0 +1,41 @@
+package com.kxs.store.biz.constant.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 错误类型枚举
+ *
+ * @author 没秃顶的码农
+ * @date 2023/10/29
+ */
+@Getter
+@RequiredArgsConstructor
+public enum StoreErrorTypeEnum {
+
+	TICKET_NOT_FIND(-1, "券码不存在"),
+	TICKET_CODE_UN(-1, "券码已使用"),
+	SN_FIND_NULL(-1, "SN码不存在"),
+	UN_RECYCLE_STATUS(-1, "此机器不可循环"),
+	ADVANCE_MACHINE_NOT_FIND(-1, "预发机未找到"),
+	ADVANCE_MACHINE_NOT_CONFIRM(-1, "预发机状态错误"),
+	ADVANCE_MACHINE_ERROR(-1, "预发机已使用"),
+	ADVANCE_MACHINE_RETURN(-1, "预发机已撤回"),
+	RETURN_ADVANCE_ERROR(-1, "退回预扣款错误"),
+	ORDER_NULL(-1, "订单不存在"),
+	ORDER_REPETITION_SUBMIT(-1,"订单重复划拨"),
+	SN_SIZE_ERROR(-1,"订单划拨机具数量错误"),
+	ORDER_REPETITION_TRANSFER(-1,"订单已划拨，不可取消"),
+	ORDER_REPETITION_CANCEL(-1,"订单已取消"),
+	STORE_NOT_FIND(-1, "未找到仓库"),
+	MACHINE_NOT_USER(-1, "机具不属于该创客"),
+	MACHINE_TRANSFER_NO(-1, "循环机不可划拨"),
+	USER_IS_NOT_FIND(-1, "该创客不在您的预发范围内"),
+	ADVANCE_MACHINE_NUMBER_ERROR(-1, "预发数量超限"),
+	DATA_ERROR(-1, "数据错误");
+
+	private final int code;
+
+	private final String description;
+
+}

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/TicketStatusEnum.java

@@ -0,0 +1,24 @@
+package com.kxs.store.biz.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 兑换券状态
+ *
+ * @author Lxq
+ * @date 2023-10-25
+ */
+@Getter
+@AllArgsConstructor
+public enum TicketStatusEnum {
+
+    TICKET_UNUSED(0, "未使用"),
+    TICKET_FREEZE(2, "已申请冻结"),
+    TICKET_USED(1, "已使用");
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/constant/enums/WarehouseLimitTypeEnum.java

@@ -0,0 +1,23 @@
+package com.kxs.store.biz.constant.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 机具申请相关枚举
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-08
+ */
+@Getter
+@RequiredArgsConstructor
+public enum WarehouseLimitTypeEnum {
+
+    FC(0, "分仓"),
+    XFC(1, "小分仓");
+
+    //状态码
+    private final Integer type;
+    //状态码码描述
+    private final String description;
+}