Merge remote-tracking branch 'origin/master' into dev

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/Price.java

@@ -16,9 +16,11 @@
  */
 package org.springblade.mocha.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -84,11 +86,6 @@ public class Price implements Serializable {
 		@ApiModelProperty(value = "版本")
 		private String version;
 	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
 	* 创建人
 	*/
 		@ApiModelProperty(value = "创建人")
@@ -123,6 +120,30 @@ public class Price implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
+	/**
+	 * 租户id
+	 */
+		@ApiModelProperty(value = "租户id")
+		private String tenantId;
+	/**
+	 * 创建人中文名
+	 */
+		@ApiModelProperty(value = "创建人中文名")
+		@TableField(exist = false)
+		private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+		@ApiModelProperty(value = "修改人中文名")
+		@TableField(exist = false)
+		private String updateUserName;
+
+	/**
+	 * 销售政策明细信息
+	 */
+		@ApiModelProperty(value = "销售政策明细信息")
+		@TableField(exist = false)
+		private List<PriceItem> priceItemList;
 
 
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/SalesPolicy.java

@@ -16,9 +16,11 @@
  */
 package org.springblade.mocha.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -79,16 +81,16 @@ public class SalesPolicy implements Serializable {
 		@ApiModelProperty(value = "备注")
 		private String remarks;
 	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
 	 * 租户id
 	 */
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
 	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
 	* 创建人
 	*/
 		@ApiModelProperty(value = "创建人")
@@ -123,6 +125,35 @@ public class SalesPolicy implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
+	/**
+	 * 代理商
+	 */
+		@ApiModelProperty(value = "代理商")
+		private String corps;
+	/**
+	 * 创建人中文名
+	 */
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+		private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+		private String updateUserName;
+	/**
+	 * 特价销售政策明细信息
+	 */
+	@ApiModelProperty(value = "特价销售政策明细信息")
+	@TableField(exist = false)
+	private List<SalesPolicyItem> specialItemList;
+	/**
+	 * 买赠销售政策明细信息
+	 */
+	@ApiModelProperty(value = "买赠政策明细信息")
+	@TableField(exist = false)
+	private List<SalesPolicyItem> presentItemList;
 
 
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/SalesPolicyItem.java

@@ -17,6 +17,8 @@
 package org.springblade.mocha.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -100,16 +102,16 @@ public class SalesPolicyItem implements Serializable {
 		@ApiModelProperty(value = "备注")
 		private String remarks;
 	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
 	 * 租户id
 	 */
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
 	/**
+	* 版本
+	*/
+		@ApiModelProperty(value = "版本")
+		private String version;
+	/**
 	* 创建人
 	*/
 		@ApiModelProperty(value = "创建人")
@@ -145,6 +147,18 @@ public class SalesPolicyItem implements Serializable {
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
 	/**
+	 * 创建人中文名
+	 */
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+		private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+		private String updateUserName;
+	/**
 	 * 销售政策类别 1特价促销 2买赠促销
 	 */
 	@ApiModelProperty(value = "销售政策类别 1特价促销 2买赠促销")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -17,9 +17,13 @@
 package org.springblade.purchase.sales.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -384,6 +388,43 @@ public class Order implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
+	/**
+	 * 订单费用信息
+	 */
+		@ApiModelProperty(value = "订单费用信息")
+		@TableField(exist = false)
+		private List<OrderFees> orderFeesList;
+	/**
+	 * 订单文件
+	 */
+		@ApiModelProperty(value = "订单文件")
+		@TableField(exist = false)
+		private List<OrderFiles> orderFilesList;
+	/**
+	 * 订单明细
+	 */
+		@ApiModelProperty(value = "订单明细")
+		@TableField(exist = false)
+		private List<OrderItems> orderItemsList;
+	/**
+	 * 订单修改日志
+	 */
+		@ApiModelProperty(value = "订单修改日志")
+		@TableField(exist = false)
+		private List<OrderModify> orderModifyList;
+	/**
+	 * 创建人中文名
+	 */
+		@ApiModelProperty(value = "创建人中文名")
+		@TableField(exist = false)
+		private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+		@ApiModelProperty(value = "修改人中文名")
+		@TableField(exist = false)
+		private String updateUserName;
+
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderFees.java

@@ -17,7 +17,10 @@
 package org.springblade.purchase.sales.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -154,6 +157,24 @@ public class OrderFees implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
+	/**
+	 * 费用编码
+	 */
+		@ApiModelProperty(value = "费用编码")
+		@TableField(exist = false)
+		private String code;
+	/**
+	 * 费用名称
+	 */
+		@ApiModelProperty(value = "费用名称")
+		@TableField(exist = false)
+		private String feeName;
+	/**
+	 * 支付方名称
+	 */
+		@ApiModelProperty(value = "支付方名称")
+		@TableField(exist = false)
+		private String corpName;
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderFiles.java

@@ -17,6 +17,7 @@
 package org.springblade.purchase.sales.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -17,6 +17,8 @@
 package org.springblade.purchase.sales.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -55,11 +57,16 @@ public class OrderItems implements Serializable {
 		@ApiModelProperty(value = "排序")
 		private Integer sort;
 	/**
-	* 价格类别(销售政策 秒杀)
+	* 类别(销售政策 秒杀)
 	*/
-		@ApiModelProperty(value = "价格类别(销售政策 秒杀)")
+		@ApiModelProperty(value = "类别(销售政策 秒杀)")
 		private String priceCategory;
 	/**
+	 * 价格类别
+	 */
+	@ApiModelProperty(value = "价格类别")
+	private String priceType;
+	/**
 	* 货物id
 	*/
 		@ApiModelProperty(value = "货物id")
@@ -234,6 +241,28 @@ public class OrderItems implements Serializable {
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
-
-
+	/**
+	 * 商品编码
+	 */
+		@ApiModelProperty(value = "商品编码")
+		@TableField(exist = false)
+		private String code;
+	/**
+	 * 商品名称
+	 */
+		@ApiModelProperty(value = "商品名称")
+		@TableField(exist = false)
+		private String cname;
+	/**
+	 * 规格编码
+	 */
+		@ApiModelProperty(value = "规格编码")
+		@TableField(exist = false)
+		private String typeno;
+	/**
+	 * 规格型号
+	 */
+		@ApiModelProperty(value = "规格型号")
+		@TableField(exist = false)
+		private String specificationAndModel;
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/entity/Price.java

@@ -1,149 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.mocha.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 价格管理表实体类
- *
- * @author BladeX
- * @since 2021-10-14
- */
-@Data
-@TableName("basic_price")
-@ApiModel(value = "Price对象", description = "价格管理表")
-public class Price implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 大字
-	*/
-		@ApiModelProperty(value = "大字")
-		private String bigCharacter;
-	/**
-	* 品牌
-	*/
-		@ApiModelProperty(value = "品牌")
-		private String brand;
-	/**
-	* 花纹
-	*/
-		@ApiModelProperty(value = "花纹")
-		private String brandItem;
-	/**
-	* 规格
-	*/
-		@ApiModelProperty(value = "规格")
-		private String typeno;
-	/**
-	* 产品类别
-	*/
-		@ApiModelProperty(value = "产品类别")
-		private String category;
-	/**
-	* 产品分类
-	*/
-		@ApiModelProperty(value = "产品分类")
-		private String productCategory;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	 * 创建人中文名
-	 */
-		@ApiModelProperty(value = "创建人中文名")
-		@TableField(exist = false)
-		private String createUserName;
-	/**
-	 * 修改人中文名
-	 */
-		@ApiModelProperty(value = "修改人中文名")
-		@TableField(exist = false)
-		private String updateUserName;
-
-	/**
-	 * 销售政策明细信息
-	 */
-		@ApiModelProperty(value = "销售政策明细信息")
-		@TableField(exist = false)
-		private List<PriceItem> priceItemList;
-
-
-}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/entity/PriceItem.java

@@ -1,154 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.mocha.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 价格管理明细表实体类
- *
- * @author BladeX
- * @since 2021-10-14
- */
-@Data
-@TableName("basic_price_item")
-@ApiModel(value = "PriceItem对象", description = "价格管理明细表")
-public class PriceItem implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
-	/**
-	* 编码
-	*/
-		@ApiModelProperty(value = "编码")
-		private String code;
-	/**
-	* 大字
-	*/
-		@ApiModelProperty(value = "大字")
-		private String bigCharacter;
-	/**
-	* 品牌
-	*/
-		@ApiModelProperty(value = "品牌")
-		private String brand;
-	/**
-	* 花纹
-	*/
-		@ApiModelProperty(value = "花纹")
-		private String brandItem;
-	/**
-	* 规格
-	*/
-		@ApiModelProperty(value = "规格")
-		private String typeno;
-	/**
-	* 产品类别
-	*/
-		@ApiModelProperty(value = "产品类别")
-		private String category;
-	/**
-	* 产品分类
-	*/
-		@ApiModelProperty(value = "产品分类")
-		private String productCategory;
-	/**
-	* 供应商编码
-	*/
-		@ApiModelProperty(value = "供应商编码")
-		private String corpCode;
-	/**
-	* 采购价
-	*/
-		@ApiModelProperty(value = "采购价")
-		private BigDecimal purchasePrice;
-	/**
-	* 销售价
-	*/
-		@ApiModelProperty(value = "销售价")
-		private BigDecimal salesPrice;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-
-
-}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/entity/SalesPolicy.java

@@ -1,159 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.mocha.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 销售政策表实体类
- *
- * @author BladeX
- * @since 2021-10-14
- */
-@Data
-@TableName("basic_sales_policy")
-@ApiModel(value = "SalesPolicy对象", description = "销售政策表")
-public class SalesPolicy implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 编码
-	*/
-		@ApiModelProperty(value = "编码")
-		private String code;
-	/**
-	* 品牌
-	*/
-		@ApiModelProperty(value = "品牌")
-		private String brand;
-	/**
-	* 产品分类
-	*/
-		@ApiModelProperty(value = "产品分类")
-		private String productCategory;
-	/**
-	* 政策名称
-	*/
-		@ApiModelProperty(value = "政策名称")
-		private String cname;
-	/**
-	* 有效期开始时间
-	*/
-		@ApiModelProperty(value = "有效期开始时间")
-		private Date startTime;
-	/**
-	* 有效期结束时间
-	*/
-		@ApiModelProperty(value = "有效期结束时间")
-		private Date endTime;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	 * 代理商
-	 */
-		@ApiModelProperty(value = "代理商")
-		private String corps;
-	/**
-	 * 创建人中文名
-	 */
-	@ApiModelProperty(value = "创建人中文名")
-	@TableField(exist = false)
-		private String createUserName;
-	/**
-	 * 修改人中文名
-	 */
-	@ApiModelProperty(value = "修改人中文名")
-	@TableField(exist = false)
-		private String updateUserName;
-	/**
-	 * 特价销售政策明细信息
-	 */
-	@ApiModelProperty(value = "特价销售政策明细信息")
-	@TableField(exist = false)
-	private List<SalesPolicyItem> specialItemList;
-	/**
-	 * 买赠销售政策明细信息
-	 */
-	@ApiModelProperty(value = "买赠政策明细信息")
-	@TableField(exist = false)
-	private List<SalesPolicyItem> presentItemList;
-
-
-}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/entity/SalesPolicyItem.java

@@ -1,168 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.mocha.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 销售政策明细表实体类
- *
- * @author BladeX
- * @since 2021-10-14
- */
-@Data
-@TableName("basic_sales_policy_item")
-@ApiModel(value = "SalesPolicyItem对象", description = "销售政策明细表")
-public class SalesPolicyItem implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
-	/**
-	* 编码
-	*/
-		@ApiModelProperty(value = "编码")
-		private String code;
-	/**
-	* 品牌
-	*/
-		@ApiModelProperty(value = "品牌")
-		private String brand;
-	/**
-	* 产品分类
-	*/
-		@ApiModelProperty(value = "产品分类")
-		private String productCategory;
-	/**
-	* 规格
-	*/
-		@ApiModelProperty(value = "规格")
-		private String typeno;
-	/**
-	* 采购价
-	*/
-		@ApiModelProperty(value = "采购价")
-		private BigDecimal purchasePrice;
-	/**
-	* 销售价
-	*/
-		@ApiModelProperty(value = "销售价")
-		private BigDecimal salesPrice;
-	/**
-	* 特价
-	*/
-		@ApiModelProperty(value = "特价")
-		private BigDecimal specialOffer;
-	/**
-	* 采购数量
-	*/
-		@ApiModelProperty(value = "采购数量")
-		private BigDecimal purchaseAmount;
-	/**
-	* 赠送数量
-	*/
-		@ApiModelProperty(value = "赠送数量")
-		private BigDecimal salesVolume;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	 * 创建人中文名
-	 */
-	@ApiModelProperty(value = "创建人中文名")
-	@TableField(exist = false)
-		private String createUserName;
-	/**
-	 * 修改人中文名
-	 */
-	@ApiModelProperty(value = "修改人中文名")
-	@TableField(exist = false)
-		private String updateUserName;
-	/**
-	 * 销售政策类别 1特价促销 2买赠促销
-	 */
-	@ApiModelProperty(value = "销售政策类别 1特价促销 2买赠促销")
-	private String salesType;
-
-
-}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -1,430 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.purchase.sales.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 销售或采购订单表实体类
- *
- * @author BladeX
- * @since 2021-09-26
- */
-@Data
-@TableName("business_order")
-@ApiModel(value = "Order对象", description = "销售或采购订单表")
-public class Order implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 系统编号
-	*/
-		@ApiModelProperty(value = "系统编号")
-		private String sysNo;
-	/**
-	* 订单号
-	*/
-		@ApiModelProperty(value = "订单号")
-		private String orderNo;
-	/**
-	* 主订单号
-	*/
-		@ApiModelProperty(value = "主订单号")
-		private String morderNo;
-	/**
-	* 原始订单号
-	*/
-		@ApiModelProperty(value = "原始订单号")
-		private String orgOrderNo;
-	/**
-	* 来源订单号
-	*/
-		@ApiModelProperty(value = "来源订单号")
-		private String srcOrderNo;
-	/**
-	* 来源id
-	*/
-		@ApiModelProperty(value = "来源id")
-		private Long srcId;
-	/**
-	* 订单类型 销售订单 XS 采购订单 CG
-	*/
-		@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
-		private String billType;
-	/**
-	* 合同类型
-	*/
-		@ApiModelProperty(value = "合同类型")
-		private String orderType;
-	/**
-	* 订单日期
-	*/
-		@ApiModelProperty(value = "订单日期")
-		private Date businesDate;
-	/**
-	* 客户或供应商id(全称)
-	*/
-		@ApiModelProperty(value = "客户或供应商id(全称)")
-		private Long corpId;
-	/**
-	* 采购商id
-	*/
-		@ApiModelProperty(value = "采购商id")
-		private Long purchaserId;
-	/**
-	* 仓库id
-	*/
-		@ApiModelProperty(value = "仓库id")
-		private Long storageId;
-	/**
-	* 发货地址
-	*/
-		@ApiModelProperty(value = "发货地址")
-		private String shippingAddress;
-	/**
-	* 到货地址
-	*/
-		@ApiModelProperty(value = "到货地址")
-		private String arrivalAddress;
-	/**
-	* 包装要求
-	*/
-		@ApiModelProperty(value = "包装要求")
-		private String packageRemarks;
-	/**
-	* 运费要求
-	*/
-		@ApiModelProperty(value = "运费要求")
-		private String freightRemarks;
-	/**
-	* 银行信息
-	*/
-		@ApiModelProperty(value = "银行信息")
-		private String banks;
-	/**
-	* 公司户头
-	*/
-		@ApiModelProperty(value = "公司户头")
-		private String banksAccountName;
-	/**
-	* 要求发货日期
-	*/
-		@ApiModelProperty(value = "要求发货日期")
-		private Date requiredDeliveryDate;
-	/**
-	* 要求到货日期
-	*/
-		@ApiModelProperty(value = "要求到货日期")
-		private Date requiredArrivalDate;
-	/**
-	* 订单备注
-	*/
-		@ApiModelProperty(value = "订单备注")
-		private String orderRemark;
-	/**
-	* 订单金额(合同金额)
-	*/
-		@ApiModelProperty(value = "订单金额(合同金额)")
-		private BigDecimal orderAmount;
-	/**
-	* 其他费用
-	*/
-		@ApiModelProperty(value = "其他费用")
-		private BigDecimal otherAmount;
-	/**
-	* 应收账款
-	*/
-		@ApiModelProperty(value = "应收账款")
-		private BigDecimal debitAmount;
-	/**
-	* 已收账款
-	*/
-		@ApiModelProperty(value = "已收账款")
-		private BigDecimal settlmentAmount;
-	/**
-	* 未收账款
-	*/
-		@ApiModelProperty(value = "未收账款")
-		private BigDecimal balanceAmount;
-	/**
-	* 付款方式
-	*/
-		@ApiModelProperty(value = "付款方式")
-		private String paymentType;
-	/**
-	* 信用证到期日(付款方式开证,必须输入)
-	*/
-		@ApiModelProperty(value = "信用证到期日(付款方式开证,必须输入)")
-		private Date creditDate;
-	/**
-	* 预(收)付款
-	*/
-		@ApiModelProperty(value = "预(收)付款")
-		private BigDecimal advancePayment;
-	/**
-	* 溢付款
-	*/
-		@ApiModelProperty(value = "溢付款")
-		private BigDecimal overPayment;
-	/**
-	* 保证金
-	*/
-		@ApiModelProperty(value = "保证金")
-		private BigDecimal deposit;
-	/**
-	* 逾期款
-	*/
-		@ApiModelProperty(value = "逾期款")
-		private BigDecimal overDueAccounts;
-	/**
-	* 预收款日期
-	*/
-		@ApiModelProperty(value = "预收款日期")
-		private Date advanceCollectionDate;
-	/**
-	* 应收(付)款日期
-	*/
-		@ApiModelProperty(value = "应收(付)款日期")
-		private Date accountsCollectionDate;
-	/**
-	* 毛利率
-	*/
-		@ApiModelProperty(value = "毛利率")
-		private BigDecimal grossProfitRate;
-	/**
-	* 毛利润
-	*/
-		@ApiModelProperty(value = "毛利润")
-		private BigDecimal grossProfit;
-	/**
-	* 所属公司id(全称)销售公司
-	*/
-		@ApiModelProperty(value = "所属公司id(全称)销售公司")
-		private Long belongToCorpId;
-	/**
-	* 历史平均运费
-	*/
-		@ApiModelProperty(value = "历史平均运费")
-		private BigDecimal freightAmountHistory;
-	/**
-	* 实际发货日期
-	*/
-		@ApiModelProperty(value = "实际发货日期")
-		private Date actualDeliveryDate;
-	/**
-	* 实际到货日期
-	*/
-		@ApiModelProperty(value = "实际到货日期")
-		private Date arrivalDate;
-	/**
-	* 采购方式
-	*/
-		@ApiModelProperty(value = "采购方式")
-		private String procurementMethod;
-	/**
-	* 入库金额
-	*/
-		@ApiModelProperty(value = "入库金额")
-		private BigDecimal storageAmount;
-	/**
-	* 采购金额
-	*/
-		@ApiModelProperty(value = "采购金额")
-		private BigDecimal purchaseAmount;
-	/**
-	* 入库数量
-	*/
-		@ApiModelProperty(value = "入库数量")
-		private BigDecimal storageQuantity;
-	/**
-	* 采购数量
-	*/
-		@ApiModelProperty(value = "采购数量")
-		private BigDecimal purchaseQuantity;
-	/**
-	* 积分倍数
-	*/
-		@ApiModelProperty(value = "积分倍数")
-		private BigDecimal pointMutiple;
-	/**
-	* 特别提醒
-	*/
-		@ApiModelProperty(value = "特别提醒")
-		private String specialRemarks;
-	/**
-	* 业务员
-	*/
-		@ApiModelProperty(value = "业务员")
-		private String salesName;
-	/**
-	* 提成标准
-	*/
-		@ApiModelProperty(value = "提成标准")
-		private String commissionRate;
-	/**
-	* 销售单价
-	*/
-		@ApiModelProperty(value = "销售单价")
-		private BigDecimal salesPrice;
-	/**
-	* 发票重量
-	*/
-		@ApiModelProperty(value = "发票重量")
-		private BigDecimal invoiceWeight;
-	/**
-	* 码单重量
-	*/
-		@ApiModelProperty(value = "码单重量")
-		private BigDecimal billWeight;
-	/**
-	* 币别
-	*/
-		@ApiModelProperty(value = "币别")
-		private String currency;
-	/**
-	* 汇率
-	*/
-		@ApiModelProperty(value = "汇率")
-		private BigDecimal exchangeRate;
-	/**
-	* 计划交货日期
-	*/
-		@ApiModelProperty(value = "计划交货日期")
-		private Date plannedDeliveryDate;
-	/**
-	* 形式发票
-	*/
-		@ApiModelProperty(value = "形式发票")
-		private String proformInvoice;
-	/**
-	* 装货港
-	*/
-		@ApiModelProperty(value = "装货港")
-		private String portOfLoad;
-	/**
-	* 目的港
-	*/
-		@ApiModelProperty(value = "目的港")
-		private String portOfDestination;
-	/**
-	* 海运费
-	*/
-		@ApiModelProperty(value = "海运费")
-		private BigDecimal oceanFreight;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	 * 订单费用信息
-	 */
-		@ApiModelProperty(value = "订单费用信息")
-		@TableField(exist = false)
-		private List<OrderFees> orderFeesList;
-	/**
-	 * 订单文件
-	 */
-		@ApiModelProperty(value = "订单文件")
-		@TableField(exist = false)
-		private List<OrderFiles> orderFilesList;
-	/**
-	 * 订单明细
-	 */
-		@ApiModelProperty(value = "订单明细")
-		@TableField(exist = false)
-		private List<OrderItems> orderItemsList;
-	/**
-	 * 订单修改日志
-	 */
-		@ApiModelProperty(value = "订单修改日志")
-		@TableField(exist = false)
-		private List<OrderModify> orderModifyList;
-	/**
-	 * 创建人中文名
-	 */
-		@ApiModelProperty(value = "创建人中文名")
-		@TableField(exist = false)
-		private String createUserName;
-	/**
-	 * 修改人中文名
-	 */
-		@ApiModelProperty(value = "修改人中文名")
-		@TableField(exist = false)
-		private String updateUserName;
-
-
-
-}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entity/OrderFees.java

@@ -1,180 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.purchase.sales.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 订单费用明细表实体类
- *
- * @author BladeX
- * @since 2021-09-26
- */
-@Data
-@TableName("business_order_fees")
-@ApiModel(value = "OrderFees对象", description = "订单费用明细表")
-public class OrderFees implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
-	/**
-	* 排序
-	*/
-		@ApiModelProperty(value = "排序")
-		private Integer sort;
-	/**
-	* 费用id
-	*/
-		@ApiModelProperty(value = "费用id")
-		private Long itemId;
-	/**
-	* 客户id
-	*/
-		@ApiModelProperty(value = "客户id")
-		private Long corpId;
-	/**
-	* 数量
-	*/
-		@ApiModelProperty(value = "数量")
-		private BigDecimal quantity;
-	/**
-	* 计费单位
-	*/
-		@ApiModelProperty(value = "计费单位")
-		private String unit;
-	/**
-	* 单价
-	*/
-		@ApiModelProperty(value = "单价")
-		private BigDecimal price;
-	/**
-	* 金额
-	*/
-		@ApiModelProperty(value = "金额")
-		private BigDecimal amount;
-	/**
-	* 币别
-	*/
-		@ApiModelProperty(value = "币别")
-		private String currency;
-	/**
-	* 汇率
-	*/
-		@ApiModelProperty(value = "汇率")
-		private BigDecimal exchangeRate;
-	/**
-	* 税率
-	*/
-		@ApiModelProperty(value = "税率")
-		private BigDecimal taxRate;
-	/**
-	* 核销金额
-	*/
-		@ApiModelProperty(value = "核销金额")
-		private BigDecimal settlmentAmount;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	 * 费用编码
-	 */
-		@ApiModelProperty(value = "费用编码")
-		@TableField(exist = false)
-		private String code;
-	/**
-	 * 费用名称
-	 */
-		@ApiModelProperty(value = "费用名称")
-		@TableField(exist = false)
-		private String feeName;
-	/**
-	 * 支付方名称
-	 */
-		@ApiModelProperty(value = "支付方名称")
-		@TableField(exist = false)
-		private String corpName;
-
-
-}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entity/OrderFiles.java

