用户模块的接口代码已完成

kxs-common/kxs-common-core/pom.xml

@@ -46,6 +46,8 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-json</artifactId>
         </dependency>
+
+        <!--spring-webmvc-->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/GlobalBizExceptionHandler.java

@@ -132,4 +132,16 @@ public class GlobalBizExceptionHandler {
 		return R.failed(exception.getMessage());
 	}
 
+
+	/**
+	 * 自定义异常
+	 * @param e 错误类型
+	 * @return {@link R}
+	 */
+	@ExceptionHandler(GlobalCustomerException.class)
+	public R handlerCustomException(GlobalCustomerException e){
+
+		return R.failed(e.getMessage());
+	}
+
 }

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/GlobalCustomerException.java

@@ -0,0 +1,20 @@
+package com.kxs.common.core.exception;
+
+
+import lombok.Getter;
+
+
+/**
+ * 自定义异常
+ * @author Lxq
+ * @date 2023-10-18
+ */
+@Getter
+public class GlobalCustomerException extends RuntimeException{
+
+    public GlobalCustomerException(String message) {
+        super(message);
+    }
+
+
+}

kxs-gateway/src/main/java/com/kxs/gateway/api/filter/RequestDecoderFilter.java

@@ -4,6 +4,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.symmetric.AES;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kxs.common.core.constant.enums.ErrorTypeEnum;
 import com.kxs.common.core.exception.AesDecodeException;
@@ -32,6 +33,7 @@ import reactor.core.publisher.Mono;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
@@ -169,8 +171,15 @@ public class RequestDecoderFilter extends AbstractGatewayFilterFactory<Object> {
 				if(SIZE_NAME.equals(key)){
 					key = "size";
 				}
-				parameters.add(key, URLEncoder.encode(String.valueOf(value), StandardCharsets.UTF_8));
+				if(value instanceof JSONArray){
+					JSONArray values = JSON.parseArray(value.toString());
+					String finalKey = key;
+					values.forEach(v -> parameters.add(finalKey,  URLEncoder.encode(String.valueOf(v), StandardCharsets.UTF_8)));
+				}else{
+					parameters.add(key, URLEncoder.encode(String.valueOf(value), StandardCharsets.UTF_8));
+				}
 			});
+			log.info("GET解密后数据 :{}", parameters);
 			// 构建修改后的URI
 			URI modifiedUri = UriComponentsBuilder.fromUri(exchange.getRequest().getURI())
 					.replaceQueryParams(parameters)

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

