From e0165d6fe245dc81df9706815073fbc9ba3aec6b Mon Sep 17 00:00:00 2001 From: wupeng Date: Mon, 14 Aug 2023 10:31:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E7=A8=8B=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ils/order/IlsOrderServiceApplication.java | 4 +- .../controller/IlsCustomerController.java | 21 ++ .../controller/IlsOrderAddressController.java | 21 ++ .../order/controller/IlsOrderController.java | 29 +++ .../controller/IlsOrderFeeController.java | 21 ++ .../controller/IlsOrderItemController.java | 21 ++ .../controller/IlsOrderLabelController.java | 21 ++ .../controller/IlsOrderParcelController.java | 21 ++ .../controller/IlsOrderUploadController.java | 21 ++ .../controller/IlsProductController.java | 21 ++ .../IlsProductValidationController.java | 21 ++ .../org/ils/order/entity/IlsCustomerDO.java | 139 +++++++++++++ .../ils/order/entity/IlsOrderAddressDO.java | 125 ++++++++++++ .../java/org/ils/order/entity/IlsOrderDO.java | 191 ++++++++++++++++++ .../org/ils/order/entity/IlsOrderFeeDO.java | 91 +++++++++ .../org/ils/order/entity/IlsOrderItemDO.java | 136 +++++++++++++ .../org/ils/order/entity/IlsOrderLabelDO.java | 80 ++++++++ .../ils/order/entity/IlsOrderParcelDO.java | 101 +++++++++ .../ils/order/entity/IlsOrderUploadDO.java | 111 ++++++++++ .../org/ils/order/entity/IlsProductDO.java | 115 +++++++++++ .../order/entity/IlsProductValidationDO.java | 85 ++++++++ .../ils/order/mapper/IlsCustomerMapper.java | 16 ++ .../order/mapper/IlsOrderAddressMapper.java | 16 ++ .../ils/order/mapper/IlsOrderFeeMapper.java | 16 ++ .../ils/order/mapper/IlsOrderItemMapper.java | 16 ++ .../ils/order/mapper/IlsOrderLabelMapper.java | 16 ++ .../org/ils/order/mapper/IlsOrderMapper.java | 16 ++ .../order/mapper/IlsOrderParcelMapper.java | 16 ++ .../order/mapper/IlsOrderUploadMapper.java | 16 ++ .../ils/order/mapper/IlsProductMapper.java | 16 ++ .../mapper/IlsProductValidationMapper.java | 16 ++ .../order/service/IIlsCustomerService.java | 16 ++ .../service/IIlsOrderAddressService.java | 16 ++ .../order/service/IIlsOrderFeeService.java | 16 ++ .../order/service/IIlsOrderItemService.java | 16 ++ .../order/service/IIlsOrderLabelService.java | 16 ++ .../order/service/IIlsOrderParcelService.java | 16 ++ .../ils/order/service/IIlsOrderService.java | 16 ++ .../order/service/IIlsOrderUploadService.java | 16 ++ .../ils/order/service/IIlsProductService.java | 16 ++ .../service/IIlsProductValidationService.java | 16 ++ .../service/impl/IlsCustomerServiceImpl.java | 20 ++ .../impl/IlsOrderAddressServiceImpl.java | 20 ++ .../service/impl/IlsOrderFeeServiceImpl.java | 20 ++ .../service/impl/IlsOrderItemServiceImpl.java | 20 ++ .../impl/IlsOrderLabelServiceImpl.java | 20 ++ .../impl/IlsOrderParcelServiceImpl.java | 20 ++ .../service/impl/IlsOrderServiceImpl.java | 20 ++ .../impl/IlsOrderUploadServiceImpl.java | 20 ++ .../service/impl/IlsProductServiceImpl.java | 20 ++ .../impl/IlsProductValidationServiceImpl.java | 20 ++ src/main/resources/application-dev.yml | 4 +- .../resources/mapper/IlsCustomerMapper.xml | 38 ++++ .../mapper/IlsOrderAddressMapper.xml | 34 ++++ .../resources/mapper/IlsOrderFeeMapper.xml | 27 +++ .../resources/mapper/IlsOrderItemMapper.xml | 36 ++++ .../resources/mapper/IlsOrderLabelMapper.xml | 25 +++ src/main/resources/mapper/IlsOrderMapper.xml | 47 +++++ .../resources/mapper/IlsOrderParcelMapper.xml | 29 +++ .../resources/mapper/IlsOrderUploadMapper.xml | 31 +++ .../resources/mapper/IlsProductMapper.xml | 32 +++ .../mapper/IlsProductValidationMapper.xml | 26 +++ 62 files changed, 2242 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/ils/order/controller/IlsCustomerController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderAddressController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderFeeController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderItemController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderLabelController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderParcelController.java create mode 100644 src/main/java/org/ils/order/controller/IlsOrderUploadController.java create mode 100644 src/main/java/org/ils/order/controller/IlsProductController.java create mode 100644 src/main/java/org/ils/order/controller/IlsProductValidationController.java create mode 100644 src/main/java/org/ils/order/entity/IlsCustomerDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderAddressDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderFeeDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderItemDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderLabelDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderParcelDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsOrderUploadDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsProductDO.java create mode 100644 src/main/java/org/ils/order/entity/IlsProductValidationDO.java create mode 100644 src/main/java/org/ils/order/mapper/IlsCustomerMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsProductMapper.java create mode 100644 src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java create mode 100644 src/main/java/org/ils/order/service/IIlsCustomerService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderAddressService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderFeeService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderItemService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderLabelService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderParcelService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderService.java create mode 100644 src/main/java/org/ils/order/service/IIlsOrderUploadService.java create mode 100644 src/main/java/org/ils/order/service/IIlsProductService.java create mode 100644 src/main/java/org/ils/order/service/IIlsProductValidationService.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java create mode 100644 src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java create mode 100644 src/main/resources/mapper/IlsCustomerMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderAddressMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderFeeMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderItemMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderLabelMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderParcelMapper.xml create mode 100644 src/main/resources/mapper/IlsOrderUploadMapper.xml create mode 100644 src/main/resources/mapper/IlsProductMapper.xml create mode 100644 src/main/resources/mapper/IlsProductValidationMapper.xml diff --git a/src/main/java/org/ils/order/IlsOrderServiceApplication.java b/src/main/java/org/ils/order/IlsOrderServiceApplication.java index 3121328..835e43b 100644 --- a/src/main/java/org/ils/order/IlsOrderServiceApplication.java +++ b/src/main/java/org/ils/order/IlsOrderServiceApplication.java @@ -4,6 +4,7 @@ import com.z.common.configuration.exception.ZGlobalExceptionHandler; import com.z.common.configuration.rabbit.ZRabbitAutoConfiguration; import com.z.common.configuration.redis.ZRedisAutoConfiguration; import com.z.common.swagger.ZSwagger2Configuration; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Import; @@ -15,11 +16,12 @@ import org.springframework.context.annotation.Import; */ @SpringBootApplication @Import(value = { - ZSwagger2Configuration.class, + //ZSwagger2Configuration.class, ZRedisAutoConfiguration.class, ZRabbitAutoConfiguration.class, ZGlobalExceptionHandler.class }) +@MapperScan(basePackages = "org.ils.order.mapper") public class IlsOrderServiceApplication { public static void main(String[] args) { SpringApplication.run(IlsOrderServiceApplication.class, args); diff --git a/src/main/java/org/ils/order/controller/IlsCustomerController.java b/src/main/java/org/ils/order/controller/IlsCustomerController.java new file mode 100644 index 0000000..44a1b39 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsCustomerController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 客户信息表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsCustomerDO") +public class IlsCustomerController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderAddressController.java b/src/main/java/org/ils/order/controller/IlsOrderAddressController.java new file mode 100644 index 0000000..be1a125 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderAddressController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 收发件人表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsOrderAddressDO") +public class IlsOrderAddressController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderController.java b/src/main/java/org/ils/order/controller/IlsOrderController.java new file mode 100644 index 0000000..70727a9 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderController.java @@ -0,0 +1,29 @@ +package org.ils.order.controller; + + +import org.ils.order.service.IIlsOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 订单表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ils/Order") +public class IlsOrderController { + @Autowired + private IIlsOrderService ilsOrderService; + + + // 订单文件管理 + + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderFeeController.java b/src/main/java/org/ils/order/controller/IlsOrderFeeController.java new file mode 100644 index 0000000..bf2b814 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderFeeController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 订单金额 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsOrderFeeDO") +public class IlsOrderFeeController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderItemController.java b/src/main/java/org/ils/order/controller/IlsOrderItemController.java new file mode 100644 index 0000000..ba54279 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderItemController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 订单商品 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsOrderItemDO") +public class IlsOrderItemController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderLabelController.java b/src/main/java/org/ils/order/controller/IlsOrderLabelController.java new file mode 100644 index 0000000..a90a205 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderLabelController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 面单表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsOrderLabelDO") +public class IlsOrderLabelController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderParcelController.java b/src/main/java/org/ils/order/controller/IlsOrderParcelController.java new file mode 100644 index 0000000..b28bb66 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderParcelController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 订单入库大小 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsOrderParcelDO") +public class IlsOrderParcelController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsOrderUploadController.java b/src/main/java/org/ils/order/controller/IlsOrderUploadController.java new file mode 100644 index 0000000..9379884 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsOrderUploadController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 订单表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsOrderUploadDO") +public class IlsOrderUploadController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsProductController.java b/src/main/java/org/ils/order/controller/IlsProductController.java new file mode 100644 index 0000000..eb3fbc5 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsProductController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 产品表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsProductDO") +public class IlsProductController { + +} + diff --git a/src/main/java/org/ils/order/controller/IlsProductValidationController.java b/src/main/java/org/ils/order/controller/IlsProductValidationController.java new file mode 100644 index 0000000..33c68f5 --- /dev/null +++ b/src/main/java/org/ils/order/controller/IlsProductValidationController.java @@ -0,0 +1,21 @@ +package org.ils.order.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 产品校验规则表 前端控制器 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@RestController +@RequestMapping("/ilsProductValidationDO") +public class IlsProductValidationController { + +} + diff --git a/src/main/java/org/ils/order/entity/IlsCustomerDO.java b/src/main/java/org/ils/order/entity/IlsCustomerDO.java new file mode 100644 index 0000000..9d920ba --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsCustomerDO.java @@ -0,0 +1,139 @@ +package org.ils.order.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 客户信息表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_customer") +public class IlsCustomerDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 客户id + */ + private String customerId; + + /** + * 客户名 + */ + private String customerName; + + /** + * 客户昵称 + */ + private String customerNickname; + + /** + * 客户邮箱 + */ + private String customerEmail; + + /** + * 客户手机号 + */ + private String customerPhone; + + /** + * 密码 + */ + private String password; + + /** + * 密码盐值 + */ + private String salt; + + /** + * 上次登录时间 + */ + private Date lastLoginDate; + + /** + * 上次登录ip + */ + private Date lastLoginIp; + + /** + * 是否删除，0-正常，1-删除 + */ + private Integer isDeleted; + + private String ileId; + + private String ileKey; + + /** + * 用户信用级别：0-高级、1-中级、... + */ + private Integer customerLevel; + + /** + * 客户营业执照地址 + */ + private String customerCompanyLicense; + + /** + * 客户仓库地址 + */ + private String customerStockAddress; + + /** + * 客户公司地址 + */ + private String customerCompanyAddress; + + /** + * 客户公司法人信息 + */ + private String companyLegalPerson; + + /** + * 下单是否短信通知 + */ + private Integer isLetterInform; + + /** + * 下单是否邮件通知 + */ + private Integer isEmailInform; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderAddressDO.java b/src/main/java/org/ils/order/entity/IlsOrderAddressDO.java new file mode 100644 index 0000000..4d2ab5b --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderAddressDO.java @@ -0,0 +1,125 @@ +package org.ils.order.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 收发件人表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order_address") +public class IlsOrderAddressDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * ils内部单号 + */ + private String orderId; + + /** + * 关联单号 + */ + private String conCode; + + /** + * 姓名 + */ + private String name; + + /** + * 公司 + */ + private String company; + + /** + * 电话 + */ + private String phone; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String area; + + /** + * 省(中文) + */ + private String provinceCn; + + /** + * 市(中文) + */ + private String cityCn; + + /** + * 区(中文) + */ + private String areaCn; + + /** + * 邮编 + */ + private String postcode; + + /** + * 详细地址 + */ + private String detaildAddress; + + /** + * 是否删除，0-正常，1-删除 + */ + private Integer isDeleted; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + /** + * 用户类型，0-shipper、1-consign + */ + private Integer userType; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderDO.java b/src/main/java/org/ils/order/entity/IlsOrderDO.java new file mode 100644 index 0000000..8db01f5 --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderDO.java @@ -0,0 +1,191 @@ +package org.ils.order.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 订单表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order") +public class IlsOrderDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * ils-订单单号 + */ + private String orderId; + + /** + * 关联单号 + */ + private String conCode; + + /** + * 物流单号 + */ + private String refCode; + + /** + * 客户单号 + */ + private String clientCode; + + /** + * 主单号 + */ + private String mainCode; + + /** + * post小包长单号 + */ + private String notesCode; + + /** + * 客户id + */ + private String customerId; + + /** + * 客户名 + */ + private String customerName; + + /** + * 产品编码 + */ + private String productCode; + + /** + * 预报干线类型 + */ + private String preDryline; + + /** + * 实际干线 + */ + private String realDryline; + + /** + * 预报重量 + */ + private BigDecimal preWeight; + + /** + * 预报体积 + */ + private BigDecimal preCbm; + + /** + * 实际重量 + */ + private BigDecimal realWeight; + + /** + * 实际体积 + */ + private BigDecimal realCbm; + + /** + * 订单实际计费重 + */ + private BigDecimal billingWeight; + + /** + * 邮编 + */ + private String postcode; + + /** + * 预报件数 + */ + private Integer preParcelNumber; + + /** + * 实际件数 + */ + private Integer realParcelNumber; + + /** + * 货值 + */ + private BigDecimal itemValue; + + /** + * 货物名称 + */ + private String itemName; + + /** + * 订单awb信息 + */ + private String orderAwb; + + /** + * 船只信息 + */ + private String vessel; + + /** + * 提单号 + */ + private String container; + + /** + * 订单状态，0-取消; 1-已下单; 2=审核通过; 3=审核不通过; + */ + private Integer orderStatus; + + /** + * 下单方式：0-接口、1-表单、2-文件 + */ + private Integer orderWay; + + /** + * 备注(产品校验、提示信息、客服备注 等) + */ + private String remark; + + /** + * 仓库编码 + */ + private String warehouseCode; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderFeeDO.java b/src/main/java/org/ils/order/entity/IlsOrderFeeDO.java new file mode 100644 index 0000000..37cc03f --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderFeeDO.java @@ -0,0 +1,91 @@ +package org.ils.order.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 订单金额 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order_fee") +public class IlsOrderFeeDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * ils内部单号 + */ + private String orderId; + + /** + * 关联单号 + */ + private String conCode; + + /** + * 物流单号 + */ + private String refCode; + + /** + * 客户id + */ + private String customerId; + + /** + * 收费名 + */ + private String chargeName; + + /** + * 收费费用 + */ + private BigDecimal chargeAmount; + + /** + * 收费类型 + */ + private String chargeType; + + /** + * 收费记录 + */ + private String chargeLog; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderItemDO.java b/src/main/java/org/ils/order/entity/IlsOrderItemDO.java new file mode 100644 index 0000000..1d1c053 --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderItemDO.java @@ -0,0 +1,136 @@ +package org.ils.order.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 订单商品 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order_item") +public class IlsOrderItemDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * ils内部单号 + */ + private String orderId; + + /** + * 关联单号 + */ + private String conCode; + + /** + * 货物中文品名 + */ + private String itemNameCn; + + /** + * 货物英文品名 + */ + private String itemNameEn; + + /** + * 海关编码 + */ + private String hsCode; + + /** + * 货物材质 + */ + private String itemMaterial; + + /** + * 货物用途 + */ + private String itemUsage; + + /** + * 货物品牌型号 + */ + private String itemBrand; + + /** + * fba号码（亚马逊） + */ + private String fbaNumber; + + /** + * 货物追踪码（亚马逊） + */ + private String referenceId; + + /** + * 货物销售链接 + */ + private String itemLink; + + /** + * 货物数量 + */ + private Integer itemQuantity; + + /** + * 货物单价（美元） + */ + private BigDecimal itemUnitPrice; + + /** + * 货物总价（美元） + */ + private BigDecimal itemTotalPrice; + + /** + * 货物件数 + */ + private Integer itemPieces; + + /** + * 入仓号 + */ + private String putcode; + + /** + * 箱号,格式为1,2,3,4,5 + */ + private String boxNum; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderLabelDO.java b/src/main/java/org/ils/order/entity/IlsOrderLabelDO.java new file mode 100644 index 0000000..85e5fbf --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderLabelDO.java @@ -0,0 +1,80 @@ +package org.ils.order.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 面单表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order_label") +public class IlsOrderLabelDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * ils内部单号 + */ + private String orderId; + + /** + * 关联单号 + */ + private String conCode; + + /** + * 物流单号 + */ + private String refCode; + + /** + * 文件地址 + */ + private String labelUrl; + + /** + * 文件类型，1-入仓单、2-面单、3-pod文件 + */ + private Integer labelType; + + /** + * 文件后缀,jpg、png、pdf + */ + private String labelSuffix; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderParcelDO.java b/src/main/java/org/ils/order/entity/IlsOrderParcelDO.java new file mode 100644 index 0000000..12758f9 --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderParcelDO.java @@ -0,0 +1,101 @@ +package org.ils.order.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 订单入库大小 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order_parcel") +public class IlsOrderParcelDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * ils内部单号 + */ + private String orderId; + + /** + * 扫描时完整单号 + */ + private String parcelCode; + + /** + * 关联单号 + */ + private String conCode; + + /** + * 物流单号 + */ + private String refCode; + + /** + * 货物入库宽度 + */ + private BigDecimal parcelWidth; + + /** + * 货物入库高度 + */ + private BigDecimal parcelHeight; + + /** + * 货物入库长度 + */ + private BigDecimal parcelLength; + + /** + * 货物入库重量 + */ + private BigDecimal parcelWeight; + + /** + * 货物入库图片 + */ + private String parcelImg; + + /** + * 单号后缀 + */ + private String codeSuffix; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsOrderUploadDO.java b/src/main/java/org/ils/order/entity/IlsOrderUploadDO.java new file mode 100644 index 0000000..ba71dbe --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsOrderUploadDO.java @@ -0,0 +1,111 @@ +package org.ils.order.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 订单表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_order_upload") +public class IlsOrderUploadDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 客户id + */ + private String customerId; + + /** + * 客户名 + */ + private String customerName; + + /** + * excel地址 + */ + private String excelUrl; + + /** + * 渠道编码 + */ + private String channelCode; + + /** + * 渠道名 + */ + private String channelName; + + /** + * 收货人手机号码 + */ + private String recipientPhone; + + /** + * 预报干线类型 + */ + private String preDryline; + + /** + * 预报重量 + */ + private BigDecimal preWeight; + + /** + * 预报体积 + */ + private BigDecimal preCbm; + + /** + * 邮编 + */ + private String postcode; + + /** + * 预报件数 + */ + private Integer preParcelNumber; + + /** + * excel数据 + */ + private String uploadData; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsProductDO.java b/src/main/java/org/ils/order/entity/IlsProductDO.java new file mode 100644 index 0000000..1ab64ca --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsProductDO.java @@ -0,0 +1,115 @@ +package org.ils.order.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 产品表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_product") +public class IlsProductDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 产品编码 + */ + private String productCode; + + /** + * 产品中文名 + */ + private String productNameCn; + + /** + * 产品英文名 + */ + private String productNameEn; + + /** + * 产品中文描述 + */ + private String productDescCn; + + /** + * 产品英文描述 + */ + private String productDescEn; + + /** + * 产品前台展示名称 + */ + private String productDisplayName; + + /** + * 产品类别：STD=标准，ECO=经济，EXP=快捷 + */ + private String productCategory; + + /** + * 是否带电 + */ + private Boolean isBattery; + + /** + * 贸易方式; 0: DDU, 1: DDP, 2: DDP&DDU + */ + private Integer tradeMode; + + /** + * 状态; 0: 停用, 1: 启用 + */ + private Integer status; + + /** + * 产品时效起(自然日) + */ + private Date productEffectiveDate; + + /** + * 产品时效止(自然日) + */ + private Date productExpirationDate; + + /** + * 是否删除,1=是 + */ + private Boolean isDeleted; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/entity/IlsProductValidationDO.java b/src/main/java/org/ils/order/entity/IlsProductValidationDO.java new file mode 100644 index 0000000..292acf6 --- /dev/null +++ b/src/main/java/org/ils/order/entity/IlsProductValidationDO.java @@ -0,0 +1,85 @@ +package org.ils.order.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 产品校验规则表 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ils_product_validation") +public class IlsProductValidationDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 产品编码 + */ + private String productCode; + + /** + * 校验对象 + */ + private String ruleEntity; + + /** + * 正则表达式 + */ + private String constraintsRegex; + + /** + * 校验错误提示中文提示 + */ + private String errorMessageCn; + + /** + * 校验错误提示英文提示 + */ + private String errorMessageEn; + + /** + * 状态; 0: 停用, 1: 启用 + */ + private Integer status; + + /** + * 警告级别（error/ warning /debug / info , error=直接报错, ） + */ + private String level; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改人 + */ + private String updateBy; + + +} diff --git a/src/main/java/org/ils/order/mapper/IlsCustomerMapper.java b/src/main/java/org/ils/order/mapper/IlsCustomerMapper.java new file mode 100644 index 0000000..676ea52 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsCustomerMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsCustomerDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 客户信息表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsCustomerMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java new file mode 100644 index 0000000..16eee05 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderAddressMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderAddressDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 收发件人表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderAddressMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java new file mode 100644 index 0000000..94c5fa0 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderFeeMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderFeeDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 订单金额 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderFeeMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java new file mode 100644 index 0000000..315bec2 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderItemMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderItemDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 订单商品 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderItemMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java new file mode 100644 index 0000000..5b39003 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderLabelMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderLabelDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 面单表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderLabelMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderMapper.java new file mode 100644 index 0000000..17acd76 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 订单表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java new file mode 100644 index 0000000..16a3293 --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderParcelMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderParcelDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 订单入库大小 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderParcelMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java b/src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java new file mode 100644 index 0000000..a69a9be --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsOrderUploadMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsOrderUploadDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 订单表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsOrderUploadMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsProductMapper.java b/src/main/java/org/ils/order/mapper/IlsProductMapper.java new file mode 100644 index 0000000..c44359e --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsProductMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsProductDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 产品表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsProductMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java b/src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java new file mode 100644 index 0000000..82304fe --- /dev/null +++ b/src/main/java/org/ils/order/mapper/IlsProductValidationMapper.java @@ -0,0 +1,16 @@ +package org.ils.order.mapper; + +import org.ils.order.entity.IlsProductValidationDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 产品校验规则表 Mapper 接口 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IlsProductValidationMapper extends BaseMapper { + +} diff --git a/src/main/java/org/ils/order/service/IIlsCustomerService.java b/src/main/java/org/ils/order/service/IIlsCustomerService.java new file mode 100644 index 0000000..39c97ec --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsCustomerService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsCustomerDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 客户信息表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsCustomerService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderAddressService.java b/src/main/java/org/ils/order/service/IIlsOrderAddressService.java new file mode 100644 index 0000000..ad29b62 --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderAddressService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderAddressDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 收发件人表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderAddressService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderFeeService.java b/src/main/java/org/ils/order/service/IIlsOrderFeeService.java new file mode 100644 index 0000000..4c879fe --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderFeeService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderFeeDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 订单金额 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderFeeService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderItemService.java b/src/main/java/org/ils/order/service/IIlsOrderItemService.java new file mode 100644 index 0000000..8c4d038 --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderItemService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderItemDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 订单商品 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderItemService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderLabelService.java b/src/main/java/org/ils/order/service/IIlsOrderLabelService.java new file mode 100644 index 0000000..8e1662a --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderLabelService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderLabelDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 面单表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderLabelService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderParcelService.java b/src/main/java/org/ils/order/service/IIlsOrderParcelService.java new file mode 100644 index 0000000..5b12264 --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderParcelService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderParcelDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 订单入库大小 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderParcelService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderService.java b/src/main/java/org/ils/order/service/IIlsOrderService.java new file mode 100644 index 0000000..9e1358f --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 订单表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsOrderUploadService.java b/src/main/java/org/ils/order/service/IIlsOrderUploadService.java new file mode 100644 index 0000000..906b439 --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsOrderUploadService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsOrderUploadDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 订单表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsOrderUploadService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsProductService.java b/src/main/java/org/ils/order/service/IIlsProductService.java new file mode 100644 index 0000000..b38e7de --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsProductService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsProductDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 产品表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsProductService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/IIlsProductValidationService.java b/src/main/java/org/ils/order/service/IIlsProductValidationService.java new file mode 100644 index 0000000..1818aa5 --- /dev/null +++ b/src/main/java/org/ils/order/service/IIlsProductValidationService.java @@ -0,0 +1,16 @@ +package org.ils.order.service; + +import org.ils.order.entity.IlsProductValidationDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 产品校验规则表 服务类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +public interface IIlsProductValidationService extends IService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java new file mode 100644 index 0000000..9d2be8a --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsCustomerServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsCustomerDO; +import org.ils.order.mapper.IlsCustomerMapper; +import org.ils.order.service.IIlsCustomerService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 客户信息表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsCustomerServiceImpl extends ServiceImpl implements IIlsCustomerService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java new file mode 100644 index 0000000..1d23617 --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderAddressServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderAddressDO; +import org.ils.order.mapper.IlsOrderAddressMapper; +import org.ils.order.service.IIlsOrderAddressService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 收发件人表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderAddressServiceImpl extends ServiceImpl implements IIlsOrderAddressService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java new file mode 100644 index 0000000..1b70943 --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderFeeServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderFeeDO; +import org.ils.order.mapper.IlsOrderFeeMapper; +import org.ils.order.service.IIlsOrderFeeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 订单金额 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderFeeServiceImpl extends ServiceImpl implements IIlsOrderFeeService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java new file mode 100644 index 0000000..e7b2582 --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderItemServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderItemDO; +import org.ils.order.mapper.IlsOrderItemMapper; +import org.ils.order.service.IIlsOrderItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 订单商品 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderItemServiceImpl extends ServiceImpl implements IIlsOrderItemService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java new file mode 100644 index 0000000..f40902e --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderLabelServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderLabelDO; +import org.ils.order.mapper.IlsOrderLabelMapper; +import org.ils.order.service.IIlsOrderLabelService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 面单表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderLabelServiceImpl extends ServiceImpl implements IIlsOrderLabelService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java new file mode 100644 index 0000000..3199c3d --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderParcelServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderParcelDO; +import org.ils.order.mapper.IlsOrderParcelMapper; +import org.ils.order.service.IIlsOrderParcelService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 订单入库大小 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderParcelServiceImpl extends ServiceImpl implements IIlsOrderParcelService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java new file mode 100644 index 0000000..63208d9 --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderDO; +import org.ils.order.mapper.IlsOrderMapper; +import org.ils.order.service.IIlsOrderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 订单表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderServiceImpl extends ServiceImpl implements IIlsOrderService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java new file mode 100644 index 0000000..84c7902 --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsOrderUploadServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsOrderUploadDO; +import org.ils.order.mapper.IlsOrderUploadMapper; +import org.ils.order.service.IIlsOrderUploadService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 订单表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsOrderUploadServiceImpl extends ServiceImpl implements IIlsOrderUploadService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java new file mode 100644 index 0000000..5c71138 --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsProductServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsProductDO; +import org.ils.order.mapper.IlsProductMapper; +import org.ils.order.service.IIlsProductService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 产品表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsProductServiceImpl extends ServiceImpl implements IIlsProductService { + +} diff --git a/src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java b/src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java new file mode 100644 index 0000000..b483d2a --- /dev/null +++ b/src/main/java/org/ils/order/service/impl/IlsProductValidationServiceImpl.java @@ -0,0 +1,20 @@ +package org.ils.order.service.impl; + +import org.ils.order.entity.IlsProductValidationDO; +import org.ils.order.mapper.IlsProductValidationMapper; +import org.ils.order.service.IIlsProductValidationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 产品校验规则表 服务实现类 + *

+ * + * @author ${author} + * @since 2023-08-11 + */ +@Service +public class IlsProductValidationServiceImpl extends ServiceImpl implements IIlsProductValidationService { + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 516157a..08dc327 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,9 +9,9 @@ spring: max-file-size: 10MB max-request-size: 10MB datasource: - url: jdbc:mysql://127.0.0.1:3306/ils_engine?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/ils_order?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&useSSL=false username: root - password: 123456 + password: root driver-class-name: com.mysql.cj.jdbc.Driver druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) # 连接池的配置信息 diff --git a/src/main/resources/mapper/IlsCustomerMapper.xml b/src/main/resources/mapper/IlsCustomerMapper.xml new file mode 100644 index 0000000..12c24f8 --- /dev/null +++ b/src/main/resources/mapper/IlsCustomerMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, customer_id, customer_name, customer_nickname, customer_email, customer_phone, password, salt, last_login_date, last_login_ip, is_deleted, ile_id, ile_key, customer_level, customer_company_license, customer_stock_address, customer_company_address, company_legal_person, is_letter_inform, is_email_inform, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsOrderAddressMapper.xml b/src/main/resources/mapper/IlsOrderAddressMapper.xml new file mode 100644 index 0000000..5447c40 --- /dev/null +++ b/src/main/resources/mapper/IlsOrderAddressMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, con_code, name, company, phone, province, city, area, province_cn, city_cn, area_cn, postcode, detaild_address, is_deleted, updated_time, created_time, create_by, update_by, user_type + + + diff --git a/src/main/resources/mapper/IlsOrderFeeMapper.xml b/src/main/resources/mapper/IlsOrderFeeMapper.xml new file mode 100644 index 0000000..8822c86 --- /dev/null +++ b/src/main/resources/mapper/IlsOrderFeeMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, con_code, ref_code, customer_id, charge_name, charge_amount, charge_type, charge_log, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsOrderItemMapper.xml b/src/main/resources/mapper/IlsOrderItemMapper.xml new file mode 100644 index 0000000..dedc3ec --- /dev/null +++ b/src/main/resources/mapper/IlsOrderItemMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, con_code, item_name_cn, item_name_en, hs_code, item_material, item_usage, item_brand, fba_number, reference_id, item_link, item_quantity, item_unit_price, item_total_price, item_pieces, putcode, box_num, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsOrderLabelMapper.xml b/src/main/resources/mapper/IlsOrderLabelMapper.xml new file mode 100644 index 0000000..450ddd0 --- /dev/null +++ b/src/main/resources/mapper/IlsOrderLabelMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, order_id, con_code, ref_code, label_url, label_type, label_suffix, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsOrderMapper.xml b/src/main/resources/mapper/IlsOrderMapper.xml new file mode 100644 index 0000000..b0dfab4 --- /dev/null +++ b/src/main/resources/mapper/IlsOrderMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, con_code, ref_code, client_code, main_code, notes_code, customer_id, customer_name, product_code, pre_dryline, real_dryline, pre_weight, pre_cbm, real_weight, real_cbm, billing_weight, postcode, pre_parcel_number, real_parcel_number, item_value, item_name, order_awb, vessel, container, order_status, order_way, remark, warehouse_code, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsOrderParcelMapper.xml b/src/main/resources/mapper/IlsOrderParcelMapper.xml new file mode 100644 index 0000000..64ad6bb --- /dev/null +++ b/src/main/resources/mapper/IlsOrderParcelMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, parcel_code, con_code, ref_code, parcel_width, parcel_height, parcel_length, parcel_weight, parcel_img, code_suffix, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsOrderUploadMapper.xml b/src/main/resources/mapper/IlsOrderUploadMapper.xml new file mode 100644 index 0000000..1f8f87b --- /dev/null +++ b/src/main/resources/mapper/IlsOrderUploadMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, customer_id, customer_name, excel_url, channel_code, channel_name, recipient_phone, pre_dryline, pre_weight, pre_cbm, postcode, pre_parcel_number, upload_data, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsProductMapper.xml b/src/main/resources/mapper/IlsProductMapper.xml new file mode 100644 index 0000000..cef137e --- /dev/null +++ b/src/main/resources/mapper/IlsProductMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, product_code, product_name_cn, product_name_en, product_desc_cn, product_desc_en, product_display_name, product_category, is_battery, trade_mode, status, product_effective_date, product_expiration_date, is_deleted, updated_time, created_time, create_by, update_by + + + diff --git a/src/main/resources/mapper/IlsProductValidationMapper.xml b/src/main/resources/mapper/IlsProductValidationMapper.xml new file mode 100644 index 0000000..03ac008 --- /dev/null +++ b/src/main/resources/mapper/IlsProductValidationMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + id, product_code, rule_entity, constraints_regex, error_message_cn, error_message_en, status, level, updated_time, created_time, create_by, update_by + + +