1.修改状态

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -526,7 +526,10 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 .eq(PtlAgreementProductCostsNew::getProductId, productId)
                 .lt(PtlAgreementProductCostsNew::getCostsStartDate, formattedDateTime)
                 .gt(PtlAgreementProductCostsNew::getCostsEndDate, formattedDateTime)
-                .eq(PtlAgreementProductCostsNew::getIsAudit, "1")//查找审核已通过的
+                // 是有禁用
+                .gt(PtlAgreementProductCostsNew::getValidStatus, ValidStatus.AVS_1.getCode())
+                // 审核状态
+                .eq(PtlAgreementProductCostsNew::getIsAudit, AgreementProductCostsAuditStatus.COSTS_AUDIT_STATUS_1.getCode())
                 .orderBy(true, true, PtlAgreementProductCostsNew::getPriorityLevel));
 
         List<AgreementProductCosts> agreementProductCosts = new ArrayList<>();
@@ -536,7 +539,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             BeanUtils.copyProperties(news, productCosts);
             agreementProductCosts.add(productCosts);
         });
-        if (ptlAgreementProductCostsNews.size() > 0) {
+        if (!ptlAgreementProductCostsNews.isEmpty()) {
             List<PtlAgreementProductCostsAttrLink> list = ptlAgreementProductCostsAttrLinkService.list(new LambdaQueryWrapper<PtlAgreementProductCostsAttrLink>()
                     .in(PtlAgreementProductCostsAttrLink::getCostsId, ptlAgreementProductCostsNews.stream().map(PtlAgreementProductCostsNew::getId).collect(Collectors.toList())));
             agreementProductCosts.forEach(x -> {
@@ -2455,24 +2458,25 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         AssertionUtils.isEmpty(ptlAgreementProductCostsNew, "未查询到此协议");
         if (ValidStatus.AVS_0.getCode().equals(ptlAgreementProductCostsNew.getValidStatus())) {
             ptlAgreementProductCostsNew.setValidStatus(ValidStatus.AVS_1.getCode());
-            return HttpResult.ok("修改成功");
-        }
-        // 查询费用列表
-        List<InsFeeOrderNew> insFeeOrderNews = insFeeOrderNewService
-                .lambdaQuery()
-                .eq(InsFeeOrderNew::getCostsId, costsId)
-                .list();
+        } else {
+            // 查询费用列表
+            List<InsFeeOrderNew> insFeeOrderNews = insFeeOrderNewService
+                    .lambdaQuery()
+                    .eq(InsFeeOrderNew::getCostsId, costsId)
+                    .list();
+
+            List<String> insFeeOrderIdList = insFeeOrderNews.stream().map(InsFeeOrderNew::getCostsId).collect(Collectors.toList());
+            if (!insFeeOrderIdList.isEmpty()) {
+                // 修改订单二维码状态
+                insAreaCompanyService.lambdaUpdate()
+                        .set(InsAreaCompany::getCodeValidStatus, ValidStatus.AVS_0.getCode())
+                        .in(InsAreaCompany::getId, insFeeOrderIdList)
+                        .update();
+            }
 
-        List<String> insFeeOrderIdList = insFeeOrderNews.stream().map(InsFeeOrderNew::getCostsId).collect(Collectors.toList());
-        if (!insFeeOrderIdList.isEmpty()) {
-            // 修改订单二维码状态
-            insAreaCompanyService.lambdaUpdate()
-                    .set(InsAreaCompany::getCodeValidStatus, ValidStatus.AVS_0.getCode())
-                    .in(InsAreaCompany::getId, insFeeOrderIdList)
-                    .update();
+            ptlAgreementProductCostsNew.setValidStatus(ValidStatus.AVS_0.getCode());
         }
 
-        ptlAgreementProductCostsNew.setValidStatus(ValidStatus.AVS_0.getCode());
         boolean b = updateById(ptlAgreementProductCostsNew);
         AssertionUtils.isSucceed(b, "修改费用状态失败");
         return HttpResult.ok("修改成功");