承运结算单优化

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

@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -29,21 +28,6 @@ import java.util.Objects;
  */
 @Repository
 public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> implements SettlementDriverDetailDao {
-    @Override
-    public boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item) {
-        return update(lUdWrapper()
-                .eq(SettlementDriverDetail::getId, item.getId())
-                .set(SettlementDriverDetail::getInvoiceType, item.getInvoiceType())
-                .set(SettlementDriverDetail::getPrepayFreight, item.getPrepayFreight())
-                .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
-                .set(SettlementDriverDetail::getLoanFlag, item.getLoanFlag())
-                .set(SettlementDriverDetail::getLoanTypeFlag, item.getLoanTypeFlag())
-
-                .set(SettlementDriverDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
-                .set(SettlementDriverDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
-                .set(SettlementDriverDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
-        );
-    }
 
     @Override
     public boolean updateSettlementNo(SettlementDriverDetail item) {
@@ -54,23 +38,30 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
     }
 
     @Override
-    public boolean updateCompany(List<Integer> idList, Integer companyId, String companyShorterName, String companyGroupCode) {
+    public boolean updateClearSettlementNo(SettlementDriverDetail item) {
         return update(lUdWrapper()
-                .in(SettlementDriverDetail::getId, idList)
-                .set(SettlementDriverDetail::getInvoicingCompanyId, companyId)
-                .set(SettlementDriverDetail::getInvoicingCompanyShorterName, companyShorterName)
-                .set(SettlementDriverDetail::getInvoicingCompanyGroupCode, companyGroupCode)
+                .eq(SettlementDriverDetail::getId, item.getId())
+                .set(SettlementDriverDetail::getSettlementNo, item.getSettlementNo())
         );
     }
 
     @Override
-    public boolean updateInvoiceType(SettlementDriverDetail item) {
+    public boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item) {
         return update(lUdWrapper()
                 .eq(SettlementDriverDetail::getId, item.getId())
                 .set(SettlementDriverDetail::getInvoiceType, item.getInvoiceType())
+                .set(SettlementDriverDetail::getPrepayFreight, item.getPrepayFreight())
+                .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
+                .set(SettlementDriverDetail::getLoanFlag, item.getLoanFlag())
+                .set(SettlementDriverDetail::getLoanTypeFlag, item.getLoanTypeFlag())
+
+                .set(SettlementDriverDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
+                .set(SettlementDriverDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
+                .set(SettlementDriverDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
         );
     }
 
+
     @Override
     public boolean updateConvertOrdinary(SettlementDriverDetail item) {
         return update(lUdWrapper()
@@ -94,13 +85,7 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
         );
     }
 
-    @Override
-    public boolean updateClearSettlementNo(SettlementDriverDetail item) {
-        return update(lUdWrapper()
-                .eq(SettlementDriverDetail::getId, item.getId())
-                .set(SettlementDriverDetail::getSettlementNo, item.getSettlementNo())
-        );
-    }
+
 
     @Override
     public Optional<SettlementDriverDetail> getByChildNo(String childNo) {

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

@@ -44,6 +44,31 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         );
     }
 
+    @Override
+    public boolean updatePayStatus(SettlementOwnerDetail item) {
+        return update(lUdWrapper()
+                .eq(SettlementOwnerDetail::getId, item.getId())
+                .set(SettlementOwnerDetail::getPayStatus, item.getPayStatus())
+        );
+    }
+
+    @Override
+    public boolean updateSettlementNo(SettlementOwnerDetail item) {
+        return update(lUdWrapper()
+                .eq(SettlementOwnerDetail::getId, item.getId())
+                .set(SettlementOwnerDetail::getSettlementNo, item.getSettlementNo())
+        );
+    }
+
+    @Override
+    public boolean updateClearSettlementNo(SettlementOwnerDetail item) {
+        return update(lUdWrapper()
+                .eq(SettlementOwnerDetail::getId, item.getId())
+                .set(SettlementOwnerDetail::getSettlementNo, item.getSettlementNo())
+                .set(SettlementOwnerDetail::getSeparateRemark, item.getSeparateRemark())
+        );
+    }
+
     @Override
     public boolean updateConvertOrdinary(SettlementOwnerDetail item) {
         return update(lUdWrapper()
@@ -77,18 +102,14 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     }
 
     @Override
-    public boolean updatePayStatus(SettlementOwnerDetail item) {
-        return update(lUdWrapper()
-                .eq(SettlementOwnerDetail::getId, item.getId())
-                .set(SettlementOwnerDetail::getPayStatus, item.getPayStatus())
-        );
-    }
-
-    @Override
-    public boolean updateSettlementNo(SettlementOwnerDetail item) {
+    public boolean updatePreFreight(SettlementOwnerDetail item) {
         return update(lUdWrapper()
                 .eq(SettlementOwnerDetail::getId, item.getId())
-                .set(SettlementOwnerDetail::getSettlementNo, item.getSettlementNo())
+                .set(SettlementOwnerDetail::getInvoiceType, item.getInvoiceType())
+                .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())
+                .set(SettlementOwnerDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
+                .set(SettlementOwnerDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
+                .set(SettlementOwnerDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
         );
     }
 
@@ -108,18 +129,6 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         );
     }
 
-    @Override
-    public boolean updatePreFreight(SettlementOwnerDetail item) {
-        return update(lUdWrapper()
-                .eq(SettlementOwnerDetail::getId, item.getId())
-                .set(SettlementOwnerDetail::getInvoiceType, item.getInvoiceType())
-                .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())
-                .set(SettlementOwnerDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
-                .set(SettlementOwnerDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
-                .set(SettlementOwnerDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
-        );
-    }
-
     @Override
     public boolean updateInvoiceCompany(List<Integer> idList, Integer companyId, String companyShorterName, String companyGroupCode) {
         return update(lUdWrapper()
@@ -130,15 +139,6 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         );
     }
 
-    @Override
-    public boolean updateClearSettlementNo(SettlementOwnerDetail item) {
-        return update(lUdWrapper()
-                .eq(SettlementOwnerDetail::getId, item.getId())
-                .set(SettlementOwnerDetail::getSettlementNo, item.getSettlementNo())
-                .set(SettlementOwnerDetail::getSeparateRemark, item.getSeparateRemark())
-        );
-    }
-
     @Override
     public Optional<SettlementOwnerDetail> findById(Integer id) {
         return Optional.of(id)

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

@@ -18,19 +18,16 @@ import java.util.List;
  */
 public interface SettlementDriverDetailDao extends BaseDao<SettlementDriverDetailMapper, SettlementDriverDetail, Integer> {
 
-    boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item);
     boolean updateSettlementNo(SettlementDriverDetail item);
-    boolean updateCompany(List<Integer> idList, Integer companyId, String companyShorterName, String companyGroupCode);
-    boolean updateInvoiceType(SettlementDriverDetail item);
+    boolean updateClearSettlementNo(SettlementDriverDetail item);
+
+    boolean updateInvoiceTypeAndPrepayFreightFlag(SettlementDriverDetail item);
     boolean updateConvertOrdinary(SettlementDriverDetail item);
     boolean updatePreFreight(SettlementDriverDetail item);
 
-    boolean updateClearSettlementNo(SettlementDriverDetail item);
-
 
     Optional<SettlementDriverDetail> getByChildNo(String childNo);
 
-
     IPage<SettlementDriverDetail> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
 
     List<SettlementDriverDetail> listUnPay(LocalDateTime beginTime);

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

@@ -24,20 +24,20 @@ import java.util.List;
 public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailMapper, SettlementOwnerDetail, Integer> {
 
     boolean updateInvoiceTypeStatus(SettlementOwnerDetail item);
-    boolean updateConvertOrdinary(SettlementOwnerDetail item);
-    boolean updateInvoiceType(SettlementOwnerDetail item);
     boolean updatePayStatus(SettlementOwnerDetail item);
     boolean updateSettlementNo(SettlementOwnerDetail item);
+    boolean updateClearSettlementNo(SettlementOwnerDetail item);
+
+    boolean updateConvertOrdinary(SettlementOwnerDetail item);
+    boolean updateInvoiceType(SettlementOwnerDetail item);
+    boolean updatePreFreight(SettlementOwnerDetail item);
 
     boolean updateInvoiceStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("invoiceStatus")Integer invoiceStatus);
 
     boolean updateFinalPaymentStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("finalPaymentStatus")Integer finalPaymentStatus);
 
-    boolean updatePreFreight(SettlementOwnerDetail item);
-
     boolean updateInvoiceCompany(List<Integer> idList, Integer companyId, String companyShorterName, String companyGroupCode);
 
-    boolean updateClearSettlementNo(SettlementOwnerDetail item);
 
     Optional<SettlementOwnerDetail> findById(Integer id);