优化开票服务与拆分收费

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/sfgl/service/impl/YyQfmxServiceImpl.java

@@ -3896,7 +3896,8 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
         chargeTypes.forEach(type -> {
             initDetailByChargeType(type, original, chargeDetail);
         });
-
+        //重新赋值费用类型
+        setFylx(original,chargeDetail);
         BigDecimal tjysje = tjysje(chargeDetail);
         chargeDetail.setYsje(tjysje);
         log.info("部分缴费明细: ==============> {}", JSONUtil.toJsonStr(chargeDetail));
@@ -3919,6 +3920,72 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
         return yssf.add(yswsf).add(ysszyf).add(ysecjyf).add(ysfjf).add(ysqtf);
     }
 
+    private  void setFylx(YyQfmx original,YyQfmx chargeDetail){
+
+        StringBuilder sb=new StringBuilder();
+        if(chargeDetail.getYssf().compareTo(BigDecimal.ZERO)>0){
+            chargeDetail.setFylx("2");
+            chargeDetail.setFylxmc("基本水费");
+            sb.append("基本水费");
+        }
+
+        if (chargeDetail.getYswsf().compareTo(BigDecimal.ZERO) > 0) {
+            chargeDetail.setFylx("3");
+            chargeDetail.setFylxmc("污水费");
+            if(sb.length()>0)
+            {
+                sb.append("&");
+            }
+            sb.append("污水费");
+        }
+
+        if(chargeDetail.getYsszyf().compareTo(BigDecimal.ZERO)>0){
+            chargeDetail.setFylx("4");
+            chargeDetail.setFylxmc("水资源税");
+            if(sb.length()>0)
+            {
+                sb.append("&");
+            }
+            sb.append("水资源税");
+        }
+        if(chargeDetail.getYsecjyf().compareTo(BigDecimal.ZERO)>0){
+            chargeDetail.setFylx("18");
+            chargeDetail.setFylxmc("二次加压费");
+            if(sb.length()>0)
+            {
+                sb.append("&");
+            }
+            sb.append("二次加压费");
+        }
+        if(chargeDetail.getYsfjf().compareTo(BigDecimal.ZERO)>0){
+            chargeDetail.setFylx("19");
+            chargeDetail.setFylxmc("附加费");
+            if(sb.length()>0)
+            {
+                sb.append("&");
+            }
+            sb.append("附加费");
+        }
+        if(chargeDetail.getYsqt().compareTo(BigDecimal.ZERO)>0){
+            chargeDetail.setFylx("17");
+            chargeDetail.setFylxmc("消防栓");
+            if(sb.length()>0)
+            {
+                sb.append("&");
+            }
+            sb.append("消防栓");
+        }
+
+        if(sb.length()>0&&!StringUtils.isEmpty(sb.toString())){
+            //监测水费
+            if (sb.indexOf("基本水费") != -1) {
+                chargeDetail.setFylx("2");
+                original.setFylx("8");
+            }
+
+        }
+    }
+
     @Override
     public List<YyQfmx> selectQfmxBatch(List<String> yhbhs, String cwrq) {
         if (CollectionUtil.isEmpty(yhbhs)) {

dzfpkp-nst/src/main/java/com/tofly/dzfp/common/DzfpService.java

@@ -123,6 +123,10 @@ public class DzfpService {
                         jsonObject = RedInvoiceQuery(item.getNnwFplsh(), item.getLsbh());
                     }
                     if (StringUtil.isNull(jsonObject) || jsonObject.isEmpty()) {
+                        eiFpkjRequestService.lambdaUpdate()
+                                .set(EiFpkjRequest::getClLock, 0)
+                                .eq(EiFpkjRequest::getLsbh, item.getLsbh())
+                                .update();
                         xxjl(String.format("流水编号：[%s],没有获取到红字确认单相关记录！", item.getLsbh()));
                         continue;
                     }
@@ -579,6 +583,13 @@ public class DzfpService {
                     .set(EiFpkjRequest::getClRemessage, "")
                     .eq(EiFpkjRequest::getLsbh, orderNo)
                     .update();
+        }else {
+            eiFpkjRequestService.lambdaUpdate()
+                    .set(EiFpkjRequest::getClCljg, 2)
+                    .set(EiFpkjRequest::getClLock, 1)
+                    .set(EiFpkjRequest::getClRemessage, info.get("describe"))
+                    .eq(EiFpkjRequest::getLsbh, orderNo)
+                    .update();
         }
     }
 
@@ -915,11 +926,6 @@ public class DzfpService {
                             .update();
                 }
             }
-        } else {
-            eiFpkjRequestService.lambdaUpdate()
-                    .set(EiFpkjRequest::getClLock, 0)
-                    .eq(EiFpkjRequest::getLsbh, lsbh)
-                    .update();
         }
         return resultData;
     }