核销表添加costApplyId

src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java

@@ -202,9 +202,6 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
         costApplyLambdaQueryWrapper.in(TbsCostApply::getChargeState,TbsCostApplyState.getPassCode());
         List<TbsCostApply> costApplyList = costApplyMapper.selectList(costApplyLambdaQueryWrapper);
 
-        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
-        actLqw.in(TbsActivity::getCostApplyId,costApplyList.stream().map(a->a.getId()).collect(Collectors.toList()));
-
         //申请总金额
         BigDecimal totalAmount = activityMapper.sumSupplierActivityCost(supplierId);
         if(totalAmount==null){
@@ -228,6 +225,8 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
                     VtbVerificationState.Finished.getCode(),
                     VtbVerificationState.Rollback.getCode(),
                     VtbVerificationState.Commiting.getCode());
+            veriLqw.in(VtbVerification::getCostApplyId,costApplyList.stream().map(a->a.getId()).collect(Collectors.toList()));
+
             List<VtbVerification> vtbVerificationList = verificationMapper.selectList(veriLqw);
             List<VtbVerification> finishedVeriList= vtbVerificationList.stream()
                     .filter(a->a.getVerificationState().equals(VtbVerificationState.Finished.getCode())).collect(Collectors.toList());
@@ -259,10 +258,14 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService {
             if(checkedAmt.compareTo(BigDecimal.ZERO)>0){
 
                 //已支付
-                PayPaymentItem payItemQuery = new PayPaymentItem();
-                payItemQuery.setCancelFlag(0);
-                payItemQuery.setSupplierId(Long.parseLong(supplierId));
-                List<PayPaymentItem> allPayList = payPaymentItemMapper.selectPayPaymentItemList(payItemQuery);
+//                PayPaymentItem payItemQuery = new PayPaymentItem();
+//                payItemQuery.setCancelFlag(0);
+//                payItemQuery.setSupplierId(Long.parseLong(supplierId));
+                LambdaQueryWrapper<PayPaymentItem> payLqw = new LambdaQueryWrapper<>();
+                payLqw.in(PayPaymentItem::getCostApplyId,costApplyList.stream().map(a->a.getId()).collect(Collectors.toList()));
+                payLqw.eq(PayPaymentItem::getCancelFlag,0);
+
+                List<PayPaymentItem> allPayList = payPaymentItemMapper.selectList(payLqw);
                 List<PayPaymentItem> payList = allPayList.stream().filter(a->a.getPayType().equals(PaymentType.PAYMENT)).collect(Collectors.toList());
                 List<PayPaymentItem> unPayList = allPayList.stream().filter(a->a.getPayType().equals(PaymentType.UN_PAYMENT)).collect(Collectors.toList());
 

src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java

@@ -39,6 +39,9 @@ public class VtbVerification implements Serializable {
     @TableField(condition = SqlCondition.LIKE)
     private String verificationCode;
 
+    /** 申请id */
+    private Long costApplyId;
+
     /** 活动id */
     private Long activityId;
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -275,6 +275,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setPayConditionId(verificationBo.getPayConditionId());
         verification.setVerificationCode("HX"+IdUtil.timeStampId());
         verification.setVerificationState(VtbVerificationState.Commiting.getCode());
+        verification.setCostApplyId(costApply.getId());
         verification.setActivityId(verificationBo.getActivityId());
         verification.setAttachIds(verificationBo.getAttachIds());
         verification.setSupplierId(activity.getSupplierId());