1

crm-manager/src/main/java/com/crm/manager/controller/UserController.java

@@ -155,13 +155,6 @@ public class UserController extends BaseLoginController {
         if (entity.getValid() == null) {
             entity.setValid(1);
         }
-        if (entity.getInRate() == null && entity.getInRate().compareTo(BigDecimal.ZERO) < 0) {
-            entity.setInRate(new BigDecimal(0.02));
-        }
-
-        if (entity.getOutRate() == null && entity.getOutRate().compareTo(BigDecimal.ZERO) < 0) {
-            entity.setOutRate(new BigDecimal(0.01));
-        }
 
         userInfoService.add(entity);
 

crm-manager/src/main/java/com/crm/manager/service/impl/UserInfoServiceImpl.java

@@ -272,12 +272,6 @@ public class UserInfoServiceImpl implements UserInfoService {
         if (Strings.isNullOrEmpty(entity.getPassword())) {
             entity.setPassword(userInfoTable.getPassword());
         }
-        if (entity.getOutRate() == null && entity.getOutRate().compareTo(BigDecimal.ZERO) < 0) {
-            entity.setOutRate(userInfoTable.getOutRate());
-        }
-        if (entity.getInRate() == null && entity.getInRate().compareTo(BigDecimal.ZERO) < 0) {
-            entity.setInRate(userInfoTable.getInRate());
-        }
 
         /*
             上级发生变动

crm-manager/src/main/resources/application-test.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:28571/cwg_pay?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
+    url: jdbc:mysql://localhost:28571/cwg_vaultody?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&allowMultiQueries=true&useSSL=false
     username: root
     password: NSH01Y0GTmUNjgg6xw80qg==
   jpa:

crm-manager/src/main/resources/application.yml

@@ -14,16 +14,7 @@ login:
     /user/switch/lang,
     /user/update/password/send/email,
     /user/update/email/password,
-    /market/upload/email/template/export,
-    /web/upload/cid/template/export,
-    /cooperative/partner/*/add,
-    /user/display/*,
-    /pay/order/create,
-    /pay/order/withdraw/create,
-    /pay/order/get,
-    /pay/order/submit,
-    /user/register,
-    /user/testKyc
+    /user/display/*
 #  single-sign-on: true
 role:
   googleVerified: false
@@ -34,48 +25,6 @@ role:
     /user/sales,
     /user/update/login/password,
     /user/role/search/list,
-    /account/deal/password/change/custom/searcher/list,
-    /account/deal/password/reset/custom/searcher/list,
-    /account/investor/password/change/custom/searcher/list,
-    /account/leverage/custom/searcher/list,
-    /account/*,
-    /department/search/list,
-    /custom/group/list,
-    /custom/group/type/list,
-    /custom/group/search/info,
-    /custom/login/search/info,
-    /control/panel/custom/dynamic,
-    /custom/search/real/single,
-    /country/get,
-    /control/panel/**,
-    /index/**,
     /reasons/refusal/list,
     /reasons/refusal/custom/list,
-    /push/message/custom/list,
-    /push/message/list,
-    /email/config/list,
-    /trade/**,
-    /trade/sharding/**,
-    /ib/report/*,
-    /ib/search/ib/single,
-    /ib/tree,
-    /ib/tree/**,
-    /ib/point,
-    /bank/custom/list,
-    /agent/point/change/list,
-    /account/belong/change/add,
-    /agent/belong/change/**,
-    /custom/update/ibInvalid,
-    /agent/balance/frozen/**,
-    /email/config/test/send,
-    /web/activity/dropdown,
-    /account/trading/activity/*,
-    /remittance/channel/get/code,
-    /common/upload,
-    /*/channel/get/code,
-    /risk/group/leverage/symbol/list,
-    /source/list,
-    /pay/order/withdraw/upload,
-    /pay/order/withdraw/*/upload,
-    /pay/order/withdraw/template/*/export,
-    /pay/info/get/list
+    /common/upload

crm-model/src/main/java/com/crm/rely/backend/model/constant/CustomConstants.java

@@ -1,11 +0,0 @@
-package com.crm.rely.backend.model.constant;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2022-02-18 18:09
- */
-public class CustomConstants {
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/constant/ManagerConstants.java

@@ -9,5 +9,4 @@ package com.crm.rely.backend.model.constant;
 public class ManagerConstants {
     public static final String ROLE_USER_PREFIX = "CRM_PAY_";
 
-    public static final String ORDER_EXPIRE_TIME = "order_expire_time";
 }

crm-model/src/main/java/com/crm/rely/backend/model/constant/PayConstants.java

@@ -1,11 +0,0 @@
-package com.crm.rely.backend.model.constant;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2022-02-18 18:09
- */
-public class PayConstants {
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/constant/PayTypeConstants.java

@@ -1,15 +0,0 @@
-package com.crm.rely.backend.model.constant;
-
-/**
- * 支付类型
- *
- * @author: houn
- */
-public class PayTypeConstants {
-
-
-    public static final String ALIPAY = "ALIPAY";
-
-    public static final String UNIONPAY = "UNIONPAY";
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/account/PayAccountAlipayDto.java

@@ -1,26 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.account;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PayAccountAlipayDto {
-    private Long id;
-
-    private Long userId;
-
-    private String alipayUrl;
-
-    private Date addTime;
-
-    private Long addUser;
-
-    private String addIp;
-
-    private Date modifyTime;
-
-    private Long modifyUser;
-
-    private String modifyIp;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/account/PayAccountBankDto.java

@@ -1,38 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.account;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PayAccountBankDto {
-    private Long id;
-
-    private Long userId;
-
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-    private Date addTime;
-
-    private Long addUser;
-
-    private String addIp;
-
-    private Date modifyTime;
-
-    private Long modifyUser;
-
-    private String modifyIp;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/info/PayInfoDto.java

@@ -1,40 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.info;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayInfoDto {
-
-    private Long userId;
-    private Long id;
-    private String name;
-
-    private String email;
-    private String phone;
-    private String secretKey;
-    private BigDecimal inRate;
-    private BigDecimal outRate;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal outProfitRate;
-
-    private Integer userType;
-
-    private BigDecimal balance;
-    private BigDecimal balanceLocked;
-
-    private Date addTime;
-
-    private Long addUser;
-
-    private String addIp;
-
-    private Date modifyTime;
-
-    private Long modifyUser;
-
-    private String modifyIp;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/info/balance/history/PayInfoBalanceHistoryDto.java

@@ -1,26 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.info.balance.history;
-
-import com.crm.rely.backend.core.dto.base.BaseInfoDto;
-import com.crm.rely.backend.core.pojo.BaseTable;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayInfoBalanceHistoryDto extends BaseInfoDto {
-
-    private Long userId;
-
-    private String name;
-
-    private String email;
-
-    private Integer userType;
-
-    private BigDecimal balance;
-    private BigDecimal balanceLocked;
-
-    private String remarks;
-
-    private String serial;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/order/PayOrderDto.java

@@ -1,63 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.order;
-
-import com.crm.rely.backend.core.pojo.BaseApproveTable;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayOrderDto extends BaseApproveTable {
-
-
-    private String serial;
-
-    private String merchantSerial;
-
-    private Long userShopId;
-
-    private BigDecimal amount;
-
-    private BigDecimal cny;
-    private String callbackUrl;
-
-    private String callbackContent;
-    private Integer callbackStatus;
-    private Integer callbackNumber;
-    private Date callbackTime;
-
-    private Date expireTime;
-
-    private Long userAcceptorId;
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-    private BigDecimal inRate;
-
-    //amount*inRate
-    private BigDecimal inRateAmount;
-
-    //amount-inRateAmount
-    private BigDecimal actualAmount;
-
-    private String payUrl;
-
-    private String customName;
-
-    private String alipayUrl;
-
-    private String payType;
-
-    private String payMsg;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/order/PayOrderExhibitionAlipayDto.java

@@ -1,12 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.order;
-
-import lombok.Data;
-
-@Data
-public class PayOrderExhibitionAlipayDto extends PayOrderExhibitionDto {
-
-
-    private String payMsg;
-    private String alipayUrl;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/order/PayOrderExhibitionDto.java

@@ -1,24 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.order;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayOrderExhibitionDto {
-
-    private String serial;
-
-    private String merchantSerial;
-
-    private BigDecimal amount;
-
-    private BigDecimal cny;
-    private String pickupUrl;
-
-    private Date expireTime;
-
-
-    private String payType;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/order/PayOrderExhibitionUnionPayDto.java

@@ -1,22 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.order;
-
-import lombok.Data;
-
-@Data
-public class PayOrderExhibitionUnionPayDto extends PayOrderExhibitionDto {
-    
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/order/withdraw/PayOrderWithdrawDto.java

@@ -1,59 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.order.withdraw;
-
-import com.crm.rely.backend.core.pojo.BaseApproveTable;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class PayOrderWithdrawDto extends BaseApproveTable {
-
-    private String serial;
-    private String merchantSerial;
-
-    private Long userShopId;
-    private BigDecimal amount;
-
-    private BigDecimal outRate;
-
-    //amount*outRate
-    private BigDecimal outRateAmount;
-
-    //amount+inRateAmount
-    private BigDecimal actualAmount;
-
-    private Long userAcceptorId;
-
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-    private Date expireTime;
-
-    private List<String> voucherUrls;
-
-    private Integer withdrawType;
-
-    private String callbackUrl;
-
-    private String callbackContent;
-    private Integer callbackStatus;
-    private Integer callbackNumber;
-    private Date callbackTime;
-
-    private String walletAddress;
-
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/order/withdraw/PayOrderWithdrawExhibitionDto.java

@@ -1,35 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.order.withdraw;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayOrderWithdrawExhibitionDto {
-
-    private String serial;
-
-    private String merchantSerial;
-
-    private BigDecimal amount;
-
-    private BigDecimal cny;
-    private String pickupUrl;
-
-    private Date expireTime;
-
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/pay/rate/PayCurrencySearchDto.java

@@ -1,32 +0,0 @@
-package com.crm.rely.backend.model.dto.pay.rate;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @description:
- * @author: houn
- * @create: 2020-07-01 16:50
- **/
-@Data
-public class PayCurrencySearchDto {
-    private Long id;
-
-    private Integer type;
-
-    /**
-     * 汇率
-     */
-    private BigDecimal rate;
-
-    /**
-     * 货币类型
-     */
-    private String currency;
-
-    /**
-     * 转化后的货币类型
-     */
-    private String transformCurrency;
-}

crm-model/src/main/java/com/crm/rely/backend/model/dto/user/info/UserInfoIbNoDto.java

@@ -1,40 +0,0 @@
-package com.crm.rely.backend.model.dto.user.info;
-
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-09-30 18:06
- */
-@Data
-public class UserInfoIbNoDto {
-    private Long id;
-
-    private String name;
-
-    private String email;
-
-    private String pIbNo;
-
-    private Long cId;
-
-    private String ibNo;
-
-    private Integer hide;
-
-    /**
-     * 代理等级
-     */
-    private Long agentLevel;
-    /**
-     * 代理等级名称
-     */
-    private String agentLevelName;
-
-    private String agentLevelEnName;
-
-    private Float balance;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/file/CustomFileAddAndUpdateEntity.java

@@ -1,31 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.file;
-
-import com.crm.rely.backend.core.constant.Constants;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CustomFileAddAndUpdateEntity {
-    private Long id;
-
-    private Long customId;
-
-    @NotNull(message = Constants.SYSTEM_ERROR)
-    private Integer type;
-
-    private String path;
-
-    private String ip;
-
-    private Long user;
-
-    private Date time;
-
-    /**
-     * 1:客户
-     * 2:后台操作人员
-     */
-    private Integer uploadUserType;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/file/CustomFileAllEntity.java

@@ -1,9 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.file;
-
-import lombok.Data;
-
-@Data
-public class CustomFileAllEntity {
-
-    private Long customId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/file/CustomFileApproveEntity.java

@@ -1,14 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.file;
-
-import com.crm.rely.backend.core.entity.base.BaseApproveEntity;
-import lombok.Data;
-
-/**
- * @description:
- * @author: houn
- * @create: 2020-07-19 16:38
- **/
-@Data
-public class CustomFileApproveEntity extends BaseApproveEntity {
-    private Long customId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/file/CustomFileDeleteEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.file;
-
-import com.crm.rely.backend.core.entity.base.BaseDeleteEntities;
-import lombok.Data;
-
-@Data
-public class CustomFileDeleteEntity extends BaseDeleteEntities {
-
-    private Long customId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/file/history/CustomFileHistoryAddEntity.java

@@ -1,13 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.file.history;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import lombok.Data;
-
-@Data
-public class CustomFileHistoryAddEntity extends BaseAddEntity {
-    private Long customId;
-
-    private Integer type;
-
-    private String path;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomApplyRealEntity.java

@@ -1,20 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @description:
- * @author: houn
- * @create: 2020-07-09 09:33
- **/
-@Data
-public class CustomApplyRealEntity extends BaseUpdateEntity {
-
-    private Long customId;
-
-    private Date applyRealTime;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomApproveEntity.java

@@ -1,15 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.base.BaseApproveEntity;
-import lombok.Data;
-
-/**
- * @description:
- * @author: houn
- * @create: 2020-07-09 09:33
- **/
-@Data
-public class CustomApproveEntity extends BaseApproveEntity {
-
-    private Integer applyRealStatus;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomBelongsListEntity.java

@@ -1,18 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.base.BaseSearchPageEntity;
-import lombok.Data;
-
-/**
- * Created by max on 2020/9/30.
- */
-@Data
-public class CustomBelongsListEntity extends BaseSearchPageEntity{
-
-    private Long agentId;
-
-    private Long cId;
-
-    private String lang;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomIbInvalidUpdateEntity.java

@@ -1,21 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import lombok.Data;
-
-
-
-/**
- * Created by max on 2020/11/6.
- */
-@Data
-public class CustomIbInvalidUpdateEntity extends BaseUpdateEntity{
-
-    private Long userId;
-    @Min(value = 0,message = "parameter_error")
-    @Max(value = 1,message = "parameter_error")
-    private Integer ibInvalid;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoAddEntity.java

@@ -1,145 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-07-30 17:01
- */
-@Data
-public class CustomInfoAddEntity {
-
-    private String firstName;
-
-    private String middle;
-
-
-    private String lastName;
-    /**
-     * 英文名称(拼音)
-     */
-    private String nameEn;
-
-    /**
-     * 语言
-     */
-    private String lang;
-
-    private String nationality;
-
-    /**
-     * 性别 1:男 2:女
-     */
-    private Integer gender;
-
-    /**
-     * 出生日期
-     */
-    private Date birth;
-
-    /**
-     * 身份证件号 身份证 护照等
-     */
-    private String identity;
-
-    /**
-     * 国家
-     */
-    private String country;
-
-    /**
-     * 省
-     */
-    private String state;
-
-    /**
-     * 城市
-     */
-    private String city;
-
-    /**
-     * 邮编
-     */
-    private String zipCode;
-
-    /**
-     * 详细地址
-     */
-    private List<String> addressLines;
-
-    // <editor-fold desc="调查信息">
-
-    /**
-     * 证件id
-     */
-    private String taxNumber;
-
-    /**
-     * 教育程度
-     */
-    private String level;
-
-    /**
-     * 就业状况
-     */
-    private String employmentStatus;
-
-    /**
-     * 职业
-     */
-    private String occupation;
-
-    /**
-     * 交易目的
-     */
-    private String tradingObjectives;
-
-    /**
-     *
-     */
-    private String grossAnnualIncome;
-
-    /**
-     * 资金来源
-     */
-    private String sourceFunding;
-
-    /**
-     * 总资产
-     */
-    private String totalNewWorth;
-
-    /**
-     * 我有在其他经纪商交易衍生产品的经验
-     */
-    private Integer experienceTradingDerivative;
-
-    /**
-     * 我有交易外汇、差价合约(CFD)或其他衍生品的经验。
-     */
-    private Integer experienceTradingForex;
-
-    /**
-     * 衍生品适合作为我的投资目标和风险偏好的一部分，因此我能够评估交易它们的风险，包括可能失去我所有的投资资本的风险。
-     */
-    private Integer derivativeProducts;
-
-    /**
-     * 我有金融服务方面的相关经验，帮助我了解使用我们的服务和交易衍生产品的风险。
-     */
-    private Integer experienceQualification;
-    //</editor-fold>
-
-    private Date AddTime;
-
-    private Long AddUser;
-
-    private String AddIp;
-
-    private Integer valid;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoLoginByCIdEntity.java

@@ -1,14 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.login.BaseLoginEntity;
-import lombok.Data;
-
-/**
- * Created by max on 2021/3/16.
- */
-@Data
-public class CustomInfoLoginByCIdEntity extends BaseLoginEntity {
-
-    private Long cId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoLoginEntity.java

@@ -1,34 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.entity.login.BaseLoginEntity;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-07-25 16:06
- */
-@Data
-public class CustomInfoLoginEntity extends BaseLoginEntity {
-
-    @NotNull(message = Constants.USERNAME_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.USERNAME_NOT_NULL_ERROR)
-    private String loginName;
-
-    @NotNull(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    private String password;
-
-    private String ip;
-
-    private String address;
-
-    private Date time;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoRegisterEntity.java

@@ -1,61 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.CustomConstant;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-07-30 17:01
- */
-@Data
-public class CustomInfoRegisterEntity extends BaseAddEntity {
-
-    @NotNull(message = CustomConstant.COUNTRY_NOT_NULL)
-    @NotBlank(message = CustomConstant.COUNTRY_NOT_NULL)
-    private String country;
-
-    private String nationality;
-
-    @Pattern(regexp = RegexpConstants.REGEXP_PWD, message = Constants.PASSWORD_FORMAT_ERROR)
-    @NotNull(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    private String password;
-
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String email;
-
-    @NotNull(message = Constants.EMAIL_CODE_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_CODE_NOT_NULL_ERROR)
-    private String emailCode;
-
-    /**
-     * 区号
-     */
-    private String areaCode;
-
-
-    /**
-     * 手机(唯一)
-     */
-    private String phone;
-
-    private String identity;
-
-    private Integer valid;
-
-    private Integer status;
-
-    private Long agentId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoRegisterSendEmailCodeEntity.java

@@ -1,28 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.CustomConstant;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CustomInfoRegisterSendEmailCodeEntity {
-
-    @NotNull(message = CustomConstant.COUNTRY_NOT_NULL)
-    @NotBlank(message = CustomConstant.COUNTRY_NOT_NULL)
-    private String country;
-    
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String email;
-
-    private String ip;
-
-    private Date time;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoUpdateAgentEntity.java

@@ -1,17 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-11-03 00:01
- */
-@Data
-public class CustomInfoUpdateAgentEntity extends BaseUpdateEntity {
-
-    private Long agentId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoUpdateEmailEntity.java

@@ -1,44 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-07-30 17:01
- */
-@Data
-public class CustomInfoUpdateEmailEntity  {
-
-    private Long customId;
-
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String oldEmail;
-
-    private Long id;
-
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String email;
-
-    @NotNull(message = Constants.EMAIL_CODE_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_CODE_NOT_NULL_ERROR)
-    private String emailCode;
-
-    private Date modifyTime;
-
-    private Long modifyUser;
-
-    private String modifyIp;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoUpdateEmailSendEmailCodeEntity.java

@@ -1,30 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CustomInfoUpdateEmailSendEmailCodeEntity {
-
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String oldEmail;
-
-    private String country;
-    
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String email;
-
-    private String ip;
-
-    private Date time;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoUpdateEntity.java

@@ -1,106 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-07-30 17:01
- */
-@Data
-public class CustomInfoUpdateEntity {
-
-    private Long customId;
-
-    private String firstName;
-
-    private String middle;
-
-
-    private String lastName;
-    /**
-     * 英文名称(拼音)
-     */
-    private String nameEn;
-
-    /**
-     * 语言
-     */
-    private String lang;
-
-    /**
-     * 性别 1:男 2:女
-     */
-    private Integer gender;
-
-    /**
-     * 出生日期
-     */
-    private Date birth;
-
-    /**
-     * 身份证件号 身份证 护照等
-     */
-    private String identity;
-
-    /**
-     * 国家
-     */
-    private String country;
-
-    /**
-     * 区号
-     */
-    private String areaCode;
-
-
-    /**
-     * 手机(唯一)
-     */
-    private String phone;
-
-    /**
-     * 省
-     */
-    private String state;
-
-    /**
-     * 城市
-     */
-    private String city;
-
-    /**
-     * 邮编
-     */
-    private String zipCode;
-
-    /**
-     * 详细地址
-     */
-    private List<String> addressLines;
-
-    // <editor-fold desc="调查信息">
-
-    /**
-     * 证件id
-     */
-    private String taxNumber;
-
-    /**
-     * 教育程度
-     */
-    private String level;
-
-    private Date modifyTime;
-
-    private Long modifyUser;
-
-    private String modifyIp;
-
-    private Integer valid;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomInfoUpdateHeadPictureEntity.java

@@ -1,23 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-07-30 17:01
- */
-@Data
-public class CustomInfoUpdateHeadPictureEntity {
-
-    private Long customId;
-
-    private String ip;
-
-    private Long user;
-
-    private Date time;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomSearchEntity.java

@@ -1,49 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-/**
- * @description:
- * @author: houn
- * @create: 2020-07-09 09:53
- **/
-@Data
-public class CustomSearchEntity extends BaseDateAndPageSearchEntity {
-
-    private String platform;
-
-    private Long cId;
-
-    private Integer type;
-
-    private String email;
-
-    private String stamp;
-
-    private String ibNo;
-
-    private Long groupId;
-
-    /**
-     * 0:未申请或者已拒绝
-     */
-    private Integer status;
-
-    /**
-     * status=0 potentialStatus=0 未申请 potentialStatus=1已拒绝
-     */
-    private Integer potentialStatus;
-
-    private Long agentId;
-
-    private String identity;
-
-
-    private String sourceCode;
-
-    private Integer comPoint;
-
-    private Integer salesSettingLevel;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomUpdateEmailPasswordEntity.java

@@ -1,27 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CustomUpdateEmailPasswordEntity {
-    @NotNull
-    @NotBlank
-    private String token;
-
-    @Pattern(regexp = RegexpConstants.REGEXP_PWD, message = Constants.PASSWORD_FORMAT_ERROR)
-    @NotNull(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    private String password;
-
-    private Date modifyTime;
-
-    private String modifyIp;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomUpdateLoginPasswordEntity.java

@@ -1,32 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CustomUpdateLoginPasswordEntity {
-
-    private Long id;
-
-//    @Pattern(regexp = RegexpConstants.REGEXP_PWD, message = Constants.PASSWORD_FORMAT_ERROR)
-    @NotNull(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    private String oldPassword;
-
-    @Pattern(regexp = RegexpConstants.REGEXP_PWD, message = Constants.PASSWORD_FORMAT_ERROR)
-    @NotNull(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.PASSWORD_NOT_NULL_ERROR)
-    private String newPassword;
-
-    private Date modifyTime;
-
-    private Long modifyUser;
-
-    private String modifyIp;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/custom/info/CustomUpdatePasswordSendEmailEntity.java

@@ -1,23 +0,0 @@
-package com.crm.rely.backend.model.entity.custom.info;
-
-import com.crm.rely.backend.core.constant.Constants;
-import com.crm.rely.backend.core.constant.RegexpConstants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class CustomUpdatePasswordSendEmailEntity {
-
-    @Pattern(regexp = RegexpConstants.REGEXP_EMAIL, message = Constants.EMAIL_FORMAT_ERROR)
-    @NotNull(message = Constants.EMAIL_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_NOT_NULL_ERROR)
-    private String email;
-
-    private String ip;
-
-    private Date time;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/excel/PayOrderWithdrawAliTemplateEntity.java

@@ -1,22 +0,0 @@
-package com.crm.rely.backend.model.entity.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-@Data
-public class PayOrderWithdrawAliTemplateEntity {
-    @ExcelProperty(value = "商户流水号")
-    private String merchantSerial;
-
-    @ExcelProperty(value = "用户名")
-    private String name;
-
-    @ExcelProperty(value = "金额")
-    private String amount;
-
-    @ExcelProperty(value = "支付宝账号")
-    private String walletAddress;
-
-    @ExcelProperty(value = "回调地址")
-    private String callbackUrl;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/excel/PayOrderWithdrawTemplateEntity.java

@@ -1,37 +0,0 @@
-package com.crm.rely.backend.model.entity.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-@Data
-public class PayOrderWithdrawTemplateEntity {
-    @ExcelProperty(value = "商户流水号")
-    private String merchantSerial;
-    @ExcelProperty(value = "金额")
-    private String amount;
-
-    @ExcelProperty(value = "银行户名")
-    private String bankUname;
-
-    @ExcelProperty(value = "银行卡号")
-    private String bankCardNum;
-
-    @ExcelProperty(value = "开户行")
-    private String bankName;
-
-    @ExcelProperty(value = "支行信息")
-    private String bankBranchName;
-
-    @ExcelProperty(value = "bankAddr")
-    private String bankAddr;
-
-    @ExcelProperty(value = "swiftCode")
-    private String swiftCode;
-
-    @ExcelProperty(value = "bankCode")
-    private String bankCode;
-
-    @ExcelProperty(value = "回调地址")
-    private String callbackUrl;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/excel/TestExcel.java

@@ -1,11 +0,0 @@
-package com.crm.rely.backend.model.entity.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.metadata.BaseRowModel;
-
-public class TestExcel extends BaseRowModel {
-
-
-    @ExcelProperty(value = "id", index = 0)
-    private String id;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/alipay/PayAccountAlipayAddEntity.java

@@ -1,12 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.alipay;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import lombok.Data;
-
-@Data
-public class PayAccountAlipayAddEntity extends BaseAddEntity {
-
-    private Long userId;
-
-    private String alipayUrl;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/alipay/PayAccountAlipayDeleteEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.alipay;
-
-import com.crm.rely.backend.core.entity.base.BaseDeleteEntities;
-import lombok.Data;
-
-@Data
-public class PayAccountAlipayDeleteEntity extends BaseDeleteEntities {
-
-    private Long userId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/alipay/PayAccountAlipaySearchEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.alipay;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-
-@Data
-public class PayAccountAlipaySearchEntity extends BaseDateAndPageSearchEntity {
-    private Long userId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/alipay/PayAccountAlipayUpdateEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.alipay;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-@Data
-public class PayAccountAlipayUpdateEntity extends BaseUpdateEntity {
-
-    private String alipayUrl;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/bank/PayAccountBankAddEntity.java

@@ -1,24 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.bank;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import lombok.Data;
-
-@Data
-public class PayAccountBankAddEntity extends BaseAddEntity {
-
-    private Long userId;
-
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/bank/PayAccountBankDeleteEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.bank;
-
-import com.crm.rely.backend.core.entity.base.BaseDeleteEntities;
-import lombok.Data;
-
-@Data
-public class PayAccountBankDeleteEntity extends BaseDeleteEntities {
-
-    private Long userId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/bank/PayAccountBankSearchEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.bank;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-
-@Data
-public class PayAccountBankSearchEntity extends BaseDateAndPageSearchEntity {
-    private Long userId;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/account/bank/PayAccountBankUpdateEntity.java

@@ -1,24 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.account.bank;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-@Data
-public class PayAccountBankUpdateEntity extends BaseUpdateEntity {
-
-    private Long userId;
-
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/info/PayInfoEntity.java

@@ -1,24 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.info;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayInfoEntity extends BaseAddEntity {
-    private Long userId;
-
-    private Integer userType;
-
-    private String name;
-
-    private String email;
-    private String phone;
-    private String secretKey;
-    private BigDecimal inRate;
-    private BigDecimal outRate;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal outProfitRate;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/info/PayInfoSearchEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.info;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-
-@Data
-public class PayInfoSearchEntity extends BaseDateAndPageSearchEntity {
-    private Long userId;
-
-    private String name;
-
-    private String email;
-
-    private Integer userType;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/info/PayInfoUpdateBalanceEntity.java

@@ -1,20 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayInfoUpdateBalanceEntity extends BaseUpdateEntity {
-
-    private Long userId;
-
-    private BigDecimal balance;
-
-    private BigDecimal balanceLocked;
-
-    private String remarks;
-
-    private String serial;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/info/PayInfoUpdateEntity.java

@@ -1,22 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.info;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayInfoUpdateEntity extends BaseUpdateEntity {
-    private Long userId;
-
-    private String name;
-
-    private String email;
-    private String phone;
-    private BigDecimal inRate;
-    private BigDecimal outRate;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal outProfitRate;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/info/balance/history/PayInfoBalanceHistoryAddEntity.java

@@ -1,26 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.info.balance.history;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@AllArgsConstructor
-public class PayInfoBalanceHistoryAddEntity extends BaseAddEntity {
-
-    private Long userId;
-
-    private String name;
-
-    private String email;
-
-    private Integer userType;
-
-    private BigDecimal balance;
-    private BigDecimal balanceLocked;
-
-    private String remarks;
-    private String serial;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/info/balance/history/PayInfoBalanceHistorySearchEntity.java

@@ -1,18 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.info.balance.history;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-
-@Data
-public class PayInfoBalanceHistorySearchEntity extends BaseDateAndPageSearchEntity {
-    private Long userId;
-
-    private String name;
-
-    private String email;
-
-    private Integer userType;
-    
-    private String serial;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderApproveEntity.java

@@ -1,12 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import com.crm.rely.backend.core.entity.base.BaseApproveEntity;
-import lombok.Data;
-
-
-@Data
-public class PayOrderApproveEntity extends BaseApproveEntity {
-
-    private Long userId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderEntity.java

@@ -1,31 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayOrderEntity {
-
-    private String merchantSerial;
-
-    private Long userShopId;
-    private BigDecimal amount;
-
-    private String callbackUrl;
-
-    private String pickupUrl;
-
-    private Date expireTime;
-
-    private Long addUser;
-
-    private Date addTime;
-
-    private String addIp;
-
-    private String name;
-
-    private String payType;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderGetEntity.java

@@ -1,14 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-
-@Data
-public class PayOrderGetEntity {
-    @NotNull
-    @NotBlank
-    private String serial;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderRequestEntity.java

@@ -1,42 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayOrderRequestEntity {
-
-    @NotNull
-    @NotBlank
-    private String shopOrderNo;
-
-    @NotNull
-    private Long shopId;
-
-    @NotNull
-    private BigDecimal amount;
-
-    @NotNull
-    @NotBlank
-    private String callbackUrl;
-
-    @NotNull
-    @NotBlank
-    private String pickupUrl;
-    @NotNull
-    private Date requestTime;
-
-    @NotNull
-    @NotBlank
-    private String sign;
-
-    @NotNull
-    private String name;
-
-    private String payType;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderRestartOrderEntity.java

@@ -1,9 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-@Data
-public class PayOrderRestartOrderEntity extends BaseUpdateEntity {
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderSearchEntity.java

@@ -1,22 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-@Data
-public class PayOrderSearchEntity extends BaseDateAndPageSearchEntity {
-
-    private Long userShopId;
-
-    private Integer callbackStatus;
-
-    private Integer status;
-
-    private Long userAcceptorId;
-
-    private String serial;
-
-    private String merchantSerial;
-
-    private String customName;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayOrderSubmitEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Data
-public class PayOrderSubmitEntity {
-    @NotNull
-    @NotBlank
-    private String serial;
-
-    @NotNull
-    private Integer customStatus;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/PayWithdrawOrderRequestEntity.java

@@ -1,57 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PayWithdrawOrderRequestEntity {
-
-    @NotNull
-    @NotBlank
-    private String shopOrderNo;
-
-    @NotNull
-    private Long shopId;
-
-    @NotNull
-    private BigDecimal amount;
-
-    @NotNull
-    @NotBlank
-    private String callbackUrl;
-
-    @NotNull
-    private Date requestTime;
-
-
-    @NotNull
-    private String name;
-
-    private String bankUname;
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-
-    private Integer withdrawType;
-
-    private String walletAddress;
-
-
-    @NotNull
-    @NotBlank
-    private String sign;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawAddEntity.java

@@ -1,35 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import jakarta.validation.constraints.Null;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayOrderWithdrawAddEntity extends BaseAddEntity {
-
-    private String merchantSerial;
-    private Long userShopId;
-    @Null
-    private BigDecimal amount;
-    private String bankUname;
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-    private String name;
-    private Integer withdrawType;
-
-    private String callbackUrl;
-
-    private String walletAddress;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawApproveEntity.java

@@ -1,11 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseApproveEntity;
-import lombok.Data;
-
-@Data
-public class PayOrderWithdrawApproveEntity extends BaseApproveEntity {
-
-    private Long userId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawCancelEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-
-@Data
-public class PayOrderWithdrawCancelEntity extends BaseUpdateEntity {
-
-    @NotNull
-    private Integer shopStatus;
-
-    private Long userAcceptorId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawConfirmEntity.java

@@ -1,19 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PayOrderWithdrawConfirmEntity extends BaseUpdateEntity {
-
-    @NotNull
-    private Integer shopStatus;
-
-    private List<String> voucherUrls;
-
-    private Long userAcceptorId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawDeleteEntity.java

@@ -1,13 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseDelete;
-import lombok.Data;
-
-@Data
-public class PayOrderWithdrawDeleteEntity extends BaseDelete {
-
-    private Long id;
-
-    private Long shopUserId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawRobEntity.java

@@ -1,12 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-
-@Data
-public class PayOrderWithdrawRobEntity extends BaseUpdateEntity {
-
-    private Long userId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawSearchEntity.java

@@ -1,27 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseDateAndPageSearchEntity;
-import lombok.Data;
-
-@Data
-public class PayOrderWithdrawSearchEntity extends BaseDateAndPageSearchEntity {
-
-    private Long userShopId;
-
-    /**
-     * -1 待抢单
-     * 0 待承兑商去确认
-     * 1 承兑商确认 待商户确认
-     * 2 商户确认通过 订单完成
-     * 3 商户拒绝 订单结束
-     */
-    private Integer status;
-
-    private Long userAcceptorId;
-
-    private String serial;
-
-    private String bankUname;
-
-    private String merchantSerial;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/order/withdraw/PayOrderWithdrawShopCancelEntity.java

@@ -1,11 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.order.withdraw;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-@Data
-public class PayOrderWithdrawShopCancelEntity extends BaseUpdateEntity {
-
-    private Long shopUserId;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/rate/FinanceRateBatchUpdateEntity.java

@@ -1,25 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.rate;
-
-import com.crm.rely.backend.core.constant.Constants;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: houn
- * @create: 2020-07-17 12:14
- **/
-@Data
-public class FinanceRateBatchUpdateEntity {
-    private Integer type;
-
-    List<FinanceRateUpdatesEntity> data;
-
-    private String email;
-    @NotNull(message = Constants.EMAIL_CODE_NOT_NULL_ERROR)
-    @NotBlank(message = Constants.EMAIL_CODE_NOT_NULL_ERROR)
-    private String emailCode;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/rate/FinanceRateUpdatesEntity.java

@@ -1,26 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.rate;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class FinanceRateUpdatesEntity {
-
-    private Long id;
-    /**
-     * 汇率
-     */
-    private BigDecimal rate;
-
-    /**
-     * 货币类型
-     */
-    private String currency;
-
-    /**
-     * 转化后的货币类型
-     */
-    private String transformCurrency;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/rate/PayCurrencyAddEntity.java

@@ -1,27 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.rate;
-
-import com.crm.rely.backend.core.entity.base.BaseAddEntity;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayCurrencyAddEntity extends BaseAddEntity {
-    private Integer type;
-
-    /**
-     * 汇率
-     */
-    private BigDecimal rate;
-
-    /**
-     * 货币类型
-     */
-    private String currency;
-
-    /**
-     * 转化后的货币类型
-     */
-    private String transformCurrency;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/rate/PayCurrencyDeleteEntity.java

@@ -1,10 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.rate;
-
-import com.crm.rely.backend.core.entity.base.BaseDeleteEntities;
-import lombok.Data;
-
-
-@Data
-public class PayCurrencyDeleteEntity extends BaseDeleteEntities {
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/rate/PayCurrencySearchListEntity.java

@@ -1,19 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.rate;
-
-import lombok.Data;
-
-@Data
-public class PayCurrencySearchListEntity {
-
-    private Integer type;
-
-    /**
-     * 货币类型
-     */
-    private String currency;
-
-    /**
-     * 转化后的货币类型
-     */
-    private String transformCurrency;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/pay/rate/PayCurrencyUpdateEntity.java

@@ -1,28 +0,0 @@
-package com.crm.rely.backend.model.entity.pay.rate;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class PayCurrencyUpdateEntity extends BaseUpdateEntity {
-
-    private Integer type;
-
-    /**
-     * 汇率
-     */
-    private BigDecimal rate;
-
-    /**
-     * 货币类型
-     */
-    private String currency;
-
-    /**
-     * 转化后的货币类型
-     */
-    private String transformCurrency;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoAddEntity.java

@@ -41,12 +41,6 @@ public class UserInfoAddEntity extends BaseAddEntity {
     @NotNull(message = ManagerConstant.ROLE_NOT_NULL_ERROR)
     private Long roleId;
 
-    private BigDecimal inRate;
-    private BigDecimal outRate;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal outProfitRate;
-
     private Integer userType;
 
     private String nationality;

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoIbSearchEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2019-09-30 18:01
- */
-@Data
-public class UserInfoIbSearchEntity {
-
-    private String ibNo;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoSwitchLangEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-10-11 17:01
- */
-@Data
-public class UserInfoSwitchLangEntity  {
-
-    private String lang;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdateCloseFunctionsEntity.java

@@ -1,18 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2021-11-05 00:01
- */
-@Data
-public class UserInfoUpdateCloseFunctionsEntity extends BaseUpdateEntity {
-
-    private List<String> closeFunctions;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdateCommissionApprovalEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-10-01 00:01
- */
-@Data
-public class UserInfoUpdateCommissionApprovalEntity extends BaseUpdateEntity {
-
-    private Integer commissionApproval;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdateEntity.java

@@ -38,12 +38,6 @@ public class UserInfoUpdateEntity extends BaseUpdateEntity {
     @NotNull(message = ManagerConstant.ROLE_NOT_NULL_ERROR)
     private Long roleId;
 
-    private BigDecimal inRate;
-    private BigDecimal outRate;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal outProfitRate;
-
     private String nationality;
     private Long pid;
 

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdateExcludeShowLoginTypeEntity.java

@@ -1,19 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.util.List;
-
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-12-30 00:01
- */
-@Data
-public class UserInfoUpdateExcludeShowLoginTypeEntity extends BaseUpdateEntity {
-
-    private List<String> excludeShowLoginTypes;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdateHideEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-10-01 00:01
- */
-@Data
-public class UserInfoUpdateHideEntity extends BaseUpdateEntity {
-
-    private Integer hide;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdateLoginTypeAndGroupTypeEntity.java

@@ -1,25 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-import java.util.List;
-
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-12-30 00:01
- */
-@Data
-public class UserInfoUpdateLoginTypeAndGroupTypeEntity extends BaseUpdateEntity {
-
-    private List<String> selectLoginTypes;
-
-    private List<String> excludeLoginTypes;
-
-    private Long selectGroupType;
-
-    private Long defaultGroupType;
-}

crm-model/src/main/java/com/crm/rely/backend/model/entity/user/info/UserInfoUpdatePammManagerValidEntity.java

@@ -1,16 +0,0 @@
-package com.crm.rely.backend.model.entity.user.info;
-
-import com.crm.rely.backend.core.entity.base.BaseUpdateEntity;
-import lombok.Data;
-
-/**
- * @program: crm-backend
- * @description:
- * @author: houn
- * @create: 2020-10-01 00:01
- */
-@Data
-public class UserInfoUpdatePammManagerValidEntity extends BaseUpdateEntity {
-
-    private Integer pammManagerValid;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayAccountAlipayTable.java

@@ -1,17 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-
-@Data
-@Entity
-@Table(name = "pay_account_alipay")
-public class PayAccountAlipayTable extends BaseTable {
-
-    private Long userId;
-
-    private String alipayUrl;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayAccountBankTable.java

@@ -1,28 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-
-@Data
-@Entity
-@Table(name = "pay_account_bank")
-public class PayAccountBankTable extends BaseTable {
-
-    private Long userId;
-
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-    private String bankCode;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayAmountTable.java

@@ -1,19 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@Entity
-@Table(name = "pay_amount")
-public class PayAmountTable extends BaseTable {
-
-    private BigDecimal balance;
-
-    private BigDecimal balanceLocked;
-
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayCallLogTable.java

@@ -1,25 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-
-@Data
-@Entity
-@Table(name = "pay_call_log")
-public class PayCallLogTable extends BaseTable {
-
-    private Long orderId;
-
-    private String serial;
-
-    private String merchantSerial;
-
-    private String callbackUrl;
-
-    private String callbackContent;
-    private Integer callbackStatus;
-    private String responseBody;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayCurrencyTable.java

@@ -1,32 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@Entity
-@Table(name = "pay_currency")
-public class PayCurrencyTable extends BaseTable {
-
-
-    private Integer type;
-
-    /**
-     * 汇率
-     */
-    private BigDecimal rate;
-
-    /**
-     * 货币类型
-     */
-    private String currency;
-
-    /**
-     * 转化后的货币类型
-     */
-    private String transformCurrency;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayInfoBalanceHistoryTable.java

@@ -1,28 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@Entity
-@Table(name = "pay_info_balance_history")
-public class PayInfoBalanceHistoryTable extends BaseTable {
-
-    private String serial;
-    private Long userId;
-
-    private String name;
-
-    private String email;
-
-    private Integer userType;
-
-    private BigDecimal balance;
-    private BigDecimal balanceLocked;
-
-    private String remarks;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayInfoTable.java

@@ -1,32 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@Entity
-@Table(name = "pay_info")
-public class PayInfoTable extends BaseTable {
-
-    private Long userId;
-
-    private String name;
-
-    private String email;
-    private String phone;
-    private String secretKey;
-    private BigDecimal inRate;
-    private BigDecimal outRate;
-
-    private Integer userType;
-
-    private BigDecimal balance;
-    private BigDecimal balanceLocked;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal outProfitRate;
-}

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/PayOrderTable.java

@@ -1,72 +0,0 @@
-package com.crm.rely.backend.model.pojo.table;
-
-import com.crm.rely.backend.core.pojo.BaseApproveTable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@Entity
-@Table(name = "pay_order")
-public class PayOrderTable extends BaseApproveTable {
-
-    private String serial;
-
-
-    private String customName;
-
-    private String merchantSerial;
-
-    private Long userShopId;
-    private String secretKey;
-    private BigDecimal amount;
-
-    private BigDecimal cny;
-    private String callbackUrl;
-
-    private String callbackContent;
-    private Integer callbackStatus;
-    private Integer callbackNumber;
-    private Date callbackTime;
-
-    private Date expireTime;
-
-    private Long userAcceptorId;
-    private String bankUname;
-
-    private String bankCardNum;
-
-    private String bankName;
-
-    private String bankBranchName;
-
-    private String bankAddr;
-
-    private String swiftCode;
-
-    private String bankCode;
-
-    private BigDecimal inRate;
-
-    //amount*inRate
-    private BigDecimal inRateAmount;
-
-    //amount-inRateAmount
-    private BigDecimal actualAmount;
-
-    private String payUrl;
-
-    private String pickupUrl;
-
-    private BigDecimal inProfitRate;
-    private BigDecimal inProfitRateAmount;
-
-    private String alipayUrl;
-
-    private String payType;
-
-    private String payMsg;
-}