fix：

1.增加商家结算导出

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/StatisticsBalanceOrderExcel.java

@@ -0,0 +1,186 @@
+package com.logpm.statistics.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.format.NumberFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 结算单导出
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class StatisticsBalanceOrderExcel implements Serializable {
+
+
+	@ExcelProperty(value = "结算单号")
+	private String balanceOrderNo; // 结算单号
+
+	@ExcelProperty(value = "品牌")
+	private String brand; // 品牌
+
+	@ExcelProperty(value = "运单号")
+	private String waybillNo; // 运单号
+
+	@ExcelProperty(value = "订单号")
+	private String orderCode; // 订单号
+
+	@ExcelProperty(value = "服务类型")
+	private String typeServiceName; // 服务类型
+//
+//	@ExcelProperty(value = "货物品类")
+//	private String productGoods; // 货物品类
+
+	@ExcelProperty(value = "结算总金额")
+	@NumberFormat("0.00")
+	private BigDecimal totalBalanceFee; // 结算总金额
+
+	@ExcelProperty(value = "总数量")
+	private Integer totalCount; // 总数量
+
+	@ExcelProperty(value = "总重量")
+	@NumberFormat("0.00")
+	private BigDecimal totalWeight; // 总重量
+
+	@ExcelProperty(value = "总体积")
+	@NumberFormat("0.00")
+	private BigDecimal totalVolume; // 总体积
+
+
+	@ExcelProperty(value = "收货单位")
+	private String consignee; // 收货单位
+
+	@ExcelProperty(value = "实际费用")
+	@NumberFormat("0.00")
+	private BigDecimal realTotalFee; // 实际费用
+
+	@ExcelProperty(value = "提货费")
+	@NumberFormat("0.00")
+	private BigDecimal pickupFee; // 提货费
+
+	@ExcelProperty(value = "运费")
+	@NumberFormat("0.00")
+	private BigDecimal freightFee; // 运费
+
+	@ExcelProperty(value = "仓库服务费")
+	@NumberFormat("0.00")
+	private BigDecimal warehouseServiceFee; // 仓库服务费
+
+	@ExcelProperty(value = "仓储费")
+	@NumberFormat("0.00")
+	private BigDecimal warehouseFee; // 仓储费
+
+	@ExcelProperty(value = "仓储管理费")
+	@NumberFormat("0.00")
+	private BigDecimal warehouseManageFee; // 仓储管理费
+
+	@ExcelProperty(value = "仓储分拣费")
+	@NumberFormat("0.00")
+	private BigDecimal warehouseSortingFee; // 仓储分拣费
+
+	@ExcelProperty(value = "仓储操作费")
+	@NumberFormat("0.00")
+	private BigDecimal warehouseOperatingFee; // 仓储操作费
+
+	@ExcelProperty(value = "配送费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryFee; // 配送费
+
+	@ExcelProperty(value = "配送服务费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryServiceFee; // 配送服务费
+
+	@ExcelProperty(value = "配送装卸费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryLoadingFee; // 配送装卸费
+
+	@ExcelProperty(value = "配送分拣费")
+	@NumberFormat("0.00")
+	private BigDecimal deliverySortingFee; // 配送分拣费
+
+	@ExcelProperty(value = "配送上楼费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryUpfloorFee; // 配送上楼费
+
+	@ExcelProperty(value = "配送平移费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryMoveFee; // 配送平移费
+
+	@ExcelProperty(value = "配送其他费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryOtherFee; // 配送其他费
+
+	@ExcelProperty(value = "超区费")
+	@NumberFormat("0.00")
+	private BigDecimal deliveryCrossingFee; // 超区费
+
+	@ExcelProperty(value = "安装费")
+	@NumberFormat("0.00")
+	private BigDecimal installFee; // 安装费
+
+	@ExcelProperty(value = "其他费")
+	@NumberFormat("0.00")
+	private BigDecimal otherFee; // 其他费
+
+	@ExcelProperty(value = "是否有售后")
+	private String aftersaleName; // 是否有售后
+
+	@ExcelProperty(value = "售后单号")
+	private String aftersaleOrder; // 售后单号
+
+	@ExcelProperty(value = "售后金额")
+	@NumberFormat("0.00")
+	private BigDecimal aftersalesFee; // 售后金额
+
+
+
+
+	@ExcelProperty(value = "结算状态")
+	private String balanceStatusName; // 0未结算 1部分结算 2已结算
+
+	@ExcelProperty(value = "已结算金额")
+	@NumberFormat("0.00")
+	private BigDecimal hasBalanceFee; // 已结算金额
+
+	@ExcelProperty(value = "未结算金额")
+	@NumberFormat("0.00")
+	private BigDecimal noBalanceFee; // 未结算金额
+
+	@ExcelProperty(value = "结算时间")
+	@DateTimeFormat("yyyy-MM-dd")
+	private Date balanceTime; // 结算时间
+
+	@ExcelProperty(value = "结算人")
+	private String balanceUserName; // 结算人
+
+	@ExcelProperty(value = "结算备注")
+	private String balanceRemark; // 结算备注
+
+	@ExcelProperty(value = "是否有异常结算")
+	private String abnormalBalanceStatusName; // 是否有异常结算
+
+	@ExcelProperty(value = "异常金额")
+	@NumberFormat("0.00")
+	private BigDecimal abnormalBalanceFee; // 异常金额
+
+	@ExcelProperty(value = "异常时间")
+	@DateTimeFormat("yyyy-MM-dd")
+	private Date abnormalTime; // 异常时间
+
+	@ExcelProperty(value = "异常确认人")
+	private String abnormalUserName; // 异常确认人
+
+	@ExcelProperty(value = "异常备注")
+	private String abnormalRemark; // 异常备注
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantBalanceController.java

@@ -1,21 +1,28 @@
 package com.logpm.statistics.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.statistics.dto.MerchantStatisticsDTO;
 import com.logpm.statistics.dto.StatisticsBalanceAbnormalDTO;
 import com.logpm.statistics.dto.StatisticsBalanceRecordDTO;
+import com.logpm.statistics.entity.TrunklineCarCostEntity;
 import com.logpm.statistics.service.IStatisticsBalanceOrderInfoService;
+import com.logpm.statistics.vo.StatisticsBalanceOrderExcel;
 import com.logpm.statistics.vo.StatisticsBalanceOrderInfoVO;
+import com.logpm.statistics.vo.TrunklineCarCostExcel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 @Slf4j
@@ -207,5 +214,17 @@ public class MerchantBalanceController {
 		}
 	}
 
+	@PostMapping("/export")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "商家结算成本导出", notes = "传入merchantStatisticsDTO")
+	public void export(@RequestBody MerchantStatisticsDTO merchantStatisticsDTO, HttpServletResponse response) {
+
+
+		List<StatisticsBalanceOrderExcel> statisticsBalanceOrderExcels = balanceOrderInfoService.pageListExport(merchantStatisticsDTO);
+		//导出ls
+		ExcelUtil.export(response, "商家结算成本", "商家结算成本", statisticsBalanceOrderExcels, StatisticsBalanceOrderExcel.class);
+	}
+
+
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java

@@ -1,6 +1,7 @@
 package com.logpm.statistics.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.statistics.dto.MerchantStatisticsDTO;
@@ -46,7 +47,7 @@ public class TrunklineCarCostController extends BladeController {
 	/**
 	 * 分页列表
 	 */
-	@PostMapping("/page")
+	@GetMapping("/page")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页", notes = "传入expenseDispatchWarehouseMonth")
 	public R<IPage<TrunklineCarCostEntity>> page(@ApiIgnore @RequestParam Map<String, Object> expenseDispatchPriceOverZone, Query query) {
@@ -68,10 +69,7 @@ public class TrunklineCarCostController extends BladeController {
 	public void export(@RequestBody  Map<String, Object> args, HttpServletResponse response) {
 
 
-		LambdaQueryWrapper<TrunklineCarCostEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		QueryWrapper<TrunklineCarCostEntity> lambdaQueryWrapper = Condition.getQueryWrapper(args, TrunklineCarCostEntity.class);
-		if(args.get("carsNoType") != null){
-			lambdaQueryWrapper.eq(TrunklineCarCostEntity::getCarsNoType, args.get("carsNoType"));
-		}
 		List<TrunklineCarCostEntity> ls = trunklineCarCostService.list(lambdaQueryWrapper);
 
 		List<TrunklineCarCostExcel> data = getTrunklineCarCostExcels(ls);
@@ -79,6 +77,7 @@ public class TrunklineCarCostController extends BladeController {
 		ExcelUtil.export(response, "干线车次费用", "干线车次费用", data, TrunklineCarCostExcel.class);
 	}
 
+
 	@NotNull
 	private static List<TrunklineCarCostExcel> getTrunklineCarCostExcels(List<TrunklineCarCostEntity> ls) {
 		List<TrunklineCarCostExcel> data = new ArrayList<>();

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsBalanceOrderInfoMapper.java

@@ -18,4 +18,6 @@ public interface StatisticsBalanceOrderInfoMapper extends BaseMapper<StatisticsB
     BigDecimal findHasBalanceFeeByBalanceOrderIds(@Param("balanceOrderIds") List<Long> balanceOrderIds);
 
 	void deleteBanlanceOrderByIds(@Param("balanceOrderIds") List<Long> balanceOrderIds);
+
+	List<StatisticsBalanceOrderInfoVO> pageListExport(@Param("param") MerchantStatisticsDTO merchantStatisticsDTO);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsBalanceOrderInfoMapper.xml

@@ -65,6 +65,58 @@
             #{item}
         </foreach>
     </select>
+    <select id="pageListExport" resultType="com.logpm.statistics.vo.StatisticsBalanceOrderInfoVO">
+        select *
+        from logpm_statistics_balance_order_info
+        where 1=1
+        <if test="param.waybillNo != null and param.waybillNo != ''">
+            and LOCATE(#{param.waybillNo},waybill_no) > 0
+        </if>
+        <if test="param.orderCode != null and param.orderCode != ''">
+            and LOCATE(#{param.orderCode},order_code) > 0
+        </if>
+        <if test="param.balanceOrderNo != null and param.balanceOrderNo != ''">
+            and LOCATE(#{param.balanceOrderNo},balance_order_no) > 0
+        </if>
+        <if test="param.balanceStatus != null ">
+            and balance_status = #{param.balanceStatus}
+        </if>
+        <if test="param.abnormalBalanceStatus != null ">
+            and abnormal_balance_status = #{param.abnormalBalanceStatus}
+        </if>
+        <if test="param.consignee != null ">
+            and consignee = #{param.consignee}
+        </if>
+        <if test="param.consignee != null ">
+            and consignee = #{param.consignee}
+        </if>
+        <if test="param.createTimeStart != null">
+            and create_time &gt;= #{param.createTimeStart}
+        </if>
+        <if test="param.createTimeEnd != null">
+            and create_time &lt;= #{param.createTimeEnd}
+        </if>
+        <if test="param.abnormalTimeStart != null">
+            and abnormal_time &gt;= #{param.abnormalTimeStart}
+        </if>
+        <if test="param.abnormalTimeEnd != null">
+            and abnormal_time &lt;= #{param.abnormalTimeEnd}
+        </if>
+        <if test="param.balanceTimeStart != null">
+            and balance_time &gt;= #{param.balanceTimeStart}
+        </if>
+        <if test="param.balanceTimeEnd != null">
+            and balance_time &lt;= #{param.balanceTimeEnd}
+        </if>
+        <if test="param.destinationWarehouseName != null">
+            and destination_warehouse_name = #{param.destinationWarehouseName}
+        </if>
+        and destination_warehouse_id in
+        <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
 
     <delete id="deleteBanlanceOrderByIds" >
         delete from logpm_statistics_balance_order_info

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IStatisticsBalanceOrderInfoService.java

@@ -5,6 +5,7 @@ import com.logpm.statistics.dto.MerchantStatisticsDTO;
 import com.logpm.statistics.dto.StatisticsBalanceAbnormalDTO;
 import com.logpm.statistics.dto.StatisticsBalanceRecordDTO;
 import com.logpm.statistics.entity.StatisticsBalanceOrderInfoEntity;
+import com.logpm.statistics.vo.StatisticsBalanceOrderExcel;
 import com.logpm.statistics.vo.StatisticsBalanceOrderInfoVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
@@ -30,4 +31,7 @@ public interface IStatisticsBalanceOrderInfoService extends BaseService<Statisti
 	void deleteBanlanceOrderByIds(List<Long> balanceOrderIds);
 
 	R enterBalance(StatisticsBalanceRecordDTO balanceRecordDTO);
+
+	List<StatisticsBalanceOrderExcel> pageListExport(MerchantStatisticsDTO merchantStatisticsDTO);
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsBalanceOrderInfoServiceImpl.java

@@ -13,11 +13,13 @@ import com.logpm.statistics.entity.*;
 import com.logpm.statistics.mapper.StatisticsBalanceOrderInfoMapper;
 import com.logpm.statistics.service.*;
 import com.logpm.statistics.vo.StatisticsBalanceAbnormalVO;
+import com.logpm.statistics.vo.StatisticsBalanceOrderExcel;
 import com.logpm.statistics.vo.StatisticsBalanceOrderInfoVO;
 import com.logpm.statistics.vo.StatisticsBalanceRecordVO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -329,4 +331,37 @@ public R findBalanceDetail(Long balanceOrderId) {
 	}
 
 
+	@Override
+	public List<StatisticsBalanceOrderExcel> pageListExport(MerchantStatisticsDTO merchantStatisticsDTO) {
+
+
+		List<StatisticsBalanceOrderExcel> result = new ArrayList<>();
+
+		List<Long> warehouseIds = warehouseClient.getWarehouseIds();
+		if(!warehouseIds.isEmpty()){
+			merchantStatisticsDTO.setWarehouseIds(warehouseIds);
+		}
+
+		List<StatisticsBalanceOrderInfoVO> dataList = baseMapper.pageListExport(merchantStatisticsDTO);
+		dataList.forEach(data ->{
+			StatisticsBalanceOrderExcel statisticsBalanceOrderExcel = BeanUtil.copy(data, StatisticsBalanceOrderExcel.class);
+            assert statisticsBalanceOrderExcel != null;
+            statisticsBalanceOrderExcel.setTypeServiceName(DistributionTypeConstant.getName(String.valueOf(data.getTypeService())));
+
+			statisticsBalanceOrderExcel.setAbnormalBalanceStatusName(1==data.getAbnormalBalanceStatus()?"是":"否");
+			statisticsBalanceOrderExcel.setAftersaleName(1==data.getIsAftersale()?"是":"否");
+
+			String balancesBalanceOName = "未结算";
+			if(data.getBalanceStatus()==2){
+				balancesBalanceOName = "已结算";
+			}else if(data.getBalanceStatus()==1){
+				balancesBalanceOName = "部分结算";
+			}
+			statisticsBalanceOrderExcel.setBalanceStatusName(balancesBalanceOName);
+			result.add(statisticsBalanceOrderExcel);
+
+		});
+
+		return result;
+	}
 }