From 21243336236f8ac0575885eaedd43a6b8eeca31b Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:44:18 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java | 8 +++-----
oying-common/src/main/java/com/oying/utils/enums/SendTypeEnum.java | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/oying-common/src/main/java/com/oying/utils/enums/SendTypeEnum.java b/oying-common/src/main/java/com/oying/utils/enums/SendTypeEnum.java
new file mode 100644
index 0000000..273e7a6
--- /dev/null
+++ b/oying-common/src/main/java/com/oying/utils/enums/SendTypeEnum.java
@@ -0,0 +1,39 @@
+package com.oying.utils.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author xin
+ * @description
+ * @date 2025/7/15 15:37
+ */
+@Getter
+@AllArgsConstructor
+public enum SendTypeEnum {
+
+ LY("LY", "立研"),
+
+ UNKNOWN("UNKNOWN", "暂未开放");
+
+ private final String key;
+ private final String value;
+
+ public static SendTypeEnum find(String val) {
+ for (SendTypeEnum value : SendTypeEnum.values()) {
+ if (val.equals(value.getKey())) {
+ return value;
+ }
+ }
+ return UNKNOWN;
+ }
+
+ public static String getValue(String val) {
+ for (SendTypeEnum value : SendTypeEnum.values()) {
+ if (val.equals(value.getKey())) {
+ return value.getValue();
+ }
+ }
+ return UNKNOWN.getValue();
+ }
+}
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 1c4b0cb..84a8c76 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
@@ -19,10 +19,7 @@
import com.oying.modules.sh.domain.vo.ProductInfo;
import com.oying.modules.sh.service.*;
import com.oying.utils.*;
-import com.oying.utils.enums.GenerateEnum;
-import com.oying.utils.enums.OrderStatusEnum;
-import com.oying.utils.enums.PayStateEnum;
-import com.oying.utils.enums.PayTypeEnum;
+import com.oying.utils.enums.*;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -133,12 +130,13 @@
order.setOrderStatusDescribe(OrderStatusEnum.ZERO.getValue());
order.setOrderRemark(submit.getRemark() != null ? submit.getRemark() : "");
order.setOrderTime(submit.getDateTime());
+ order.setSendPrice(store.getDeliveryFee());
+ order.setSendType(SendTypeEnum.LY.getKey());
order.setUserId(SecurityUtils.getCurrentUserId());
order.setUsername(SecurityUtils.getCurrentUsername());
order.setStoreId(submit.getStoreId());
order.setStoreName(store.getStoreName());
order.setStoreLogo(store.getLogoImageUrl());
- order.setSendPrice(store.getDeliveryFee());
order.setOrderDescribe(DESCRIBE + submit.getStoreId());
order.setOriginalPrice(amount);
order.setPaidPrice(amount);
--
Gitblit v1.9.3