Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-08-10 53eece6b5c6845fd70155a101b2a9e567b59a421

 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);//添加到订单集合中