1.采购订单草稿请求参数优化

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/PurchaseOrderDraftParam.java

@@ -2,7 +2,7 @@ package com.sckw.order.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.constant.NumberConstant;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,10 +21,11 @@ import java.util.List;
 @Setter
 @ToString
 public class PurchaseOrderDraftParam {
-    public PurchaseOrderDraftParam(){
+    public PurchaseOrderDraftParam() {
         this.amount = NumberConstant.ZERO_TWO;
         this.price = NumberConstant.ZERO_TWO;
     }
+
     /**
      * 商品信息
      */
@@ -33,12 +34,10 @@ public class PurchaseOrderDraftParam {
     /**
      * 订单总量
      */
-    @DecimalMin(value = "0.01",message = "订单总量必须大于零")
     private BigDecimal amount;
     /**
      * 订单金额
      */
-    @DecimalMin(value = "0.01",message = "订单金额必须大于零")
     private BigDecimal price;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -164,10 +164,10 @@ public class KwoTradeOrderService {
                 .setUpdateByName(LoginUserHolder.getUserName())
                 .setTOrderId(id)
                 .setAssociateStatement(0)
-                .setPrice(tradeOrder.getPrice().doubleValue())
-                .setAmount(tradeOrder.getAmount().doubleValue())
-                .setEntrustAmount(tradeOrder.getEntrustAmount().doubleValue())
-                .setActualAmount(tradeOrder.getActualAmount().doubleValue());
+                .setPrice(Objects.isNull(tradeOrder.getPrice())?null:tradeOrder.getPrice().doubleValue())
+                .setAmount(Objects.isNull(tradeOrder.getAmount())?null:tradeOrder.getAmount().doubleValue())
+                .setEntrustAmount(Objects.isNull(tradeOrder.getEntrustAmount())?null:tradeOrder.getEntrustAmount().doubleValue())
+                .setActualAmount(Objects.isNull(tradeOrder.getActualAmount())?null:tradeOrder.getActualAmount().doubleValue());
 
         BeanUtil.copyProperties(tradeOrder, order);