diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 8384257e6..40eb3c82d 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -1076,7 +1076,7 @@ public class OrderService {
 			dto.setSubType(MemberWalletEnum.SUBTYPE_TOP_UP.getValue());
 			dto.setUpdatePrincipalBalance(amount);
 			memberBasicInfoService.updateMemberBalance(dto);
-		} else if (StringUtils.equals(type, ScenarioEnum.OCCUPY.getValue())) { // 占桩订单
+		} else if (StringUtils.equals(scenarioType, ScenarioEnum.OCCUPY.getValue())) { // 占桩订单
 			// 通过订单号查询出占桩订单信息
 			OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryByOccupyCode(orderCode);
 			// 订单状态改为 1-订单完成
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
index a71b2b7bd..f9732d9a3 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
@@ -4,17 +4,17 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.jsowell.adapay.dto.QueryPaymentConfirmDTO;
 import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
 import com.jsowell.adapay.service.AdapayService;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.page.PageResponse;
+import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
-import com.jsowell.pile.domain.ClearingBillInfo;
-import com.jsowell.pile.domain.PileBasicInfo;
 import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.domain.SettleOrderReport;
 import com.jsowell.pile.dto.GetClearingBillDTO;
@@ -24,15 +24,10 @@ import com.jsowell.pile.dto.SettleOrderReportDTO;
 import com.jsowell.pile.mapper.AdapayCallbackRecordMapper;
 import com.jsowell.pile.mapper.OrderBasicInfoMapper;
 import com.jsowell.pile.mapper.SettleOrderReportMapper;
-import com.jsowell.pile.service.ClearingWithdrawInfoService;
-import com.jsowell.pile.service.IPileMerchantInfoService;
-import com.jsowell.pile.service.IPileStationInfoService;
-import com.jsowell.pile.service.ISettleOrderReportService;
+import com.jsowell.pile.service.*;
 import com.jsowell.pile.vo.base.SplitSettleAmountVO;
 import com.jsowell.pile.vo.web.*;
 import lombok.extern.slf4j.Slf4j;
-import com.jsowell.pile.service.*;
-import com.jsowell.pile.vo.web.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -42,9 +37,10 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -80,8 +76,6 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
     @Autowired
     private ClearingBillInfoService clearingBillInfoService;
 
-    @Autowired
-    private IPileStationInfoService pileStationInfoService;
 
     /**
      * 查询结算订单报
@@ -475,7 +469,40 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
 
     @Override
     public Map<String, Object> queryUndividedOrder(SettleOrderReportDTO dto) {
-        return null;
+        Map<String, Object> resultMap = Maps.newHashMap();
+
+        SettleOrderReport orderReport = selectByStationIdAndDate(dto.getStationId(), dto.getTradeDate());
+        if (orderReport == null) {
+            throw new BusinessException("00300002", "查询站点订单日报为空");
+        }
+        String orderCodes = orderReport.getOrderCodes();
+        List<String> orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ","));
+        List<ClearingBillVO> clearingBillVOList = clearingWithdrawInfoService.selectWithdrawInfoByOrderCodeList(orderCodeList);
+        if (CollectionUtils.isEmpty(clearingBillVOList)) {
+            throw new BusinessException("00300005", "查询清分信息为空");
+        }
+        String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderReport.getMerchantId());
+        // clearing
+        List<ClearingBillVO> clearingList = Lists.newArrayList();
+        List<ClearingBillVO> unClearingList = Lists.newArrayList();
+        for (ClearingBillVO clearingBillVO : clearingBillVOList) {
+            String paymentId = clearingBillVO.getPaymentId();
+            QueryPaymentConfirmDTO build = QueryPaymentConfirmDTO.builder()
+                    .wechatAppId(wechatAppId)
+                    .paymentId(paymentId)
+                    .build();
+            QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build);
+            List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms();
+            if (!CollectionUtils.isEmpty(paymentConfirms)) {
+                clearingBillVO.setConfirmInfo(paymentConfirms.get(0));
+                clearingList.add(clearingBillVO);
+            } else {
+                unClearingList.add(clearingBillVO);
+            }
+        }
+        resultMap.put("clearingList", clearingList);
+        resultMap.put("unClearingList", unClearingList);
+        return resultMap;
     }
 
     /**