订单参数校验

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

@@ -2,6 +2,7 @@ package com.sckw.order.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -44,6 +45,7 @@ public class AddressInfo {
      * 联系电话
      */
     @NotBlank(message = "联系电话不能为空")
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "非法手机号格式")
     private String phone;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.sckw.order.model.vo.req;
 
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
@@ -70,6 +71,7 @@ public class GoodsInfo {
      * 订单成交单价
      */
     @NotNull(message = "订单成交单价不能为空")
+    @DecimalMin(value = "0.00",message = "订单成交单价最小为零")
     private BigDecimal unitPrice;
 
     /**

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

@@ -2,10 +2,7 @@ package com.sckw.order.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -36,11 +33,13 @@ public class PurchaseOrderParam {
      * 订单总量
      */
     @NotNull(message = "订单总量不能为空")
+    @DecimalMin(value = "0.00",message = "订单总量最小为零")
     private BigDecimal amount;
     /**
      * 订单金额
      */
     @NotNull(message = "订单金额不能为空")
+    @DecimalMin(value = "0.00",message = "订单金额最小为零")
     private BigDecimal price;
 
     /**

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

@@ -2,6 +2,7 @@ package com.sckw.order.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -44,5 +45,6 @@ public class UnitInfo {
      * 联系电话
      */
     @NotBlank(message = "联系电话不能为空")
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "非法手机号格式")
     private String phone;
 }

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

@@ -1,10 +1,7 @@
 package com.sckw.order.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -43,10 +40,13 @@ public class UpdateOrderParam {
     /**
      * 订单总量
      */
+    @DecimalMin(value = "0.00",message = "订单总量最小为零")
     private BigDecimal amount;
+
     /**
      * 订单金额
      */
+    @DecimalMin(value = "0.00",message = "订单金额最小为零")
     private BigDecimal price;
 
     /**

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

@@ -410,11 +410,11 @@ public class KwoTradeOrderService {
 
 
     private void checkParams(UpdateOrderParam param, String source) {
-        if (Objects.isNull(param.getAmount())) {
-            throw new BusinessException("订单总量不能为空！");
+        if (Objects.isNull(param.getAmount()) || param.getAmount().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("订单总量不能为空且不能为负数！");
         }
-        if (Objects.isNull(param.getPrice())) {
-            throw new BusinessException("订单金额不能为空！");
+        if (Objects.isNull(param.getPrice()) || param.getPrice().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("订单金额不能为空且不能为负数！");
         }
         if (StringUtils.isBlank(param.getTrading())) {
             throw new BusinessException("交易方式不能为空!");
@@ -465,8 +465,8 @@ public class KwoTradeOrderService {
         if (StringUtils.isBlank(goodsInfo.getGoodsType())) {
             throw new BusinessException("商品类型不能为空！");
         }
-        if (Objects.isNull(goodsInfo.getGoodsTaxRate())) {
-            throw new BusinessException("商品发票税率不能为空！");
+        if (Objects.isNull(goodsInfo.getGoodsTaxRate()) || goodsInfo.getGoodsTaxRate().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("商品发票税率不能为空且不能为负数！");
         }
         if (StringUtils.isBlank(goodsInfo.getGoodsSpec())) {
             throw new BusinessException("商品尺寸大小不能为空！");
@@ -477,8 +477,8 @@ public class KwoTradeOrderService {
         if (Objects.isNull(goodsInfo.getPriceRangeId())) {
             throw new BusinessException("价格段id不能为空！");
         }
-        if (Objects.isNull(goodsInfo.getUnitPrice())) {
-            throw new BusinessException("订单成交单价不能为空！");
+        if (Objects.isNull(goodsInfo.getUnitPrice()) || goodsInfo.getUnitPrice().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("订单成交单价不能为空且不能为负数！");
         }
         if (Objects.isNull(goodsInfo.getCollectionUnitId())) {
             throw new BusinessException("收款单位id不能为空！");