From 53eece6b5c6845fd70155a101b2a9e567b59a421 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 10 八月 2025 20:01:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index acbadd6..1726f68 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1491,6 +1491,17 @@
if (shop!=null){
order1.setShopId(shop.getId());
}
+ switch (payType){
+ case "微信支付":
+ order1.setPayMethod(1);
+ break;
+ case "积分支付":
+ order1.setPayMethod(3);
+ break;
+ case "组合支付":
+ order1.setPayMethod(4);
+ break;
+ }
order1.setDelFlag(0);
order1.setCreateTime(LocalDateTime.now());
orderList.add(order1);//添加到订单集合中
--
Gitblit v1.7.1