代码优化

ruoyi-api/ruoyi-api-order/src/main/java/org/dromara/order/api/RemoteOrderService.java

@@ -3,6 +3,8 @@ package org.dromara.order.api;
 import org.dromara.order.api.domain.OrderPay;
 import org.dromara.order.api.domain.RemoteOrder;
 import org.dromara.order.api.domain.RemoteSaveOrder;
+import org.dromara.order.api.enums.OrderType;
+import org.dromara.order.api.enums.Source;
 
 import java.util.List;
 
@@ -39,4 +41,14 @@ public interface RemoteOrderService {
      */
     boolean autoUpdateOrGetCertificate(String serialNumber) throws Exception;
 
+    /**
+     * 计算服务费
+     *
+     * @param source    来源
+     * @param orderType 订单类型
+     * @param feeList   费用列表
+     * @return 服务费
+     */
+    RemoteSaveOrder.Fee calcServiceFee(Source source, OrderType orderType, List<RemoteSaveOrder.Fee> feeList);
+
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteOrderServiceImpl.java

@@ -19,6 +19,8 @@ import org.dromara.order.api.domain.OrderPay;
 import org.dromara.order.api.domain.RemoteOrder;
 import org.dromara.order.api.domain.RemoteSaveOrder;
 import org.dromara.order.api.enums.OrderStatus;
+import org.dromara.order.api.enums.OrderType;
+import org.dromara.order.api.enums.Source;
 import org.dromara.order.constant.WechatTradeState;
 import org.dromara.order.domain.bo.OrderBo;
 import org.dromara.order.domain.bo.OrderFeeBo;
@@ -176,4 +178,9 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
     public boolean autoUpdateOrGetCertificate(String serialNumber) throws Exception {
         return wxPayService.autoUpdateOrGetCertificate(serialNumber);
     }
+
+    @Override
+    public RemoteSaveOrder.Fee calcServiceFee(Source source, OrderType orderType, List<RemoteSaveOrder.Fee> feeList) {
+        return IOrderServiceFeeStrategy.calcServiceFee(source, orderType, feeList);
+    }
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/OrderController.java

@@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.order.api.domain.OrderPay;
 import org.dromara.order.api.domain.RemoteOrder;
+import org.dromara.order.api.domain.RemoteSaveOrder;
 import org.dromara.order.api.enums.OrderType;
 import org.dromara.server.domain.vo.OrderPayVo;
 import org.dromara.server.domain.vo.OrderQueryVo;
@@ -46,4 +47,16 @@ public class OrderController {
         return R.ok(service.queryList(vo.getOrderType(), vo.getOrderNoList()));
     }
 
+    /**
+     * 获取费用信息
+     * @param vo vo
+     * @return 费用列表
+     */
+    @PostMapping("/calcFee")
+    public R<List<RemoteSaveOrder.Fee>> calcFee(@Validated @RequestBody OrderPayVo vo){
+        OrderType ot = OrderType.getEnum(vo.getOrderType());
+        return R.ok(service.calcFee(vo.getOrderNo(), ot));
+    }
+
+
 }

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

@@ -2,6 +2,7 @@ package org.dromara.server.service;
 
 import org.dromara.order.api.domain.OrderPay;
 import org.dromara.order.api.domain.RemoteOrder;
+import org.dromara.order.api.domain.RemoteSaveOrder;
 import org.dromara.order.api.enums.OrderType;
 
 import java.util.List;
@@ -30,4 +31,11 @@ public interface IPayOrderService {
      */
     List<RemoteOrder> queryList(String orderType, List<String> orderNoList);
 
+    /**
+     * 计算费用
+     * @param orderNo 订单号
+     * @param ot 订单类型
+     * @return 费用列表
+     */
+    List<RemoteSaveOrder.Fee> calcFee(String orderNo, OrderType ot);
 }

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

 package org.dromara.server.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.order.api.RemoteOrderService;
@@ -14,6 +15,7 @@ import org.dromara.server.service.IPayOrderService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,4 +47,19 @@ public class PayOrderServiceImpl implements IPayOrderService {
     public List<RemoteOrder> queryList(String orderType, List<String> orderNoList) {
         return remoteOrderService.queryList(orderType, orderNoList);
     }
+
+    @Override
+    public List<RemoteSaveOrder.Fee> calcFee(String orderNo, OrderType ot) {
+        RemoteSaveOrder order = IOrderStrategy.createOrder(orderNo, ot);
+        List<RemoteSaveOrder.Fee> feeList = order.getFeeList();
+        if (CollectionUtils.isEmpty(feeList)) {
+            return List.of();
+        }
+        RemoteSaveOrder.Fee fee = remoteOrderService.calcServiceFee(Source.YSH, ot, feeList);
+        if (fee != null) {
+            feeList = new ArrayList<>(feeList);
+            feeList.add(fee);
+        }
+        return feeList;
+    }
 }