- 替换 CommissionRateConfig 为 CommissionConfig,支持 commissionType 字段区分固定金额和百分比模式 - 新增 calcMoneyByCommissionType 方法,根据 commissionType 计算佣金金额 - 修改 findOrderSingleGoods 为 findOrderSingleGoodsInfo,返回商品信息和数量 - 更新日志输出格式,显示商品数量和佣金类型信息 - 调整信用分销商佣金方法参数,传递商品数量和佣金配置对象 - 新增 OrderGoodsInfo 和 CommissionConfig 内部类定义 - 实现固定金额模式按件计算佣金的逻辑 - 添加安全数值处理方法 safeValue 和 safePositive - 更新佣金注释构建方法,显示佣金类型和具体数值信息
106 lines
2.7 KiB
Java
106 lines
2.7 KiB
Java
package com.gxwebsoft.credit.entity;
|
|
|
|
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.fasterxml.jackson.annotation.JsonFormat;
|
|
import io.swagger.v3.oas.annotations.media.Schema;
|
|
import lombok.Data;
|
|
import lombok.EqualsAndHashCode;
|
|
|
|
import java.io.Serializable;
|
|
import java.time.LocalDateTime;
|
|
|
|
/**
|
|
* 专利
|
|
*
|
|
* @author 科技小王子
|
|
* @since 2026-01-07 13:52:14
|
|
*/
|
|
@Data
|
|
@EqualsAndHashCode(callSuper = false)
|
|
@Schema(name = "CreditPatent对象", description = "专利")
|
|
public class CreditPatent implements Serializable {
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Schema(description = "ID")
|
|
@TableId(value = "id", type = IdType.AUTO)
|
|
private Integer id;
|
|
|
|
@Schema(description = "发明名称")
|
|
private String name;
|
|
|
|
@Schema(description = "专利类型")
|
|
private String type;
|
|
|
|
@Schema(description = "法律状态")
|
|
private String statusText;
|
|
|
|
@Schema(description = "申请号")
|
|
private String registerNo;
|
|
|
|
@Schema(description = "申请日")
|
|
private String registerDate;
|
|
|
|
@Schema(description = "公开(公告)号")
|
|
private String publicNo;
|
|
|
|
@Schema(description = "公开(公告)日期")
|
|
private String publicDate;
|
|
|
|
@Schema(description = "发明人")
|
|
private String inventor;
|
|
|
|
@Schema(description = "申请(专利权)人")
|
|
private String patentApplicant;
|
|
|
|
@Schema(description = "链接")
|
|
private String url;
|
|
|
|
@Schema(description = "是否有数据")
|
|
private Boolean hasData;
|
|
|
|
@Schema(description = "备注")
|
|
private String comments;
|
|
|
|
@Schema(description = "企业ID")
|
|
private Integer companyId;
|
|
|
|
@Schema(description = "主体企业")
|
|
@TableField(exist = false)
|
|
private String companyName;
|
|
|
|
@Schema(description = "是否推荐")
|
|
private Integer recommend;
|
|
|
|
@Schema(description = "排序(数字越小越靠前)")
|
|
private Integer sortNumber;
|
|
|
|
@Schema(description = "状态, 0正常, 1冻结")
|
|
private Integer status;
|
|
|
|
@Schema(description = "是否删除, 0否, 1是")
|
|
@TableLogic
|
|
private Integer deleted;
|
|
|
|
@Schema(description = "用户ID")
|
|
private Integer userId;
|
|
|
|
@Schema(description = "真实姓名")
|
|
@TableField(exist = false)
|
|
private String realName;
|
|
|
|
@Schema(description = "租户id")
|
|
private Integer tenantId;
|
|
|
|
@Schema(description = "创建时间")
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
private LocalDateTime createTime;
|
|
|
|
@Schema(description = "修改时间")
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
private LocalDateTime updateTime;
|
|
|
|
}
|