@@ -1,119 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.purchase.sales.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 订单文件实体类
- *
- * @author BladeX
- * @since 2021-09-26
- */
-@Data
-@TableName("business_order_files")
-@ApiModel(value = "OrderFiles对象", description = "订单文件")
-public class OrderFiles implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
-	/**
-	* 排序
-	*/
-		@ApiModelProperty(value = "排序")
-		private Integer sort;
-	/**
-	* 文件名
-	*/
-		@ApiModelProperty(value = "文件名")
-		private String fileName;
-	/**
-	* 文件地址
-	*/
-		@ApiModelProperty(value = "文件地址")
-		private String url;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-
-
-}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -1,268 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.purchase.sales.entity;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 订单明细表实体类
- *
- * @author BladeX
- * @since 2021-09-26
- */
-@Data
-@TableName("business_order_items")
-@ApiModel(value = "OrderItems对象", description = "订单明细表")
-public class OrderItems implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
-	/**
-	* 排序
-	*/
-		@ApiModelProperty(value = "排序")
-		private Integer sort;
-	/**
-	* 类别(销售政策 秒杀)
-	*/
-		@ApiModelProperty(value = "类别(销售政策 秒杀)")
-		private String priceCategory;
-	/**
-	 * 价格类别
-	 */
-	@ApiModelProperty(value = "价格类别")
-	private String priceType;
-	/**
-	* 货物id
-	*/
-		@ApiModelProperty(value = "货物id")
-		private Long itemId;
-	/**
-	* 订货数量
-	*/
-		@ApiModelProperty(value = "订货数量")
-		private BigDecimal orderQuantity;
-	/**
-	* 发货数量
-	*/
-		@ApiModelProperty(value = "发货数量")
-		private BigDecimal actualQuantity;
-	/**
-	* 库存数量
-	*/
-		@ApiModelProperty(value = "库存数量")
-		private BigDecimal storageQuantity;
-	/**
-	* 包装要求
-	*/
-		@ApiModelProperty(value = "包装要求")
-		private String packageRemarks;
-	/**
-	* 入库金额
-	*/
-		@ApiModelProperty(value = "入库金额")
-		private BigDecimal storageAmount;
-	/**
-	* 采购金额
-	*/
-		@ApiModelProperty(value = "采购金额")
-		private BigDecimal purchaseAmount;
-	/**
-	* 入库数量
-	*/
-		@ApiModelProperty(value = "入库数量")
-		private BigDecimal storageInQuantity;
-	/**
-	* 采购数量
-	*/
-		@ApiModelProperty(value = "采购数量")
-		private BigDecimal purchaseQuantity;
-	/**
-	* 计量单位
-	*/
-		@ApiModelProperty(value = "计量单位")
-		private String unit;
-	/**
-	* 单价
-	*/
-		@ApiModelProperty(value = "单价")
-		private BigDecimal price;
-	/**
-	* 金额(合同金额)
-	*/
-		@ApiModelProperty(value = "金额(合同金额)")
-		private BigDecimal amount;
-	/**
-	* 税率
-	*/
-		@ApiModelProperty(value = "税率")
-		private BigDecimal taxRate;
-	/**
-	* 原始订单号
-	*/
-		@ApiModelProperty(value = "原始订单号")
-		private String orgOrderNo;
-	/**
-	* 来源订单号(采购订单号)
-	*/
-		@ApiModelProperty(value = "来源订单号(采购订单号)")
-		private String srcOrderNo;
-	/**
-	* 来源id
-	*/
-		@ApiModelProperty(value = "来源id")
-		private Long srcId;
-	/**
-	* 提单号
-	*/
-		@ApiModelProperty(value = "提单号")
-		private String billNo;
-	/**
-	* 箱号
-	*/
-		@ApiModelProperty(value = "箱号")
-		private String containerNo;
-	/**
-	* 发票重量
-	*/
-		@ApiModelProperty(value = "发票重量")
-		private BigDecimal invoiceWeight;
-	/**
-	* 码单重量
-	*/
-		@ApiModelProperty(value = "码单重量")
-		private BigDecimal billWeight;
-	/**
-	* 自定义1
-	*/
-		@ApiModelProperty(value = "自定义1")
-		private String remarksOne;
-	/**
-	* 自定义2
-	*/
-		@ApiModelProperty(value = "自定义2")
-		private String customTwo;
-	/**
-	* 自定义3
-	*/
-		@ApiModelProperty(value = "自定义3")
-		private String customThree;
-	/**
-	* 自定义4
-	*/
-		@ApiModelProperty(value = "自定义4")
-		private String customFour;
-	/**
-	* 自定义5
-	*/
-		@ApiModelProperty(value = "自定义5")
-		private String customFive;
-	/**
-	* 自定义6
-	*/
-		@ApiModelProperty(value = "自定义6")
-		private String customSix;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	 * 商品编码
-	 */
-		@ApiModelProperty(value = "商品编码")
-		@TableField(exist = false)
-		private String code;
-	/**
-	 * 商品名称
-	 */
-		@ApiModelProperty(value = "商品名称")
-		@TableField(exist = false)
-		private String cname;
-	/**
-	 * 规格编码
-	 */
-		@ApiModelProperty(value = "规格编码")
-		@TableField(exist = false)
-		private String typeno;
-	/**
-	 * 规格型号
-	 */
-		@ApiModelProperty(value = "规格型号")
-		@TableField(exist = false)
-		private String specificationAndModel;
-}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/entity/OrderModify.java

