郑多燕商城订单维度统计新增在途单数，在途金额，结算金额统计

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3629,7 +3629,16 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
     @Override
     public List<OrderStatisticsVo> selectZDYOrderSaleStatisticsList(OrderStatisticsParam param) {
-        return fsStoreOrderMapper.selectZDYOrderSaleStatisticsList(param);
+        List<OrderStatisticsVo> vos = fsStoreOrderMapper.selectZDYOrderSaleStatisticsList(param);
+        if (!CollectionUtils.isEmpty(vos)) {
+            for (OrderStatisticsVo vo : vos) {
+                BigDecimal tNum = NumberUtil.sub(vo.getTotalNum(), NumberUtil.add(vo.getSignForNum(), vo.getChargebackNum()));
+                vo.setTransitNum(tNum.longValue());
+                BigDecimal tPrice = NumberUtil.sub(vo.getTotalPrice(), NumberUtil.add(vo.getChargebackPrice(), vo.getSignFPrice()));
+                vo.setTransitPrice(tPrice);
+            }
+        }
+        return vos;
     }
 
     @Override

fs-service/src/main/java/com/fs/hisStore/vo/OrderStatisticsVo.java

@@ -147,4 +147,22 @@ public class OrderStatisticsVo implements Serializable {
      * 企业ID
      * **/
     private Long companyId;
+
+    /**
+     * 结算金额（郑多燕 已完成 代收+实收）
+     */
+    @Excel(name = "结算金额", sort = 18, width = 20)
+    private BigDecimal settlementPrice;
+
+    /**
+     * 在途订单数量
+     */
+    @Excel(name = "在途订单数量", sort = 19, width = 20)
+    private Long transitNum;
+
+    /**
+     * 在途订单金额
+     */
+    @Excel(name = "在途订单金额", sort = 20, width = 20)
+    private BigDecimal transitPrice;
 }