结算单

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

@@ -111,7 +111,6 @@ public class CarrierSettlementOwnerController {
     @ApiOperation(value = "编辑结算单状态",notes = "<br>By:姜文业")
     @PostMapping("/updateStatusByOrderNo")
     public Result updateStatusByOrderNo(@RequestBody @Validated UpdateStatusParam param) {
-        log.info("履约服务进行结算单状态更改，参数{}", JSONUtil.parse(param));
         settlementOwnerService.updateStatusByOrderNo(param.getOrderNo(), param.getSettlementPeriodType(), param.getFromStatus(), param.getToStatus());
         return Result.ok();
     }

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

@@ -114,7 +114,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
     public void updateSettlementByChildNoList(List<String> childNoList) {
          update(lUdWrapper()
                 .in(SettlementOwnerDetail::getChildNo, childNoList)
-                .set(SettlementOwnerDetail::getInvoiceStatus, SettlementOwnerEnum.InvoiceStatus.INVOICED.getCode())
+                .set(SettlementOwnerDetail::getInvoiceStatus, SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())
         );
     }
 

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

@@ -113,7 +113,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(settlementOwnerDetail.getOrderGoodsNo()).get();
         if (Objects.equals(orderGoods.getSettlementAccountPeriod(),2)){  //月结
-
+            log.info("月结初始化货主结算单");
             LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getBeginMonthDate();
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodMonth(settlementOwnerDetail.getOrderNo(), settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 月结初始化
@@ -125,6 +125,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             }
         }
         else {
+            log.info("月结初始化货主结算单");
+
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodImmediate(settlementOwnerDetail.getOrderNo(), settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 拉运完成初始化
                 settlementNo = settlementPeriodImmediateInit(settlementOwnerDetail,ownerInfo);

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

@@ -143,7 +143,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 //
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
-
         settlementOwnerDetailDao.saveEntity(settlementOwnerDetail);
 
         return settlementOwnerDetail.getId();

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

@@ -489,7 +489,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 param.setOwnerMobile(mobile);
                 List<OwnerSettlementSyncParam.SettlementItem> settlementList = new LinkedList<>();
                 List<SettlementOwnerDetail> settlementOwnerDetailList = settlementOwnerDetailDao.getBySettlementNoAndInvoiceType(settlementNo,
-                        SettlementDriverEnum.InvoiceType.ONLINE.getCode(),SettlementOwnerEnum.InvoiceStatus.NOT_INVOICE.getCode());
+                        SettlementDriverEnum.InvoiceType.ONLINE.getCode(),SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode());
                 for (SettlementOwnerDetail settlementOwnerDetail : settlementOwnerDetailList) {
                     String childNo = settlementOwnerDetail.getChildNo();
                     OwnerSettlementSyncParam.SettlementItem  item = new OwnerSettlementSyncParam.SettlementItem();
@@ -531,7 +531,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNoList.get(0)).get();
         String settlementNo = settlementOwnerDetail.getSettlementNo();
         List<SettlementOwnerDetail> list = settlementOwnerDetailDao.getBySettlementNoAndInvoiceType(settlementNo,
-            SettlementOwnerEnum.InvoiceType.ONLINE.getCode(),SettlementOwnerEnum.InvoiceStatus.NOT_INVOICE.getCode());
+            SettlementOwnerEnum.InvoiceType.ONLINE.getCode(),SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode());
         if (CollectionUtil.isEmpty(list)) {
             log.info("开票结果回调查询当前结算单均已开完票,结算单信息为{}", settlementNo);
             return;