@@ -1,118 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.purchase.sales.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * 修改日志实体类
- *
- * @author BladeX
- * @since 2021-09-26
- */
-@Data
-@TableName("business_order_modify")
-@ApiModel(value = "OrderModify对象", description = "修改日志")
-public class OrderModify implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 主表id
-	*/
-		@ApiModelProperty(value = "主表id")
-		private Long pid;
-	/**
-	* 排序
-	*/
-		@ApiModelProperty(value = "排序")
-		private Integer sort;
-	/**
-	* 字段名
-	*/
-		@ApiModelProperty(value = "字段名")
-		private String fieldName;
-	/**
-	* 字段值
-	*/
-		@ApiModelProperty(value = "字段值")
-		private String fieldValue;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	 * 租户id
-	 */
-		@ApiModelProperty(value = "租户id")
-		private String tenantId;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private Long createUser;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private Long createDept;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private Long updateUser;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-
-
-}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -219,6 +219,9 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 				)
 			);
 		}
+		if (menu.getParentId() != null){
+			menuQueryWrapper.eq(Menu::getParentId,menu.getParentId());
+		}
 		Integer cnt = baseMapper.selectCount(menuQueryWrapper);
 		if (cnt > 0) {
 			throw new ServiceException("菜单名或编号已存在!");