@@ -24,7 +24,7 @@ public class MachineMachineBindListDTO {
      * 搜索关键字
      */
     @Schema(description = "搜索关键字")
-    private Object keyword;
+    private String keyword;
 
 
 

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

@@ -3,6 +3,8 @@ package com.kxs.product.api.dto.kxsapp.machine;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 机具未绑定划拨-dto
@@ -24,14 +26,14 @@ public class MachineMachineTransferDTO {
      * 机具ID集合
      */
     @Schema(description = "机具ID集合")
-    private Object snList;
+    private List<String> snList;
 
 
     /**
      * 划拨创客编号
      */
     @Schema(description = "划拨创客编号")
-    private Object userCode;
+    private String userCode;
 
 
 

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

@@ -24,7 +24,7 @@ public class MachineMachineTransferListDTO {
      * 搜索关键字
      */
     @Schema(description = "搜索关键字")
-    private Object keyword;
+    private String keyword;
 
 
 

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

@@ -24,7 +24,7 @@ public class MachineMachineUnBindListDTO {
      * 搜索关键字
      */
     @Schema(description = "搜索关键字")
-    private Object keyword;
+    private String keyword;
 
 
 

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

@@ -24,7 +24,7 @@ public class MachineMachineUserListDTO {
      * 搜索关键字
      */
     @Schema(description = "搜索关键字")
-    private Object keyword;
+    private String keyword;
 
 
 

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

@@ -24,7 +24,7 @@ public class MachineToMerchantMakerDTO {
      * 创客编号
      */
     @Schema(description = "创客编号")
-    private Object userCode;
+    private String userCode;
 
 
 

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 
 /**
@@ -26,7 +27,7 @@ public class MachineUpdatePledgeDTO {
      * sn码集合
      */
     @Schema(description = "sn码集合")
-    private Object snList;
+    private List<String> snList;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/merchant/MerchantMachineRatioDTO.java

@@ -26,7 +26,7 @@ public class MerchantMachineRatioDTO {
      * 商户ID
      */
     @Schema(description = "商户ID")
-    private Object merchantId;
+    private Integer merchantId;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/merchant/MerchantMerchantListDTO.java

@@ -24,35 +24,35 @@ public class MerchantMerchantListDTO {
      * 搜索关键字
      */
     @Schema(description = "搜索关键字")
-    private Object keyword;
+    private String keyword;
 
 
     /**
      * 交易额排序amount:交易额排序 time:注册时间排序
      */
     @Schema(description = "交易额排序amount:交易额排序 time:注册时间排序")
-    private Object sort;
+    private String sort;
 
 
     /**
      * 金额区间 '-' 隔开
      */
     @Schema(description = "金额区间 '-' 隔开")
-    private Object amountSection;
+    private String amountSection;
 
 
     /**
      * 激活时间 '2023'
      */
     @Schema(description = "激活时间 '2023'")
-    private Object actTime;
+    private String actTime;
 
 
     /**
      * 激活状态 0未激活 1已激活 全部不传
      */
     @Schema(description = "激活状态 0未激活 1已激活 全部不传")
-    private Object actStatus;
+    private String actStatus;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/ticket/TicketTicketTransferDTO.java

@@ -3,6 +3,8 @@ package com.kxs.product.api.dto.kxsapp.ticket;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 兑换券划拨-dto
@@ -24,14 +26,14 @@ public class TicketTicketTransferDTO {
      * 兑换券集合
      */
     @Schema(description = "兑换券集合")
-    private Object ticketCodes;
+    private List<String> ticketCodes;
 
 
     /**
      * 创客编号
      */
     @Schema(description = "创客编号")
-    private Object userCode;
+    private String userCode;
 
 
 

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

@@ -58,7 +58,7 @@ public class KxsBrand extends Model<KxsBrand> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsMachine extends Model<KxsMachine> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsMachinePledge extends Model<KxsMachinePledge> implements Seriali
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsMachineRatio extends Model<KxsMachineRatio> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsMachineTrack extends Model<KxsMachineTrack> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsMachineTransfer extends Model<KxsMachineTransfer> implements Ser
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsMerchant extends Model<KxsMerchant> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopCate extends Model<KxsShopCate> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopGoods extends Model<KxsShopGoods> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopGoodsPic extends Model<KxsShopGoodsPic> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopGoodsSku extends Model<KxsShopGoodsSku> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopGoodsSpec extends Model<KxsShopGoodsSpec> implements Seriali
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopOrder extends Model<KxsShopOrder> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsShopOrderInfo extends Model<KxsShopOrderInfo> implements Seriali
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsTicket extends Model<KxsTicket> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -57,7 +57,7 @@ public class KxsTicketTransfer extends Model<KxsTicketTransfer> implements Seria
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

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

@@ -27,28 +27,28 @@ public class MachineApplyRemarkVO implements Serializable {
      * 激活台数
      */
     @Schema(description = "激活台数")
-    private Object actCount;
+    private Integer actCount;
 
 
     /**
      * 过期台数
      */
     @Schema(description = "过期台数")
-    private Object pastCount;
+    private Integer pastCount;
 
 
     /**
      * 最多领取台数
      */
     @Schema(description = "最多领取台数")
-    private Object maxCount;
+    private Integer maxCount;
 
 
     /**
      * 最少领取台数
      */
     @Schema(description = "最少领取台数")
-    private Object minCount;
+    private Integer minCount;
 
 
 

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

@@ -48,14 +48,14 @@ public class MachineMachineTransferListVO implements Serializable {
      * 划拨的用户
      */
     @Schema(description = "划拨的用户")
-    private Object toUserName;
+    private String toUserName;
 
 
     /**
      * 划拨的用户码
      */
     @Schema(description = "划拨的用户码")
-    private Object toUserCode;
+    private String toUserCode;
 
 
 

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

@@ -56,14 +56,14 @@ public class MachineMachineUserListVO implements Serializable {
      * 所属仓库
      */
     @Schema(description = "所属仓库")
-    private Object warehouseName;
+    private String warehouseName;
 
 
     /**
      * 品牌
      */
     @Schema(description = "品牌")
-    private Object brand;
+    private String brand;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantDetailVO.java

@@ -98,21 +98,21 @@ public class MerchantMerchantDetailVO implements Serializable {
      * 激活时间
      */
     @Schema(description = "激活时间")
-    private Object actTime;
+    private String actTime;
 
 
     /**
      * 机具号
      */
     @Schema(description = "机具号")
-    private Object posSn;
+    private String posSn;
 
 
     /**
      * 机具品牌
      */
     @Schema(description = "机具品牌")
-    private Object brand;
+    private String brand;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantListVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -41,7 +42,7 @@ public class MerchantMerchantListVO implements Serializable {
      * 当月交易额
      */
     @Schema(description = "当月交易额")
-    private Object thisMonthTrade;
+    private BigDecimal thisMonthTrade;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantMerchantTotalVO.java

@@ -27,35 +27,35 @@ public class MerchantMerchantTotalVO implements Serializable {
      * 总商户数
      */
     @Schema(description = "总商户数")
-    private Object totalCount;
+    private Integer totalCount;
 
 
     /**
      * 今日激活商户数
      */
     @Schema(description = "今日激活商户数")
-    private Object actCount ;
+    private Integer actCount ;
 
 
     /**
      * 品牌总商户数
      */
     @Schema(description = "品牌总商户数")
-    private Object brandCount;
+    private Integer brandCount;
 
 
     /**
      * 品牌已激活
      */
     @Schema(description = "品牌已激活")
-    private Object brandActCount;
+    private Integer brandActCount;
 
 
     /**
      * 品牌未激活
      */
     @Schema(description = "品牌未激活")
-    private Object brandUnActCount;
+    private Integer brandUnActCount;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketListVO.java

@@ -48,7 +48,7 @@ public class TicketListVO implements Serializable {
      * 可用品牌ID集合
      */
     @Schema(description = "可用品牌ID集合")
-    private Object brandList;
+    private List<Integer> brandList;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketTicketTransferDetailVO.java

@@ -69,21 +69,21 @@ public class TicketTicketTransferDetailVO implements Serializable {
      * 创客姓名
      */
     @Schema(description = "创客姓名")
-    private Object realName;
+    private String realName;
 
 
     /**
      * 创客编号
      */
     @Schema(description = "创客编号")
-    private Object userCode;
+    private String userCode;
 
 
     /**
      * 创客电话
      */
     @Schema(description = "创客电话")
-    private Object phone;
+    private String phone;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/ticket/TicketTicketTransferListVO.java

@@ -48,14 +48,14 @@ public class TicketTicketTransferListVO implements Serializable {
      * 创客姓名
      */
     @Schema(description = "创客姓名")
-    private Object realName;
+    private String realName;
 
 
     /**
      * 创客编号
      */
     @Schema(description = "创客编号")
-    private Object userCode;
+    private String userCode;
 
 
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteUserMsgService.java

@@ -0,0 +1,30 @@
+
+package com.kxs.system.api.feign;
+
+import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.dto.admin.UserInfo;
+import com.kxs.system.api.model.KxsUserMsg;
+import com.kxs.system.api.model.SysLog;
+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 RemoteUserMsgService {
+
+	/**
+	 * 发送消息
+	 * @param userMsg 消息实体
+	 * @param from 调用标志
+	 * @return R
+	 */
+	@PostExchange("/userMsg/save")
+	R<Boolean> pushUserMsg(@RequestBody KxsUserMsg userMsg, @RequestHeader(SecurityConstants.FROM) String from);
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/config/KxsSystemFeignClientConfiguration.java

@@ -74,6 +74,17 @@ public class KxsSystemFeignClientConfiguration {
 		return factory.createClient(RemoteLogService.class);
 	}
 
+	/**
+	 * 远程消息服务
+	 * @param client 客户端
+	 * @return 远程消息服务
+	 */
+	@Bean
+	RemoteUserMsgService remoteUserMsgService(@Qualifier("kxsSystemFeignClient") WebClient client) {
+		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+		return factory.createClient(RemoteUserMsgService.class);
+	}
+
 	/**
 	 * 远程客户端
 	 * @param client 客户端

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsActivityMarket.java

@@ -57,7 +57,7 @@ public class KxsActivityMarket extends Model<KxsActivityMarket> implements Seria
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsActivityMenu.java

@@ -57,7 +57,7 @@ public class KxsActivityMenu extends Model<KxsActivityMenu> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsAppModal.java

@@ -57,7 +57,7 @@ public class KxsAppModal extends Model<KxsAppModal> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsBanner.java

@@ -57,7 +57,7 @@ public class KxsBanner extends Model<KxsBanner> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsFeedback.java

@@ -57,7 +57,7 @@ public class KxsFeedback extends Model<KxsFeedback> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsMorning.java

@@ -57,7 +57,7 @@ public class KxsMorning extends Model<KxsMorning> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsRuleMaking.java

@@ -54,7 +54,7 @@ public class KxsRuleMaking extends Model<KxsRuleMaking> implements Serializable
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSchoolMenu.java

@@ -57,7 +57,7 @@ public class KxsSchoolMenu extends Model<KxsSchoolMenu> implements Serializable
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSchoolStudy.java

@@ -57,7 +57,7 @@ public class KxsSchoolStudy extends Model<KxsSchoolStudy> implements Serializabl
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSysMsg.java

@@ -57,7 +57,7 @@ public class KxsSysMsg extends Model<KxsSysMsg> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsUserMsg.java

@@ -63,7 +63,7 @@ public class KxsUserMsg extends Model<KxsUserMsg> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysDept.java

@@ -8,6 +8,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.time.LocalDateTime;
 
 /**
@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class SysDept extends Model<SysDept> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	@TableId(value = "dept_id", type = IdType.AUTO)

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysLog.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
 @Schema(description = "日志")
 public class SysLog implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	/**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysMenu.java

@@ -9,6 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.time.LocalDateTime;
 
 /**
@@ -24,6 +25,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class SysMenu extends Model<SysMenu> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	/**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysPost.java

@@ -9,6 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.time.LocalDateTime;
 
 /**
@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
 @Schema(description = "岗位信息表")
 public class SysPost extends Model<SysPost> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	/**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysPublicParam.java

@@ -33,19 +33,19 @@ public class SysPublicParam extends Model<SysPublicParam> {
 	/**
 	 * 公共参数名称
 	 */
-	@Schema(description = "公共参数名称", required = true, example = "公共参数名称")
+	@Schema(description = "公共参数名称", example = "公共参数名称")
 	private String publicName;
 
 	/**
 	 * 公共参数地址值,英文大写+下划线
 	 */
-	@Schema(description = "键[英文大写+下划线]", required = true, example = "PIGX_PUBLIC_KEY")
+	@Schema(description = "键[英文大写+下划线]", example = "PIGX_PUBLIC_KEY")
 	private String publicKey;
 
 	/**
 	 * 值
 	 */
-	@Schema(description = "值", required = true, example = "999")
+	@Schema(description = "值", example = "999")
 	private String publicValue;
 
 	/**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysRole.java

@@ -7,6 +7,7 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.time.LocalDateTime;
 
 /**
@@ -22,6 +23,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class SysRole extends Model<SysRole> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	@TableId(value = "role_id", type = IdType.AUTO)

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysUser.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -21,6 +22,7 @@ import java.time.LocalDateTime;
 @Schema(description = "用户")
 public class SysUser implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	/**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysUserRole.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
+
 /**
  * <p>
  * 用户角色表
@@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class SysUserRole extends Model<SysUserRole> {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	/**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/util/MsgTemplateUtil.java

@@ -1,5 +1,9 @@
 package com.kxs.system.api.util;
 
+import com.kxs.system.api.model.KxsUserMsg;
+
+import java.time.LocalDateTime;
+
 /**
  *  个人消息模板
  *
@@ -13,8 +17,32 @@ public class MsgTemplateUtil {
      *
      * @return {@link String}
      */
-    public static String newUserPush(){
+    public static KxsUserMsg newUserPush(Integer userId){
+
+        String title = "来新人啦";
+
+        String content = "您的创业邦系统有新人加入了，请进入客小爽-我的创客中查看!";
+
+        return MsgTemplateUtil.createTextMsg(userId, title, content);
+    }
+
+
+    /**
+     * 创建 文本 消息
+     *
+     * @param userId  用户 ID
+     * @param title   标题
+     * @param content 内容
+     * @return {@link KxsUserMsg}
+     */
+    public static KxsUserMsg createTextMsg(Integer userId, String title ,String content){
 
-        return "您的创业邦系统有新人加入了，请进入客小爽-我的创客中查看!";
+        KxsUserMsg kxsUserMsg = new KxsUserMsg();
+        kxsUserMsg.setUserId(userId);
+        kxsUserMsg.setMsgType(2);
+        kxsUserMsg.setTitle(title);
+        kxsUserMsg.setContent(content);
+        kxsUserMsg.setPushTime(LocalDateTime.now());
+        return kxsUserMsg;
     }
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/constant/enums/PushMsgTypeEnum.java

@@ -0,0 +1,32 @@
+package com.kxs.system.biz.constant.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+/**
+ * 推送消息类型枚举
+ *
+ * @author 没秃顶的码农
+ * @date 2024-01-02
+ */
+@Getter
+@RequiredArgsConstructor
+public enum PushMsgTypeEnum {
+
+
+    HTML(0, "html页面"),
+    URL(1, "url链接"),
+    TEXT(2, "简单文本");
+
+
+    /**
+     * 类型
+     */
+    private final Integer type;
+
+    /**
+     * 描述
+     */
+    private final String description;
+}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/UserMsgController.java

@@ -2,9 +2,12 @@ package com.kxs.system.biz.controller.kxsapp;
 
 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.system.api.model.KxsUserMsg;
 import com.kxs.system.api.vo.kxsapp.NotReadCountVo;
 import com.kxs.system.api.vo.kxsapp.userMsg.UserMsgPageVO;
 import com.kxs.system.biz.service.KxsUserMsgService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.*;
@@ -71,6 +74,13 @@ public class UserMsgController {
         return R.ok();
     }
 
+    @Inner
+    @PostMapping("/save")
+    public R save(@Valid @RequestBody KxsUserMsg userMsg){
+
+        return R.ok(kxsUserMsgService.saveMsg(userMsg));
+    }
+
 
 
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsUserMsgService.java

@@ -44,5 +44,7 @@ public interface KxsUserMsgService extends IService<KxsUserMsg> {
      * @return {@link NotReadCountVo}
      */
     NotReadCountVo notreads();
+
+    Boolean saveMsg(KxsUserMsg userMsg);
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsUserMsgServiceImpl.java

@@ -18,6 +18,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * 系统用户消息推送表(KxsUserMsg)表服务实现类
  *
@@ -86,6 +88,12 @@ public class KxsUserMsgServiceImpl extends ServiceImpl<KxsUserMsgMapper, KxsUser
         return notReadCountVo;
     }
 
+    @Override
+    public Boolean saveMsg(KxsUserMsg userMsg) {
+
+        return this.save(userMsg);
+    }
+
 
 }
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/LoginDTO.java

@@ -1,29 +0,0 @@
-
-package com.kxs.user.api.dto;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-
-
-/**
- * 登陆-dto
- *
- * @author 没秃顶的码农
- * @date 2023/10/22
- */
-@Data
-public class LoginDTO {
-
-	/**
-	 * 手机号码
-	 */
-	@NotBlank(message = "手机号码不能为空")
-	private String phone;
-
-	/**
-	 * 用户密码
-	 */
-	@NotBlank(message = "密码不能为空")
-	private String password;
-
-}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/app/ForgetPwdDTO.java

@@ -0,0 +1,49 @@
+package com.kxs.user.api.dto.kxsapp.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 找回密码-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+public class ForgetPwdDTO {
+
+    /**
+     * 密码
+     */
+    @Schema(description = "密码")
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+
+    /**
+     * 重复密码
+     */
+    @Schema(description = "重复密码")
+    @NotBlank(message = "重复密码不能为空")
+    private String confirmPwd;
+
+
+    /**
+     * 验证码
+     */
+    @Schema(description = "验证码")
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/RegisterDTO.java → kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/app/RegisterDTO.java

@@ -1,4 +1,4 @@
-package com.kxs.user.api.dto;
+package com.kxs.user.api.dto.kxsapp.app;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserCheckUserInfoDTO.java

@@ -0,0 +1,51 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-验证身份信息-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+public class UserCheckUserInfoDTO {
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+
+    /**
+     * 真实姓名
+     */
+    @Schema(description = "真实姓名")
+    @NotBlank(message = "真实姓名不能为空")
+    private String realName;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    @NotBlank(message = "身份证号不能为空")
+    private String idCard;
+
+
+    /**
+     * 验证码
+     */
+    @Schema(description = "验证码")
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserHandPwdDTO.java

@@ -0,0 +1,34 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-手势密码-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:58
+ */
+@Data
+public class UserHandPwdDTO {
+
+    /**
+     * 手势密码
+     */
+    @Schema(description = "手势密码")
+    @NotBlank(message = "手势密码不能为空")
+    private String handPwd;
+
+
+    /**
+     * 确认手势密码
+     */
+    @Schema(description = "确认手势密码")
+    private String confirmPwd;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserRealUserDTO.java

@@ -0,0 +1,107 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-实名认证-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:58
+ */
+@Data
+public class UserRealUserDTO {
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    @NotBlank(message = "身份证号不能为空")
+    private String idCard;
+
+
+    /**
+     * 真实姓名
+     */
+    @Schema(description = "真实姓名")
+    @NotBlank(message = "真实姓名不能为空")
+    private String realName;
+
+
+    /**
+     * 手持身份证照片
+     */
+    @Schema(description = "手持身份证照片")
+    @NotBlank(message = "手持身份证照片不能为空")
+    private String idCardHand;
+
+
+    /**
+     * 身份证国徽背面
+     */
+    @Schema(description = "身份证国徽背面")
+    @NotBlank(message = "身份证国徽背面不能为空")
+    private String idCardRear;
+
+
+    /**
+     * 身份证人像正面
+     */
+    @Schema(description = "身份证人像正面")
+    @NotBlank(message = "身份证人像正面不能为空")
+    private String idCardFront;
+
+
+    /**
+     * 结算卡照片
+     */
+    @Schema(description = "结算卡照片")
+    @NotBlank(message = "结算卡照片不能为空")
+    private String bankPic;
+
+
+    /**
+     * 结算银行名称
+     */
+    @Schema(description = "结算银行名称")
+    @NotBlank(message = "结算银行名称不能为空")
+    private String bankName;
+
+
+    /**
+     * 开户行
+     */
+    @Schema(description = "开户行")
+    @NotBlank(message = "开户行不能为空")
+    private String bankOpen;
+
+
+    /**
+     * 银行卡号
+     */
+    @Schema(description = "银行卡号")
+    @NotBlank(message = "银行卡号不能为空")
+    private String bankCode;
+
+
+    /**
+     * 预留手机号
+     */
+    @Schema(description = "预留手机号")
+    @NotBlank(message = "预留手机号不能为空")
+    private String bankPhone;
+
+
+    /**
+     * 工作地区
+     */
+    @Schema(description = "工作地区")
+    @NotBlank(message = "工作地区不能为空")
+    private String address;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserUpdateAreaDTO.java

@@ -0,0 +1,34 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 个人资料-修改地区-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:57
+ */
+@Data
+public class UserUpdateAreaDTO {
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 地址
+     */
+    @Schema(description = "地址")
+    @NotBlank(message = "地址不能为空")
+    private String address;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserUpdateBankInfoDTO.java

@@ -0,0 +1,59 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-变更结算卡-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:58
+ */
+@Data
+public class UserUpdateBankInfoDTO {
+
+    /**
+     * 银行名称
+     */
+    @Schema(description = "银行名称")
+    @NotBlank(message = "银行名称不能为空")
+    private String bankName;
+
+
+    /**
+     * 开户行
+     */
+    @Schema(description = "开户行")
+    @NotBlank(message = "开户行不能为空")
+    private String bankOpen;
+
+
+    /**
+     * 预留手机号
+     */
+    @Schema(description = "预留手机号")
+    @NotBlank(message = "预留手机号不能为空")
+    private String bankPhone;
+
+
+    /**
+     * 银行卡号
+     */
+    @Schema(description = "银行卡号")
+    @NotBlank(message = "银行卡号不能为空")
+    private String bankCode;
+
+
+    /**
+     * 银行卡照片
+     */
+    @Schema(description = "银行卡照片")
+    @NotBlank(message = "银行卡照片不能为空")
+    private String bankPic;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserUpdateLoginPhoneDTO.java

@@ -0,0 +1,42 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-修改登陆手机号-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:58
+ */
+@Data
+public class UserUpdateLoginPhoneDTO {
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+
+    /**
+     * 新手机号
+     */
+    @Schema(description = "新手机号")
+    @NotBlank(message = "新手机号不能为空")
+    private String newPhone;
+
+    /**
+     * 密码
+     */
+    @Schema(description = "密码")
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/user/UserUpdatePwdDTO.java

@@ -0,0 +1,43 @@
+package com.kxs.user.api.dto.kxsapp.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-修改登陆密码-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:57
+ */
+@Data
+public class UserUpdatePwdDTO {
+
+    /**
+     * 旧密码
+     */
+    @Schema(description = "旧密码")
+    @NotBlank(message = "旧密码不能为空")
+    private String password;
+
+
+    /**
+     * 新密码
+     */
+    @Schema(description = "新密码")
+    @NotBlank(message = "新密码不能为空")
+    private String newPwd;
+
+
+    /**
+     * 确认密码
+     */
+    @Schema(description = "确认密码")
+    @NotBlank(message = "确认密码不能为空")
+    private String confirmPwd;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/userAccount/UserAmountVariationListDTO.java

@@ -0,0 +1,47 @@
+package com.kxs.user.api.dto.kxsapp.userAccount;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 收支明细-列表-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+public class UserAmountVariationListDTO {
+
+    private Long userId;
+
+    /**
+     * 金额类型
+     */
+    @Schema(description = "金额类型")
+    private Integer variationType;
+
+    /**
+     * 日志类型 add新增 sub减少
+     */
+    @Schema(description = "日志类型 add新增 sub减少")
+    @NotBlank(message = "日志类型不能为空")
+    private String kind;
+
+    /**
+     * 月份 2023-08
+     */
+    @Schema(description = "月份 2023-08")
+    @NotBlank(message = "月份不能为空")
+    private String tradeMonth;
+
+    /**
+     * 品牌机型
+     */
+    @Schema(description = "品牌机型")
+    private Integer brandId;
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/userAccount/WithdrawDepositDTO.java

@@ -0,0 +1,37 @@
+package com.kxs.user.api.dto.kxsapp.userAccount;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 我的钱包-发起提现-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+public class WithdrawDepositDTO {
+
+    /**
+     * 申请金额
+     */
+    @Schema(description = "申请金额")
+    @NotBlank(message = "申请金额不能为空")
+    private BigDecimal applyAmount;
+
+
+    /**
+     * 支付密码
+     */
+    @Schema(description = "支付密码")
+    @NotBlank(message = "支付密码不能为空")
+    private String payPwd;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/userAddress/UserAddressDTO.java

@@ -0,0 +1,81 @@
+package com.kxs.user.api.dto.kxsapp.userAddress;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+/**
+ * 设置-收货地址-新增/修改-dto
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:58
+ */
+@Data
+public class UserAddressDTO {
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 详细地址
+     */
+    @Schema(description = "详细地址")
+    @NotBlank(message = "详细地址不能为空")
+    private String address;
+
+
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    @NotBlank(message = "联系电话不能为空")
+    private String phone;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    @NotBlank(message = "收货人不能为空")
+    private String consignee;
+
+
+    /**
+     * 省份
+     */
+    @Schema(description = "省份")
+    @NotBlank(message = "省份不能为空")
+    private String province;
+
+
+    /**
+     * 城市
+     */
+    @Schema(description = "城市")
+    @NotBlank(message = "城市不能为空")
+    private String city;
+
+
+    /**
+     * 区县
+     */
+    @Schema(description = "区县")
+    @NotBlank(message = "区县不能为空")
+    private String area;
+
+
+    /**
+     * 是否默认 0否 1是
+     */
+    @Schema(description = "是否默认 0否 1是")
+    private Integer isDefault;
+
+
+
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsBankChangeLog.java

@@ -0,0 +1,108 @@
+package com.kxs.user.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;
+
+/**
+ * 用户结算卡变更记录(KxsBankChangeLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsBankChangeLog extends Model<KxsBankChangeLog> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 变更前卡号
+     */
+    @Schema(description = "变更前卡号")
+    private String beforeCardNo;
+
+
+    /**
+     * 变更后卡号
+     */
+    @Schema(description = "变更后卡号")
+    private String afterCardNo;
+
+
+    /**
+     * 变更前银行卡名称
+     */
+    @Schema(description = "变更前银行卡名称")
+    private String beforeBankName;
+
+
+    /**
+     * 变更后银行卡名称
+     */
+    @Schema(description = "变更后银行卡名称")
+    private String afterBankName;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUser.java

@@ -179,7 +179,7 @@ public class KxsUser extends Model<KxsUser> {
      * 删除标记，0未删除，1已删除
      */     
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
     
     
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserAddress.java

@@ -0,0 +1,128 @@
+package com.kxs.user.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户收货地址表(KxsUserAddress)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserAddress extends Model<KxsUserAddress> 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已删除
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private String delFlag;
+
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 详细地址
+     */
+    @Schema(description = "详细地址")
+    private String address;
+
+
+    /**
+     * 联系电话
+     */
+    @Schema(description = "联系电话")
+    private String phone;
+
+
+    /**
+     * 收货人
+     */
+    @Schema(description = "收货人")
+    private String consignee;
+
+
+    /**
+     * 省份
+     */
+    @Schema(description = "省份")
+    private String province;
+
+
+    /**
+     * 城市
+     */
+    @Schema(description = "城市")
+    private String city;
+
+
+    /**
+     * 区县
+     */
+    @Schema(description = "区县")
+    private String area;
+
+
+    /**
+     * 是否默认 0否 1是
+     */
+    @Schema(description = "是否默认 0否 1是")
+    private Integer isDefault;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserAdvance.java

@@ -0,0 +1,115 @@
+package com.kxs.user.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;
+
+/**
+ * 客小爽用户预扣款表(KxsUserAdvance)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserAdvance extends Model<KxsUserAdvance> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 预扣款类型 0过期机具扣款 1创客预扣款 2分期预扣款
+     */
+    @Schema(description = "预扣款类型 0过期机具扣款 1创客预扣款 2分期预扣款")
+    private Integer advanceType;
+
+
+    /**
+     * 备注信息
+     */
+    @Schema(description = "备注信息")
+    private String remark;
+
+
+    /**
+     * 金额
+     */
+    @Schema(description = "金额")
+    private BigDecimal amount;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+    /**
+     * 扣款标识 0未扣 1已扣 2撤销
+     */
+    @Schema(description = "扣款标识 0未扣 1已扣 2撤销")
+    private Integer status;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserAmount.java

@@ -56,7 +56,7 @@ public class KxsUserAmount extends Model<KxsUserAmount> implements Serializable
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserAmountLog.java

@@ -0,0 +1,136 @@
+package com.kxs.user.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;
+
+/**
+ * 用户余额记录日志表(KxsUserAmountLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserAmountLog extends Model<KxsUserAmountLog> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 变动前金额
+     */
+    @Schema(description = "变动前金额")
+    private BigDecimal beforeAmount;
+
+
+    /**
+     * 变动后金额
+     */
+    @Schema(description = "变动后金额")
+    private BigDecimal afterAmount;
+
+
+    /**
+     * 操作金额
+     */
+    @Schema(description = "操作金额")
+    private BigDecimal amount;
+
+
+    /**
+     * 金额类型
+     */
+    @Schema(description = "金额类型")
+    private Integer variationType;
+
+
+    /**
+     * 原因
+     */
+    @Schema(description = "原因")
+    private String variationCause;
+
+
+    /**
+     * 日志类型 add新增 sub减少
+     */
+    @Schema(description = "日志类型 add新增 sub减少")
+    private String kind;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 品牌ID
+     */
+    @Schema(description = "品牌ID")
+    private Integer brandId;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserBank.java

@@ -0,0 +1,114 @@
+package com.kxs.user.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;
+
+/**
+ * 用户银行卡表(KxsUserBank)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:55
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserBank extends Model<KxsUserBank> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 银行名称
+     */
+    @Schema(description = "银行名称")
+    private String bankName;
+
+
+    /**
+     * 开户行
+     */
+    @Schema(description = "开户行")
+    private String bankOpen;
+
+
+    /**
+     * 预留手机号
+     */
+    @Schema(description = "预留手机号")
+    private String bankPhone;
+
+
+    /**
+     * 银行卡号
+     */
+    @Schema(description = "银行卡号")
+    private String bankCode;
+
+
+    /**
+     * 银行卡照片
+     */
+    @Schema(description = "银行卡照片")
+    private String bankPic;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserByStage.java

@@ -0,0 +1,136 @@
+package com.kxs.user.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;
+
+/**
+ * 用户分期表(KxsUserByStage)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserByStage extends Model<KxsUserByStage> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 状态 0待扣款 1扣款中 2已扣款
+     */
+    @Schema(description = "状态 0待扣款 1扣款中 2已扣款")
+    private Integer status;
+
+
+    /**
+     * 期数
+     */
+    @Schema(description = "期数")
+    private Integer number;
+
+
+    /**
+     * 分期金额
+     */
+    @Schema(description = "分期金额")
+    private BigDecimal stageAmount;
+
+
+    /**
+     * 已扣除金额
+     */
+    @Schema(description = "已扣除金额")
+    private BigDecimal deductAmount;
+
+
+    /**
+     * 扣款开始时间
+     */
+    @Schema(description = "扣款开始时间")
+    private LocalDateTime deductStartTime;
+
+
+    /**
+     * 分期单号
+     */
+    @Schema(description = "分期单号")
+    private String stageSn;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserByStageLog.java

@@ -0,0 +1,122 @@
+package com.kxs.user.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;
+
+/**
+ * 用户分期记录表(KxsUserByStageLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserByStageLog extends Model<KxsUserByStageLog> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 分期ID
+     */
+    @Schema(description = "分期ID")
+    private Integer stageId;
+
+
+    /**
+     * 状态 0待扣款 1扣款中 2已扣款 3扣款失败
+     */
+    @Schema(description = "状态 0待扣款 1扣款中 2已扣款 3扣款失败")
+    private Integer status;
+
+
+    /**
+     * 当前期数
+     */
+    @Schema(description = "当前期数")
+    private Integer thisNumber;
+
+
+    /**
+     * 本期扣除金额
+     */
+    @Schema(description = "本期扣除金额")
+    private BigDecimal amount;
+
+
+    /**
+     * 扣款时间
+     */
+    @Schema(description = "扣款时间")
+    private LocalDateTime deductTime;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String createBy;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserPresetLog.java

@@ -0,0 +1,101 @@
+package com.kxs.user.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;
+
+/**
+ * 用户预设职级日志表(KxsUserPresetLog)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserPresetLog extends Model<KxsUserPresetLog> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    private LocalDateTime startTime;
+
+
+    /**
+     * 结束时间
+     */
+    @Schema(description = "结束时间")
+    private LocalDateTime endTime;
+
+
+    /**
+     * 预设等级
+     */
+    @Schema(description = "预设等级")
+    private Integer presetLevel;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserReal.java

@@ -0,0 +1,115 @@
+package com.kxs.user.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;
+
+/**
+ * 用户实名信息表(KxsUserReal)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:55
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserReal extends Model<KxsUserReal> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private String idCard;
+
+
+    /**
+     * 实名
+     */
+    @Schema(description = "实名")
+    private String realName;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 手持身份证照片
+     */
+    @Schema(description = "手持身份证照片")
+    private String idCardHand;
+
+
+    /**
+     * 身份证国徽背面
+     */
+    @Schema(description = "身份证国徽背面")
+    private String idCardRear;
+
+
+    /**
+     * 身份证人像正面
+     */
+    @Schema(description = "身份证人像正面")
+    private String idCardFront;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserWithdrawal.java

@@ -0,0 +1,150 @@
+package com.kxs.user.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;
+
+/**
+ * 用户提现申请表(KxsUserWithdrawal)表实体类
+ *
+ * @author 系统
+ * @since 2024-01-03 09:39:56
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsUserWithdrawal extends Model<KxsUserWithdrawal> 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 String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 申请金额
+     */
+    @Schema(description = "申请金额")
+    private BigDecimal applyAmount;
+
+
+    /**
+     * 到账金额
+     */
+    @Schema(description = "到账金额")
+    private BigDecimal realAmount;
+
+
+    /**
+     * 税费
+     */
+    @Schema(description = "税费")
+    private BigDecimal taxAmount;
+
+
+    /**
+     * 手续费
+     */
+    @Schema(description = "手续费")
+    private BigDecimal serviceAmount;
+
+
+    /**
+     * 申请单号
+     */
+    @Schema(description = "申请单号")
+    private String applyNo;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 银行卡ID
+     */
+    @Schema(description = "银行卡ID")
+    private Integer bankId;
+
+
+    /**
+     * 状态 0处理中 1成功 2失败
+     */
+    @Schema(description = "状态 0处理中 1成功 2失败")
+    private Integer status;
+
+
+    /**
+     * 提交代付状态 0未提交 1已提交
+     */
+    @Schema(description = "提交代付状态 0未提交 1已提交")
+    private Integer applyStatus;
+
+
+    /**
+     * 代付返回信息json
+     */
+    @Schema(description = "代付返回信息json")
+    private String result;
+
+
+
+
+}
+

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/user/RealUserInfoVO.java

@@ -0,0 +1,71 @@
+package com.kxs.user.api.vo.kxsapp.user;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 设置-实名认证查看vo
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:58
+ */
+@Data
+@Schema(description = "设置-实名认证查看返回实体")
+public class RealUserInfoVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 真实姓名
+     */
+    @Schema(description = "真实姓名")
+    private String realName;
+
+
+    /**
+     * 身份证号
+     */
+    @Schema(description = "身份证号")
+    private String idCard;
+
+
+    /**
+     * 银行卡号
+     */
+    @Schema(description = "银行卡号")
+    private String bankCode;
+
+
+    /**
+     * 开户行
+     */
+    @Schema(description = "开户行")
+    private String bankName;
+
+
+    /**
+     * 银行名称
+     */
+    @Schema(description = "银行名称")
+    private String bankOpen;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/user/UserCodeInfoVO.java

@@ -0,0 +1,57 @@
+package com.kxs.user.api.vo.kxsapp.user;
+
+
+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-03 09:39:56
+ */
+@Data
+@Schema(description = "获取用户数据返回实体")
+public class UserCodeInfoVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户名
+     */
+    @Schema(description = "用户名")
+    private String username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+    /**
+     * 头像
+     */
+    @Schema(description = "头像")
+    private String avatar;
+
+
+    /**
+     * 邀请码
+     */
+    @Schema(description = "邀请码")
+    private String userCode;
+
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/user/UserInfoVO.java

@@ -0,0 +1,150 @@
+package com.kxs.user.api.vo.kxsapp.user;
+
+
+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-03 09:39:56
+ */
+@Data
+@Schema(description = "获取用户数据返回实体")
+public class UserInfoVO 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 username;
+
+
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+
+
+    /**
+     * 地址
+     */
+    @Schema(description = "地址")
+    private String address;
+
+
+    /**
+     * 上级ID
+     */
+    @Schema(description = "上级ID")
+    private Integer pid;
+
+
+    /**
+     * 头像
+     */
+    @Schema(description = "头像")
+    private String avatar;
+
+
+    /**
+     * 用户等级
+     */
+    @Schema(description = "用户等级")
+    private Integer userLevel;
+
+
+    /**
+     * 预设等级
+     */
+    @Schema(description = "预设等级")
+    private Integer presetLevel;
+
+
+    /**
+     * 预设等级状态 0未预设 1已预设
+     */
+    @Schema(description = "预设等级状态 0未预设 1已预设")
+    private Integer presetLevelStatus;
+
+
+    /**
+     * 实名状态 0未实名 1已实名
+     */
+    @Schema(description = "实名状态 0未实名 1已实名")
+    private Integer realStatus;
+
+
+    /**
+     * 状态 0注销 1正常 2锁定不可登陆和提现
+     */
+    @Schema(description = "状态 0注销 1正常 2锁定不可登陆和提现")
+    private Integer status;
+
+
+    /**
+     * 是否商户型创客 0否 1是
+     */
+    @Schema(description = "是否商户型创客 0否 1是")
+    private Integer isMerchantMaker;
+
+
+    /**
+     * 是否小分仓 0否 1是
+     */
+    @Schema(description = "是否小分仓 0否 1是")
+    private Integer isMinWarehouse;
+
+
+    /**
+     * 实名时间
+     */
+    @Schema(description = "实名时间")
+    private LocalDateTime realTime;
+
+
+    /**
+     * 邀请人手机号码
+     */
+    @Schema(description = "邀请人手机号码")
+    private String inviteMobile;
+
+
+    /**
+     * 邀请人姓名
+     */
+    @Schema(description = "邀请人姓名")
+    private String inviteName;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/AmountInExpendTotalVO.java

@@ -0,0 +1,44 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+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-03 09:39:59
+ */
+@Data
+@Schema(description = "收支明细-收益支出合计返回实体")
+public class AmountInExpendTotalVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 收入合计
+     */
+    @Schema(description = "收入合计")
+    private BigDecimal income;
+
+
+    /**
+     * 支出合计
+     */
+    @Schema(description = "支出合计")
+    private BigDecimal expend;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/BindBankInfoVO.java

@@ -0,0 +1,43 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 我的钱包-银行卡vo
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+@Schema(description = "我的钱包-银行卡返回实体")
+public class BindBankInfoVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 银行名称
+     */
+    @Schema(description = "银行名称")
+    private String bankName;
+
+
+    /**
+     * 银行卡号
+     */
+    @Schema(description = "银行卡号")
+    private String bankCode;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/MyAccountVO.java

@@ -0,0 +1,64 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+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-03 09:39:59
+ */
+@Data
+@Schema(description = "我的钱包-账户合计返回实体")
+public class MyAccountVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 余额
+     */
+    @Schema(description = "余额")
+    private BigDecimal amount;
+
+
+    /**
+     * 可提现余额
+     */
+    @Schema(description = "可提现余额")
+    private BigDecimal useAmount;
+
+
+    /**
+     * 冻结金额
+     */
+    @Schema(description = "冻结金额")
+    private BigDecimal frozenAmount;
+
+
+    /**
+     * 已提现金额
+     */
+    @Schema(description = "已提现金额")
+    private BigDecimal cashWithdrawalAmount;
+
+
+    /**
+     * 累计总收益
+     */
+    @Schema(description = "累计总收益")
+    private BigDecimal totalAmount;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/UserAmountVariationListVO.java

@@ -0,0 +1,66 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+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;
+
+/**
+ * 收支明细-列表vo
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+@Schema(description = "收支明细-列表返回实体")
+public class UserAmountVariationListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 操作金额
+     */
+    @Schema(description = "操作金额")
+    private BigDecimal amount;
+
+
+    /**
+     * 金额类型
+     */
+    @Schema(description = "金额类型")
+    private Integer variationType;
+
+
+    /**
+     * 原因
+     */
+    @Schema(description = "原因")
+    private String variationCause;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/VariationTypeListVO.java

@@ -0,0 +1,43 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 收支明细-筛选变动类型vo
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+@Schema(description = "收支明细-筛选变动类型返回实体")
+public class VariationTypeListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 变动类型名称
+     */
+    @Schema(description = "变动类型名称")
+    private String changeType;
+
+
+    /**
+     * 变动类型标识
+     */
+    @Schema(description = "变动类型标识")
+    private Integer changeTypeId;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/WithdrawDetailVO.java

@@ -0,0 +1,100 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+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-03 09:39:59
+ */
+@Data
+@Schema(description = "我的钱包-提现详情返回实体")
+public class WithdrawDetailVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 申请金额
+     */
+    @Schema(description = "申请金额")
+    private BigDecimal applyAmount;
+
+
+    /**
+     * 到账金额
+     */
+    @Schema(description = "到账金额")
+    private BigDecimal realAmount;
+
+
+    /**
+     * 税费
+     */
+    @Schema(description = "税费")
+    private BigDecimal taxAmount;
+
+
+    /**
+     * 手续费
+     */
+    @Schema(description = "手续费")
+    private BigDecimal serviceAmount;
+
+
+    /**
+     * 申请单号
+     */
+    @Schema(description = "申请单号")
+    private String applyNo;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+    /**
+     * 银行卡ID
+     */
+    @Schema(description = "银行卡ID")
+    private Integer bankId;
+
+
+    /**
+     * 状态 0处理中 1成功 2失败
+     */
+    @Schema(description = "状态 0处理中 1成功 2失败")
+    private Integer status;
+
+
+    /**
+     * 状态中文解释
+     */
+    @Schema(description = "状态中文解释")
+    private String statusNo;
+
+
+
+
+
+	
+
+}

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/WithdrawListVO.java

@@ -0,0 +1,79 @@
+package com.kxs.user.api.vo.kxsapp.userAccount;
+
+
+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;
+
+/**
+ * 我的钱包-提现记录vo
+ *
+ * @author 系统
+ * @date 2024-01-03 09:39:59
+ */
+@Data
+@Schema(description = "我的钱包-提现记录返回实体")
+public class WithdrawListVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 申请金额
+     */
+    @Schema(description = "申请金额")
+    private BigDecimal applyAmount;
+
+
+    /**
+     * 到账金额
+     */
+    @Schema(description = "到账金额")
+    private BigDecimal realAmount;
+
+
+    /**
+     * 状态 0处理中 1成功 2失败
+     */
+    @Schema(description = "状态 0处理中 1成功 2失败")
+    private Integer status;
+
+    /**
+     * 状态中文解释
+     */
+    @Schema(description = "状态中文解释")
+    private String statusNo;
+
+
+    /**
+     * 提现组装信息
+     */
+    @Schema(description = "提现组装信息")
+    private String title;
+
+
+
+
+
+	
+
+}