fix: 多余引用

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/bo/OmsOrderBO.java

@@ -1,36 +0,0 @@
-package net.yaoyi.gulop.checkout.api.bo;
-
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.entity.OmsOrder;
-import net.yaoyi.gulop.checkout.api.entity.OmsOrderItem;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * {@code OmsOrderBO} 类
- * <p>
- * 订单实体类
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString(callSuper = true)
-public class OmsOrderBO implements Serializable {
-    private static final long serialVersionUID = 449607309854199453L;
-
-    /**
-     * 订单信息
-     */
-    private OmsOrder omsOrder;
-
-    /**
-     * 订单详情
-     */
-    private List<OmsOrderItem> orderItems;
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/bo/OmsOrderBatchBO.java

@@ -1,34 +0,0 @@
-package net.yaoyi.gulop.checkout.api.bo;
-
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.entity.OmsOrderBatch;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * {@code OmsOrderBatchBO} 类
- * 订单批次实体
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString(callSuper = true)
-public class OmsOrderBatchBO implements Serializable {
-    private static final long serialVersionUID = -4299137853046041445L;
-
-    /**
-     * 订单批次
-     */
-    private OmsOrderBatch orderBatch;
-
-    /**
-     * 订单批次中的订单内容
-     */
-    private List<OmsOrderBO> orders;
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/bo/OmsOrderItemBO.java

@@ -1,136 +0,0 @@
-package net.yaoyi.gulop.checkout.api.bo;
-
-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.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Map;
-
-/**
- * {@code OrderItem} 类
- * 订单详情实体
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString(callSuper = true)
-@TableName(value = "oms_order_item", autoResultMap = true)
-public class OmsOrderItemBO implements Serializable {
-    private static final long serialVersionUID = 1477996887601731764L;
-
-    // ~======================================================================================================  order
-    /**
-     * id
-     */
-    @TableId(value = "item_id", type = IdType.AUTO)
-    public Long id;
-
-    /**
-     * 订单id
-     */
-    public Long orderId;
-
-    /**
-     * 订单号
-     */
-    private String orderNo;
-
-    // ~====================================================================================================== task
-
-    /**
-     * 任务id
-     */
-    private Long taskId;
-
-    /**
-     * 任务类型
-     */
-    @TableField(value = "task_type_name")
-    private String taskType;
-
-    /**
-     * 任务积分
-     */
-    private Long taskScore;
-
-    /**
-     * 任务内容
-     */
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private Map<String, Object> taskContent;
-
-    /**
-     * 任务数量
-     */
-    private Integer quantity;
-
-    /**
-     * 实际获得金额
-     */
-    private Long amount;
-
-    // ~====================================================================================================== project
-
-    /**
-     * 项目id
-     */
-    private Long projectId;
-
-    /**
-     * 项目名称
-     */
-    private String projectName;
-
-
-    // ~====================================================================================================== extra
-
-    /**
-     * 赠送积分
-     */
-    private Long credit;
-
-    /**
-     * 赠送成长值
-     */
-    private Long growth;
-
-    // ~====================================================================================================== 创建信息
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime modifiedTime;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createdBy;
-
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String modifiedBy;
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/constant/CheckoutCaches.java

@@ -1,18 +0,0 @@
-package net.yaoyi.gulop.checkout.api.constant;
-
-/**
- * 支付中心缓存常量类
- *
- * @author jimmy
- * @date 2022/05/11 13:35
- */
-public final class CheckoutCaches {
-
-    private CheckoutCaches() {
-    }
-
-    /**
-     * 批量订单缓存模板
-     */
-    public static final String ORDER_BATCH_TOKEN_PATTERN = "%d:order_batch:%d:token";
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/constant/CheckoutConstants.java

@@ -1,30 +0,0 @@
-package net.yaoyi.gulop.checkout.api.constant;
-
-/**
- * {@code CheckoutConstants}  类
- *  支付中心常用常量
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-public final class CheckoutConstants {
-
-    private CheckoutConstants(){}
-
-    /**
-     * 随机token长度
-     */
-    public static final int RANDOM_TOKEN_LENGTH = 6;
-
-    /**
-     * 订单token过期时间
-     */
-    public static final int ORDER_TOKEN_TTL = 3;
-
-    /**
-     * 订单结算精度，默认1分钱（RMB）
-     */
-    public static final double ORDER_AMOUNT_PRECISION = 0.01;
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/constant/enums/CheckoutState.java

@@ -1,33 +0,0 @@
-package net.yaoyi.gulop.checkout.api.constant.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * {@code CheckoutState} 类
- * 支付中心状态
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-public final class CheckoutState {
-
-    // 订单状态
-    @Getter
-    @AllArgsConstructor
-    public enum OrderState {
-
-        NEW_ONE("NEW", "待支付"),
-        IN_TRANSIT("IN_TRANSIT", "在途支付"),
-        FAILED("FAILED", "支付失败"),
-        OK("OK", "支付成功");
-
-        @EnumValue
-        private final String state;
-
-        private final String message;
-    }
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/constant/enums/CheckoutType.java

@@ -1,94 +0,0 @@
-package net.yaoyi.gulop.checkout.api.constant.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * {@code CheckoutType} 类
- * 支付类型常量枚举
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-public final class CheckoutType {
-
-    // 订单类型
-    @Getter
-    @AllArgsConstructor
-    public enum OrderType {
-
-        NORMAL("NORMAL", "普通订单");
-
-        @EnumValue
-        private final String type;
-
-        private final String message;
-
-    }
-
-    // 订单支付方式类型
-    @Getter
-    @AllArgsConstructor
-    public enum OrderPaymentType {
-
-        GULOP("GULOP", "GULOP"),
-        DING("DING", "人力家"),
-        TAX_HELPOR("TAX_HELPOR", "税邦云"),
-        OLADING("OLADING", "自由职家"),
-        YEE("YEE", "易联数科");
-
-        @EnumValue
-        private final String type;
-
-        private final String message;
-
-    }
-
-    // 订单来源类型
-    @Getter
-    @AllArgsConstructor
-    public enum OrderSourceType {
-
-        PC("PC", "PC端"),
-        APP("APP", "移动端"),
-        MP("MP", "小程序");
-
-        @EnumValue
-        private final String type;
-
-        private final String message;
-    }
-
-
-    // 打款方式
-    @Getter
-    @AllArgsConstructor
-    public enum TransferType {
-
-        BALANCE("BALANCE", "账户余额"),
-        BANK_CARD("BANK_CARD", "银行卡");
-
-        @EnumValue
-        private final String type;
-
-        private final String message;
-
-    }
-
-    // 提交端类型
-    @Getter
-    @AllArgsConstructor
-    public enum SubmitEndType {
-
-        CSO("CSO", "CSO"),
-        HCP("HCP", "HCP");
-
-        @EnumValue
-        private final String type;
-
-        private final String message;
-    }
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/dto/OmsOrderItemRequest.java

@@ -1,47 +0,0 @@
-package net.yaoyi.gulop.checkout.api.dto;
-
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 订单详情请求相关
- *
- * @author jimmy
- * @date 2022/04/26 15/47
- */
-public class OmsOrderItemRequest implements Serializable {
-    private static final long serialVersionUID = -9017827574652806694L;
-
-    /**
-     * {@code OrderItemDTO} 类
-     * <p>
-     * 订单项dto
-     *
-     * @author Hengchen.Sun
-     * @version 1.0.0
-     * @date 2022-02-27
-     * @since ver.1.0.0
-     */
-    @Data
-    @ToString
-    public static class OrderItemDTO implements Serializable {
-
-        private static final long serialVersionUID = -4103934192340866985L;
-
-
-        private Long taskId;
-
-        private Long taskScore;
-
-        private String taskContent;
-
-        private Long quantity;
-
-        private Long projectId;
-
-        private String projectName;
-
-    }
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/dto/OmsOrderRequest.java

@@ -1,235 +0,0 @@
-package net.yaoyi.gulop.checkout.api.dto;
-
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.constant.enums.CheckoutState;
-import net.yaoyi.gulop.checkout.api.constant.enums.CheckoutType;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 订单相关请求
- *
- * @author jimmy
- * @date 2022/04/26 15/44
- */
-public class OmsOrderRequest implements Serializable {
-    private static final long serialVersionUID = 193955616570220465L;
-
-    /**
-     * {@code OrderBatchSubmitParams} 类
-     * <p>
-     * 订单批量提交dto
-     *
-     * @author Hengchen.Sun
-     * @version 1.0.0
-     * @date 2022-02-27
-     * @since ver.1.0.0
-     */
-    @Data
-    @ToString
-    public static class OrderBatchSubmitParams implements Serializable {
-        private static final long serialVersionUID = 5866003526004279799L;
-
-        /**
-         * 批量号
-         */
-        @NotBlank(message = "批量号必填")
-        private String batchNo;
-
-        /**
-         * 订单提交信息
-         */
-        private List<OrderSubmitParams> orderSubmits;
-
-        /**
-         * 订单数
-         */
-        @NotNull(message = "订单数必填")
-        @Min(value = 1, message = "至少需要一个订单")
-        private Long orderQuantity;
-
-        /**
-         * 支付人数
-         */
-        @NotNull(message = "支付人数必填")
-        @Min(value = 1, message = "至少需要支付一人")
-        private Long payeeQuantity;
-
-        /**
-         * 防重令牌
-         **/
-        @NotBlank(message = "防重令牌必填")
-        private String orderToken;
-
-        /**
-         * 批量应付总数
-         **/
-        @NotNull(message = "批量应付总额必填")
-        @Min(value = 1, message = "批量支付金额必须大于0元")
-        private Long batchAmountPayable;
-
-
-        /**
-         * 操作端
-         */
-        @NotNull(message = "操作端必填")
-        private CheckoutType.SubmitEndType endType;
-
-        /**
-         * 订单备注
-         **/
-        private String remarks;
-    }
-
-    /**
-     * {@code OmsOrderRequest.OrderSubmitParams} 类
-     * <p>
-     * 订单提交dto
-     *
-     * @author Hengchen.Sun
-     * @version 1.0.0
-     * @date 2022-02-27
-     * @since ver.1.0.0
-     */
-    @Data
-    @ToString
-    public static class OrderSubmitParams implements Serializable {
-        private static final long serialVersionUID = 5866003526004279799L;
-
-        /**
-         * 用户id
-         **/
-        @NotNull(message = "收款人id必填")
-        private Long payeeId;
-
-        /**
-         * 订单来源
-         */
-        @NotNull(message = "订单来源必填")
-        private CheckoutType.OrderSourceType sourceType;
-
-        /**
-         * 支付方式
-         **/
-        @NotNull(message = "支付方式必填")
-        private CheckoutType.OrderPaymentType paymentType;
-
-        /**
-         * 打款方式
-         */
-        @NotNull(message = "打款方式必填")
-        private CheckoutType.TransferType transferType;
-
-        /**
-         * 库存编号
-         */
-        private List<String> wareSn;
-
-        /**
-         * 订单应付价格
-         **/
-        @NotNull(message = "订单应付价格必填")
-        private Long amountPayable;
-
-        /**
-         * 发票类目
-         */
-        @NotBlank(message = "发票类目必填")
-        private String receiptCategoryName;
-
-        /**
-         * 结算比例
-         */
-        @NotBlank(message = "结算比例必填")
-        private String settlementRatio;
-
-        /**
-         * 订单备注
-         **/
-        private String remarks;
-    }
-
-    /**
-     * {@code OmsOrderRequest.PageParams}
-     * <p>
-     * 分页查询参数
-     *
-     * @author Hengchen.Sun
-     * @version 1.0.0
-     * @date 2022/03/01 18:27
-     */
-    @Data
-    @ToString
-    public static class PageParams implements Serializable {
-
-        private static final long serialVersionUID = 9135224969049161749L;
-
-        /**
-         * 收款人姓名
-         */
-        private String payeeName;
-
-        /**
-         * 收款人身份证号
-         */
-        private String payeeIdCard;
-
-        /**
-         * 订单状态
-         */
-        private CheckoutState.OrderState orderState;
-
-        /**
-         * 订单批次号
-         */
-        private String orderBatchNo;
-
-        /**
-         * 订单开始时间
-         */
-        private LocalDateTime orderStartTime;
-
-        /**
-         * 订单结束时间
-         */
-        private LocalDateTime orderEndTime;
-
-        /**
-         * 代征主体
-         */
-        private CheckoutType.OrderPaymentType paymentType;
-
-        /**
-         * 付款方式
-         */
-        private CheckoutType.TransferType transferType;
-
-        /**
-         * 订单号
-         */
-        private String orderNo;
-
-        /**
-         * 商户备注
-         */
-        private String orderRemark;
-
-        /**
-         * 订单项目号
-         */
-        private String orderProjectId;
-
-        /**
-         * 订单项目名称
-         */
-        private String orderProjectName;
-
-    }
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/entity/OmsOrder.java

@@ -1,260 +0,0 @@
-package net.yaoyi.gulop.checkout.api.entity;
-
-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.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.constant.enums.CheckoutType;
-import net.yaoyi.gulop.checkout.api.constant.enums.CheckoutState;
-import net.yaoyi.gulop.common.core.constant.enums.CommonFlag;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * {@code OmsOrder} 类
- * <p>
- * 订单实体类
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString(callSuper = true)
-@TableName(value = "oms_order")
-public class OmsOrder implements Serializable {
-    private static final long serialVersionUID = 449607309854199453L;
-
-    // ~================================================================================================ base info
-
-    /**
-     * id
-     */
-    @TableId(value = "order_id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 订单号
-     */
-    private String orderSn;
-
-    /**
-     * 订单批次id
-     */
-    @TableField(value = "batch_id")
-    private Long batchId;
-
-    /**
-     * 订单批次号
-     */
-    @TableField(exist = false)
-    private String batchNo;
-
-    /**
-     * 项目编号
-     */
-    @TableField(exist = false)
-    private String projectId;
-
-    /**
-     * 项目名称
-     */
-    @TableField(exist = false)
-    private String projectName;
-
-    /**
-     * 订单总额（会员应收金额）
-     */
-    private Long recAmount;
-
-    /**
-     * 应付总额（包含：会员实收和平台服务费两部分）
-     */
-    private Long payAmount;
-
-    /**
-     * 结算比例
-     */
-    private String settlementRatio;
-
-    /**
-     * 订单来源[0->PC订单(企业支付到个人)；1->app订单（个人提现）]
-     */
-    private CheckoutType.OrderSourceType sourceType;
-
-    /**
-     * 订单状态【0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单】
-     */
-    @TableField(value = "order_state")
-    private CheckoutState.OrderState state;
-
-    /**
-     * 可操作性标记：0->正常，1->锁定 9->删除
-     */
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private CommonFlag.OptFlag optFlag;
-
-    /**
-     * 订单备注
-     */
-    private String remarks;
-
-    /**
-     * 商家备注
-     */
-    @TableField(exist = false)
-    private String batchRemarks;
-
-    // ~=============================================================================================== platform rate
-
-    /**
-     * 服务费率
-     */
-    private Long serviceRate;
-
-    /**
-     * 服务费
-     */
-    private Long serviceCharge;
-
-
-    // ~================================================================================================ discount
-
-    /**
-     * 使用的优惠券
-     */
-    private Long couponId;
-
-    /**
-     * 优惠券抵扣金额
-     */
-    private Long couponAmount;
-
-    /**
-     * 促销优化金额（促销价、满减、阶梯价）
-     */
-    private Long promotionAmount;
-
-    /**
-     * 下单时使用的积分
-     */
-    private Long creditCost;
-
-    /**
-     * 积分抵扣金额
-     */
-    private Long creditAmount;
-
-    /**
-     * 后台调整订单使用的折扣金额
-     */
-    private Long discountAmount;
-
-    // ~================================================================================================ gig
-
-    /**
-     * 支付方式【0 -> gulop; 1->人力家；2->税邦云；3->自由职家；4->易联数科；】
-     */
-    private CheckoutType.OrderPaymentType paymentType;
-
-    // ~================================================================================================= growth
-
-    /**
-     * 可以获得的积分
-     */
-    private Long credit;
-
-    /**
-     * 可以获得的成长值
-     */
-    private Long growth;
-
-    // ~================================================================================================== receipt
-
-    /**
-     * 发票类目
-     */
-    @TableField(value = "receipt_cate_name")
-    private String receiptCategoryName;
-
-    // ~=================================================================================================== member
-
-    /**
-     * 会员id
-     */
-    private Long payeeId;
-
-    /**
-     * 收款会员名称
-     */
-    private String payeeName;
-
-    /**
-     * 收款联系方式
-     */
-    private String payeePhone;
-
-    /**
-     * 身份证号
-     */
-    private String payeeIdCard;
-
-    /**
-     * 打款方式
-     */
-    private CheckoutType.TransferType transferType;
-
-    /**
-     * 收款人账户
-     */
-    private String payeeAccount;
-
-    // ~===================================================================================================== datetime
-
-    /**
-     * 发送到结算服务时间
-     */
-    private LocalDateTime paymentTime;
-
-    /**
-     * 妥投时间（回调）
-     */
-    private LocalDateTime deliveredTime;
-
-    // ~====================================================================================================== 创建信息
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime modifiedTime;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createdBy;
-
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String modifiedBy;
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/entity/OmsOrderBatch.java

@@ -1,96 +0,0 @@
-package net.yaoyi.gulop.checkout.api.entity;
-
-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.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.constant.enums.CheckoutType;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * {@code OrderBatch} 类
- * 订单批次实体
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString(callSuper = true)
-@TableName(value = "oms_order_batch")
-public class OmsOrderBatch implements Serializable {
-    private static final long serialVersionUID = -4299137853046041445L;
-
-    /**
-     * id
-     */
-    @TableId(value = "batch_id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 订单批次编号
-     */
-    private String batchNo;
-
-    /**
-     * 提交端类型
-     */
-    private CheckoutType.SubmitEndType endType;
-
-    /**
-     * 订单数
-     */
-    private Integer orderQuantity;
-
-    /**
-     * 支付人数
-     */
-    private Integer payeeQuantity;
-
-    /**
-     * 批量应付总数
-     **/
-    private Long batchAmountPayable;
-
-    /**
-     * 订单批次备注
-     */
-    public String remarks;
-
-    // ~====================================================================================================== 创建信息
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime modifiedTime;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createdBy;
-
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String modifiedBy;
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/entity/OmsOrderItem.java

@@ -1,136 +0,0 @@
-package net.yaoyi.gulop.checkout.api.entity;
-
-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.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Map;
-
-/**
- * {@code OrderItem} 类
- * 订单详情实体
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString(callSuper = true)
-@TableName(value = "oms_order_item", autoResultMap = true)
-public class OmsOrderItem implements Serializable {
-    private static final long serialVersionUID = 1477996887601731764L;
-
-    // ~======================================================================================================  order
-    /**
-     * id
-     */
-    @TableId(value = "item_id", type = IdType.AUTO)
-    public Long id;
-
-    /**
-     * 订单id
-     */
-    public Long orderId;
-
-    /**
-     * 订单号
-     */
-    private String orderNo;
-
-    // ~====================================================================================================== task
-
-    /**
-     * 任务id
-     */
-    private Long taskId;
-
-    /**
-     * 任务类型
-     */
-    @TableField(value = "task_type_name")
-    private String taskType;
-
-    /**
-     * 任务积分
-     */
-    private Long taskScore;
-
-    /**
-     * 任务内容
-     */
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private Map<String, Object> taskContent;
-
-    /**
-     * 任务数量
-     */
-    private Long quantity;
-
-    /**
-     * 实际获得金额
-     */
-    private Long amount;
-
-    // ~====================================================================================================== project
-
-    /**
-     * 项目id
-     */
-    private Long projectId;
-
-    /**
-     * 项目名称
-     */
-    private String projectName;
-
-
-    // ~====================================================================================================== extra
-
-    /**
-     * 赠送积分
-     */
-    private Long credit;
-
-    /**
-     * 赠送成长值
-     */
-    private Long growth;
-
-    // ~====================================================================================================== 创建信息
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime modifiedTime;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createdBy;
-
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String modifiedBy;
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/feign/RemoteCheckoutService.java

@@ -1,22 +0,0 @@
-package net.yaoyi.gulop.checkout.api.feign;
-
-import net.yaoyi.gulop.common.core.constant.ServiceNameConstants;
-
-import org.springframework.cloud.openfeign.FeignClient;
-
-
-
-/**
- * {@code remoteCheckoutService}
- * <p>
- * 收银台远端接口
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2021/11/22 13:15
- */
-@FeignClient(contextId = "remoteCheckoutService", value = ServiceNameConstants.CHECKOUT_SERVICE)
-public interface RemoteCheckoutService {
-
-
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/vo/OmsOrderBatchSubmitRespVO.java

@@ -1,38 +0,0 @@
-package net.yaoyi.gulop.checkout.api.vo;
-
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.bo.OmsOrderBO;
-import net.yaoyi.gulop.checkout.api.bo.OmsOrderBatchBO;
-import net.yaoyi.gulop.checkout.api.entity.OmsOrder;
-import net.yaoyi.gulop.checkout.api.entity.OmsOrderBatch;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * {@code OmsOrderBatchSubmitRespVO} 类
- *
- *  批量提交订单响应vo
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022-02-27
- * @since ver.1.0.0
- */
-@Data
-@ToString
-public class OmsOrderBatchSubmitRespVO implements Serializable {
-
-    private static final long serialVersionUID = 6579521472078974568L;
-
-    /**
-     * 订单批次
-     */
-    private OmsOrderBatch orderBatch;
-
-    /**
-     * 订单批次中的订单内容
-     */
-    private List<OmsOrderBO> orders;
-}

hnqz-upms/hnqz-upms-api/src/main/java/net/yaoyi/gulop/checkout/api/vo/OrderConditionQueryResponseVO.java

@@ -1,67 +0,0 @@
-package net.yaoyi.gulop.checkout.api.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Data;
-import lombok.ToString;
-import net.yaoyi.gulop.checkout.api.entity.OmsOrder;
-import net.yaoyi.gulop.common.data.resolver.GulopPageResolver;
-
-import java.io.Serializable;
-
-/**
- * {@code OrderConditionQueryResponseVO}
- * <p>
- * 订单条件查询结果vo
- *
- * @author Hengchen.Sun
- * @version 1.0.0
- * @date 2022/03/02 15:37
- */
-@Data
-@ToString
-public class OrderConditionQueryResponseVO implements Serializable {
-    private static final long serialVersionUID = 1699707623462861913L;
-
-    public OrderConditionQueryResponseVO() {
-        this.amount = 0L;
-        this.amountPaid = 0L;
-        this.amountInTransit = 0L;
-        this.amountCharge = 0L;
-        this.amountFailed = 0L;
-    }
-
-    /**
-     * 付款金额发起
-     */
-    private Long amount;
-
-    /**
-     * 服务费
-     */
-    private Long amountCharge;
-
-    /**
-     * 在途支付
-     */
-    private Long amountInTransit;
-
-    /**
-     * 付款成功
-     */
-    private Long amountPaid;
-
-    /**
-     * 付款失败
-     */
-    private Long amountFailed;
-
-    /**
-     * 分页信息
-     */
-    private GulopPageResolver<OmsOrder> page;
-
-    public void setPage(Page<OmsOrder> p){
-        page = GulopPageResolver.of(p);
-    }
-
-}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -39,8 +39,6 @@ import com.qunzhixinxi.hnqz.common.taxhelper.enums.TaxHelperCertStatus;
 import com.qunzhixinxi.hnqz.common.taxhelper.service.TaxHelperService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.yaoyi.gulop.checkout.api.constant.enums.CheckoutType;
-import net.yaoyi.gulop.checkout.api.dto.OmsOrderRequest;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;