批量加价页面的订单列表返回订单额外费用数据

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -1062,6 +1062,30 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         return orderMapper.selectList(query);
     }
 
+    @Override
+    public List<OrderMarkupVO> shipmentBatchMarkupOrderList(OrderQueryVO query) {
+        if (Objects.isNull(query.getLang())) {
+            query.setLang(I18nMessage.getLang());
+        }
+        log.warn(I18nMessage.getLang().toString());
+        List<OrderMarkupVO> list = orderMapper.shipmentBatchMarkupOrderList(query);
+        if (CollectionUtil.isNotEmpty(list)) {
+            // 需要将商品信息中的特价状态做判断处理，保存到订单信息中
+            for (OrderMarkupVO orderMarkupVO : list) {
+                if (CollectionUtil.isNotEmpty(orderMarkupVO.getOrderItemBackVOList())) {
+                    // 为订单添加最早入仓时间和最后入仓时间值
+                    orderMarkupVO.setFirstInTime(orderMarkupVO.getOrderItemBackVOList().stream().min(Comparator.comparing(OrderItemBackVO::getFirstInTime)).get().getFirstInTime());
+                    orderMarkupVO.setLastInTime(orderMarkupVO.getOrderItemBackVOList().stream().max(Comparator.comparing(OrderItemBackVO::getLastInTime)).get().getLastInTime());
+                    // 当订单项产品有任何一个有特价标记时，那么订单标记为特价
+                    orderMarkupVO.setSpecialPriceType(orderMarkupVO.getOrderItemBackVOList().stream().anyMatch(item -> item.getSpecialPriceType() || item.getSplitCustomPriceType() || item.getSpecialCommission() || item.getChannelManualPricing()));
+                }
+                // 额外费用
+                orderMarkupVO.setExtraCosts(receivableService.getExtraReceivableByOrderId(orderMarkupVO.getOrderId()));
+            }
+        }
+        return list;
+    }
+
     @Override
     public PageResult<OrderBackPageVO> orderPage(OrderQueryVO query, PageVO page) {
         if (Objects.isNull(query.getLang())) {

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/mysql/receivable/ReceivableMapper.java

@@ -354,4 +354,6 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
     List<Long> getAllBoxId();
 
     List<Long> getDestWarehouseIdListByDestCity(@Param("destCity") List<Long> destCity);
+
+    List<ReceivableBackVO> getExtraReceivableByOrderId(@Param("orderId") Long orderId);
 }

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receivable/ReceivableService.java

@@ -144,6 +144,15 @@ public interface ReceivableService extends IService<ReceivableDO> {
      */
     List<ReceivableBackVO> getReceivableByOrderId(Long orderId);
 
+
+    /**
+     * 根据订单id获得额外应收款(注：订单本身计算得出的运费、清关费、保价费除外的其他费用都属于额外费用)
+     *
+     * @param orderId 订单ID
+     * @return 应收款列表
+     */
+    List<ReceivableBackVO> getExtraReceivableByOrderId(Long orderId);
+
     /**
      * 获得应收款列表, 用于 Excel 导出
      *

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receivable/ReceivableServiceImpl.java

@@ -323,6 +323,10 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
         return receivableBackVOList;
     }
 
+    @Override
+    public List<ReceivableBackVO> getExtraReceivableByOrderId(Long orderId) {
+        return receivableMapper.getExtraReceivableByOrderId(orderId);
+    }
 
     @Override
     public List<ReceivableDO> getReceivableList(ReceivableQueryVO query) {

yudao-module-wealth/yudao-module-wealth-rest/src/main/resources/mapper/receivable/ReceivableMapper.xml

@@ -705,4 +705,12 @@
         </if>
         GROUP BY r.id
     </select>
+    <select id="getExtraReceivableByOrderId"
+            resultType="cn.iocoder.yudao.module.wealth.vo.receivable.ReceivableBackVO">
+        SELECT r.*
+        FROM ecw_receivable r
+        WHERE r.deleted = 0
+        AND r.fee_source > 1
+        AND r.order_id = #{orderId}
+    </select>
 </mapper>