修改确认交货接口未进行绑定车辆释放

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementDriverController.java

@@ -36,6 +36,11 @@ public class CarrierSettlementDriverController {
         return Result.page(page.getRecords(),page.getTotal(),page.getPages());
     }
 
-
+    @ApiOperation(value = "批量结算车主结算单",notes = "<br>By:刘海泉")
+    @PostMapping("/updateBatchPayDriverSettlement")
+    public Result<Object> updateBatchPayDriverSettlement() {
+        //IPage<CarrierPageSettlementDriverVO> page  = settlementDriverService.updateBatchPayDriverSettlement(param);
+        return Result.ok();
+    }
 
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDetailDaoImpl.java

@@ -12,6 +12,8 @@ import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -65,4 +67,9 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
         query.orderByDesc(SettlementDriverDetail :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
+
+    @Override
+    public List<SettlementDriverDetail> listUnPay(LocalDateTime beginTime) {
+        return baseMapper.listUnPay(beginTime);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDetailDao.java

@@ -7,6 +7,9 @@ import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailPara
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 车主运单计费明细
@@ -23,4 +26,6 @@ public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetai
 
 
     IPage<SettlementDriverDetail> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
+
+    List<SettlementDriverDetail> listUnPay(LocalDateTime beginTime);
 }

performance-web/src/main/java/com/clx/performance/job/BreakContractSettlementJob.java

@@ -4,6 +4,7 @@ import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.service.breakcontract.BreakContractJobHandlerService;
 import com.clx.performance.utils.JobHandlerService;
+import com.msl.common.utils.DateUtils;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,24 +27,18 @@ public class BreakContractSettlementJob {
     private BreakContractJobHandlerService breakContractJobHandlerService;
 
     /**
-     * 违约结算单支付 (每10分钟)
-     * @Scheduled(cron = "0 0/10 * * * ?")
+     * 车主违约结算单支付 (每天凌晨2点)
      */
     @XxlJob("breakContractSettlementPay")
     public void breakContractSettlementPay() {
-
-        LocalDateTime beginTime = LocalDateTime.now().minusHours(1);
-
+        LocalDateTime beginTime = LocalDateTime.now().minusMonths(1);
+        log.info("查询未结算的车主违约结算单,查询开始时间:{}", DateUtils.formatDateTime(beginTime));
         jobHandlerService.handler("违约结算单-支付", ()->{
             List<BreakContractSettlementDriver> list = breakContractSettlementDriverDao.listUnpay(beginTime);
-            log.info("违约结算单支付，数量:{}", list.size());
-
+            log.info("车主违约结算单支付，数量:{}", list.size());
             for (BreakContractSettlementDriver item : list) {
-                jobHandlerService.subHandler("违约结算单-支付", item.getId(), breakContractJobHandlerService::pay);
+                jobHandlerService.subHandler("车主违约结算单-支付", item.getId(), breakContractJobHandlerService::pay);
             }
         });
-
     }
-
-
 }

performance-web/src/main/java/com/clx/performance/job/DriverSettlementJob.java

+package com.clx.performance.job;
+
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.service.settle.SettlementMqHandlerService;
+import com.clx.performance.utils.JobHandlerService;
+import com.msl.common.utils.DateUtils;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+public class DriverSettlementJob {
+
+    @Autowired
+    private JobHandlerService jobHandlerService;
+
+    @Autowired
+    private SettlementDriverDetailDao settlementDriverDetailDao;
+
+    @Autowired
+    private SettlementMqHandlerService settlementMqHandlerService;
+
+    /**
+     * 车主结算单支付 (每天凌晨2点)
+     */
+    @XxlJob("driverSettlementPay")
+    public void driverSettlementPay() {
+        LocalDateTime beginTime = LocalDateTime.now().minusMonths(1);
+        log.info("查询未结算的车主结算单,查询开始时间:{}", DateUtils.formatDateTime(beginTime));
+        jobHandlerService.handler("车主结算单-支付", ()->{
+            List<SettlementDriverDetail> list = settlementDriverDetailDao.listUnPay(beginTime);
+            log.info("车主结算单支付，数量:{}", list.size());
+            for (SettlementDriverDetail item : list) {
+                jobHandlerService.subHandler("车主结算单-支付", item, settlementMqHandlerService::paySettlementDriver);
+            }
+        });
+    }
+}

performance-web/src/main/java/com/clx/performance/job/OwnerBreakContractSettlementJob.java

@@ -45,17 +45,6 @@ public class OwnerBreakContractSettlementJob {
         }
     }
 
-    //定时处理货主违约结算任务  每日执行一次
-    @XxlJob("autoSettleOwnerBreakSettle")
-    public void autoSettleOwnerBreakSettle() {
-        try {
-
-        } catch (Exception e) {
-            log.warn("货主违约结算单系统自动结算，异常原因:{}",e);
-        }
-    }
-
-
 
 
 }

performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementDriverDetailMapper.java

@@ -2,9 +2,18 @@ package com.clx.performance.mapper.settle;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.sqlProvider.settle.SettlementDriverDetailSqlProvider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Mapper
 public interface SettlementDriverDetailMapper extends BaseMapper<SettlementDriverDetail> {
 
+
+    @SelectProvider(type = SettlementDriverDetailSqlProvider.class, method = "listUnPay")
+    List<SettlementDriverDetail> listUnPay(@Param("beginTime") LocalDateTime beginTime);
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -41,13 +41,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
-import java.util.UUID;
 
 @Slf4j
 @Service
@@ -207,7 +205,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 车主结算单自动支付
      */
-    private void paySettlementDriver(SettlementDriverDetail detail){
+    public void paySettlementDriver(SettlementDriverDetail detail){
         DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(detail.getDriverUserNo()).orElseThrow(ResultCodeEnum.FAIL);
         PayParam noCheckPwd = null ;
         if(detail.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0){

performance-web/src/main/java/com/clx/performance/service/settle/SettlementMqHandlerService.java

 package com.clx.performance.service.settle;
 
+import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.vo.mq.SettlementDetailAddMqParam;
 import com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam;
 
@@ -11,4 +12,6 @@ public interface SettlementMqHandlerService {
 
     void settlementDriverNotify(String childNo,Integer payType,String payErrorMsg);
 
+    void paySettlementDriver(SettlementDriverDetail detail);
+
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/SettlementDriverDetailSqlProvider.java

+package com.clx.performance.sqlProvider.settle;
+
+import com.clx.performance.enums.settle.SettlementDriverEnum;
+import org.apache.ibatis.jdbc.SQL;
+
+public class SettlementDriverDetailSqlProvider {
+
+
+    public String listUnPay() {
+        return new SQL(){{
+            SELECT("a.* ");
+            FROM("settlement_owner_detail a ");
+            LEFT_OUTER_JOIN("settlement_driver b on a.settlement_no = b.settlement_no");
+            WHERE("b.create_time >= #{beginTime}");
+            WHERE("b.status = " + SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
+            ORDER_BY("b.create_time");
+        }}.toString();
+    }
+
+}