From 057d29dcb934807c5aa1f2341cee81e797d6f1dd Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 18 Feb 2025 14:24:02 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E9=94=80=E5=94=AE=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4,=E6=9B=B4=E5=8F=98=E6=97=A5=E5=BF=97=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oms/entity/OmsSaleOrder.java | 10 +++ .../modules/oms/entity/OmsVerSaleOrder.java | 80 +++++++++++++++++++ .../oms/entity/bo/OmsOrderModifyParam.java | 10 +++ .../modules/oms/entity/bo/OmsOrderSkuBo.java | 10 +++ .../oms/entity/vo/OmsConfirmOrderResult.java | 9 +++ .../oms/mapper/OmsVerSaleOrderMapper.java | 14 ++++ .../oms/service/OmsVerSaleOrderService.java | 16 ++++ .../impl/OmsSaleOrderPart1ServiceImpl.java | 2 +- .../service/impl/OmsSaleOrderServiceImpl.java | 37 ++++++++- .../impl/OmsVerSaleOrderServiceImpl.java | 13 +++ 10 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/oms/entity/OmsVerSaleOrder.java create mode 100644 src/main/java/com/qs/serve/modules/oms/mapper/OmsVerSaleOrderMapper.java create mode 100644 src/main/java/com/qs/serve/modules/oms/service/OmsVerSaleOrderService.java create mode 100644 src/main/java/com/qs/serve/modules/oms/service/impl/OmsVerSaleOrderServiceImpl.java diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java index e6589e79..f64d9d97 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java @@ -299,6 +299,16 @@ public class OmsSaleOrder implements Serializable { private Integer currentFlag; private String version; + /** + * 满足款项 + */ + private Integer satisfyPayFlag; + + /** + * 费用过单状态：0-无；1-部分；2-全部 + */ + private Integer overbillStatus; + /** * 折扣信息 */ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsVerSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsVerSaleOrder.java new file mode 100644 index 00000000..33bb6b66 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsVerSaleOrder.java @@ -0,0 +1,80 @@ +package com.qs.serve.modules.oms.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 订单 实体类 + * @author YenHex + * @since 2022-10-14 + */ +@Data +@TableName("oms_ver_sale_order") +public class OmsVerSaleOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + private String orderSn; + + private String erpId; + + private String operatorName; + private String operationType; + private LocalDateTime operationTime; + private String operationContext; + private String currentVersion; + private String lastVersion; + private Integer sort; + + /** 备注 */ + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + +} + diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java index af06734e..b64a847d 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java @@ -53,6 +53,16 @@ public class OmsOrderModifyParam { /** CD单据备注 */ private String cdOrderRemark; + /** + * 满足款项 + */ + private Integer satisfyPayFlag; + + /** + * 费用过单状态：0-无；1-部分；2-全部 + */ + private Integer overbillStatus; + /** * 明细 */ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java index aac164bb..0f8a506a 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java @@ -40,6 +40,16 @@ public class OmsOrderSkuBo { /** 收货地址 */ private Long addressId; + /** + * 满足款项 + */ + private Integer satisfyPayFlag; + + /** + * 费用过单状态：0-无；1-部分；2-全部 + */ + private Integer overbillStatus; + @Data public static class SpuParam{ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java b/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java index 6eedd994..c2f93c75 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java @@ -45,4 +45,13 @@ public class OmsConfirmOrderResult { @JsonIgnore private String latitudeFrom; + /** + * 满足款项 + */ + private Integer satisfyPayFlag; + + /** + * 费用过单状态：0-无；1-部分；2-全部 + */ + private Integer overbillStatus; } diff --git a/src/main/java/com/qs/serve/modules/oms/mapper/OmsVerSaleOrderMapper.java b/src/main/java/com/qs/serve/modules/oms/mapper/OmsVerSaleOrderMapper.java new file mode 100644 index 00000000..2ecbc02e --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/mapper/OmsVerSaleOrderMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.oms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.oms.entity.OmsVerSaleOrder; + +/** + * 订单 Mapper + * @author YenHex + * @date 2022-10-14 + */ +public interface OmsVerSaleOrderMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/oms/service/OmsVerSaleOrderService.java b/src/main/java/com/qs/serve/modules/oms/service/OmsVerSaleOrderService.java new file mode 100644 index 00000000..eb7c36cc --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/service/OmsVerSaleOrderService.java @@ -0,0 +1,16 @@ +package com.qs.serve.modules.oms.service; + +import com.baomidou.mybatisplus.extension.service.IService; + +import com.qs.serve.modules.oms.entity.OmsVerSaleOrder; + + +/** + * 订单 服务接口 + * @author YenHex + * @date 2022-10-14 + */ +public interface OmsVerSaleOrderService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java index f26ec14f..f19d17a9 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java @@ -81,7 +81,7 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { order.setId(null); String orderPrefix = null; if (order.getOrderType().equals(0)) { - orderPrefix = "SN"; + orderPrefix = ""; } else if (order.getOrderType().equals(1)) { orderPrefix = "ZP"; } else if (order.getOrderType().equals(2)) { diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index 76f26a79..db247ad9 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -39,6 +39,7 @@ import com.qs.serve.modules.oms.entity.vo.OmsPlanResult; import com.qs.serve.modules.oms.entity.vo.OmsSpuAssesInfo; import com.qs.serve.modules.oms.event.OrderCreateCacheEvent; import com.qs.serve.modules.oms.mapper.OmsSaleOrderMapper; +import com.qs.serve.modules.oms.mapper.OmsVerSaleOrderMapper; import com.qs.serve.modules.oms.service.*; import com.qs.serve.modules.oms.utils.OmsOrderUtil; import com.qs.serve.modules.sale.entity.SalePlan; @@ -101,6 +102,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl spuIds = param.getOrderItems().stream().map(OmsOrderModifyParam.OmsOrderItemModifyBo::getSpuId).collect(Collectors.toList()); @@ -676,7 +682,8 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl implements OmsVerSaleOrderService { +}