功能优化

ruoyi-modules/ruoyi-server/pom.xml

@@ -87,6 +87,11 @@
             <artifactId>ruoyi-api-server</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api-order</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-idempotent</artifactId>

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IOrderStrategy.java

+package org.dromara.server.service;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.order.api.domain.RemoteSaveOrder;
+import org.dromara.order.api.enums.OrderType;
+
+/**
+ * 订单参数生成策略
+ *
+ * @author hzh
+ */
+public interface IOrderStrategy {
+
+    String BASE_NAME = "OrderStrategy";
+
+    /**
+     * 创建订单模型
+     *
+     * @param orderNo   订单编号
+     * @param orderType 订单类型
+     * @return 登录验证信息
+     */
+    static RemoteSaveOrder createOrder(String orderNo, OrderType orderType) {
+        // 授权类型和客户端id
+        String beanName = orderType.getType() + BASE_NAME;
+        if (!SpringUtils.containsBean(beanName)) {
+            throw new ServiceException("授权类型不正确!");
+        }
+        IOrderStrategy instance = SpringUtils.getBean(beanName);
+        return instance.createOrder(orderNo);
+    }
+
+    /**
+     * 创建订单模型
+     *
+     * @param orderNo 订单编号
+     * @return 创建订单模型
+     */
+    RemoteSaveOrder createOrder(String orderNo);
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/IPayOrderService.java

+package org.dromara.server.service;
+
+import org.dromara.order.api.enums.OrderType;
+
+/**
+ * 支付相关服务
+ * @author wenhe
+ */
+public interface IPayOrderService {
+
+    /**
+     * 创建订单
+     * @param orderNo 订单号
+     * @param orderType 订单类型
+     * @return 订单号
+     */
+    String createOrder(String orderNo, OrderType orderType);
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/AirportOrderStrategy.java

+package org.dromara.server.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.order.api.domain.RemoteSaveOrder;
+import org.dromara.server.service.IOrderStrategy;
+import org.springframework.stereotype.Service;
+
+/**
+ * 机场订单策略
+ *
+ * @author hzh
+ * @date 2024-12-06
+ **/
+@Slf4j
+@Service("AIRPORT" + IOrderStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AirportOrderStrategy implements IOrderStrategy {
+    @Override
+    public RemoteSaveOrder createOrder(String orderNo) {
+        return null;
+    }
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/ApplyServiceImpl.java

@@ -76,7 +76,7 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
     @Override
     public Boolean insertByBo(ApplyBo bo) {
         bo.setApplyUserId(LoginHelper.getUserId());
-        bo.setApplyName(LoginHelper.getUsername());
+        bo.setApplyName(LoginHelper.getLoginUser().getNickname());
         bo.setApplyTime(new Date());
         bo.setApplyDeptName(LoginHelper.getDeptName());
         bo.setStatus(ApplyStatus.WAIT_AUDIT.getCode());
@@ -104,7 +104,7 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
             throw new RuntimeException("该申请不是待审批状态，不能进行审批！");
         }
         bo.setApproveUserId(LoginHelper.getUserId());
-        bo.setApproveName(LoginHelper.getUsername());
+        bo.setApproveName(LoginHelper.getLoginUser().getNickname());
         bo.setApproveTime(new Date());
         applyApproveMapper.insert(MapstructUtils.convert(bo, ApplyApprove.class));
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/PayOrderServiceImpl.java

+package org.dromara.server.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.order.api.RemoteOrderService;
+import org.dromara.order.api.domain.RemoteSaveOrder;
+import org.dromara.order.api.enums.OrderType;
+import org.dromara.order.api.enums.Source;
+import org.dromara.server.service.IOrderStrategy;
+import org.dromara.server.service.IPayOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hzh
+ * @date 2024-12-06
+ **/
+@RequiredArgsConstructor
+@Service
+public class PayOrderServiceImpl implements IPayOrderService {
+
+    @DubboReference
+    private RemoteOrderService remoteOrderService;
+
+    @Override
+    public String createOrder(String orderNo, OrderType orderType) {
+        RemoteSaveOrder order = IOrderStrategy.createOrder(orderNo, orderType);
+        order.setSource(Source.YSH);
+        return null;
+    }
+}