From 9bb306e77b07fe5296eecc2e8d7edf9c9f8187e9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 10 Jul 2025 17:37:35 +0800
Subject: [PATCH] 小程序：提交订单处理门店处理
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java | 2 +-
oying-system/src/main/java/com/oying/modules/sh/domain/request/GeneratorOrder.java | 2 ++
oying-system/src/main/java/com/oying/modules/sh/domain/request/ProductOrder.java | 4 ++++
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/request/GeneratorOrder.java b/oying-system/src/main/java/com/oying/modules/sh/domain/request/GeneratorOrder.java
index 4eb6a0a..45b892a 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/request/GeneratorOrder.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/request/GeneratorOrder.java
@@ -4,6 +4,7 @@
import lombok.Getter;
import lombok.Setter;
+import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -16,6 +17,7 @@
public class GeneratorOrder {
@ApiModelProperty(value = "门店ID")
+ @NotNull
private Long storeId;
@ApiModelProperty(value = "商品&数量")
private List<ProductOrder> products;
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/request/ProductOrder.java b/oying-system/src/main/java/com/oying/modules/sh/domain/request/ProductOrder.java
index bb53ef8..ad8a630 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/request/ProductOrder.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/request/ProductOrder.java
@@ -4,6 +4,8 @@
import lombok.Getter;
import lombok.Setter;
+import javax.validation.constraints.NotNull;
+
/**
* @author xin
* @description
@@ -14,7 +16,9 @@
public class ProductOrder {
@ApiModelProperty(value = "商品ID")
+ @NotNull
private Long productId;
@ApiModelProperty(value = "数量")
+ @NotNull
private Integer count;
}
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
index 7f31fb6..aaae919 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
@@ -119,7 +119,7 @@
order.setOrderStatusDescribe(OrderStatusEnum.ZERO.getValue());
order.setUserId(SecurityUtils.getCurrentUserId());
order.setUsername(SecurityUtils.getCurrentUsername());
- Store store = storeService.getMerchantStore(submit.getStoreId());
+ Store store = storeService.getById(submit.getStoreId());
order.setStoreId(submit.getStoreId());
order.setStoreName(store.getStoreName());
order.setStoreLogo(store.getLogoImageUrl());
--
Gitblit v1.9.3