V1.0.7修改

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java

@@ -27,9 +27,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
+import java.util.stream.Collectors;
-import java.util.List;
 
 /**
  * 保存发票查验结果业务处理实现类
@@ -296,6 +295,8 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                 String invoiceNo = queryInvoiceResult.getString("invoiceNo");
                 String uuid = invoiceCode == null ? invoiceNo : invoiceCode + invoiceNo;
                 List<TDxRecordInvoiceDetail> invoiceDetailList = new ArrayList<>(dataArray.size());
+
+                ArrayList<String> taxRateArr = new ArrayList<>();
                 for (int i = 0; i < dataArray.size(); i++) {
                     JSONObject invoiceDetailQuery = dataArray.getJSONObject(i);
                     TDxRecordInvoiceDetail invoiceDetail = new TDxRecordInvoiceDetail();
@@ -327,13 +328,14 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                         }
                     }
                     invoiceDetail.setTaxRate(rate);
-                    if(StringUtils.isNotEmpty(invoiceDetailQuery.getString("taxRate")) && !taxRate.contains(invoiceDetailQuery.getString("taxRate"))) {
+                    taxRateArr.add(invoiceDetailQuery.getString("taxRate"));
-                        if(i == dataArray.size() -1) {
+//                    if(StringUtils.isNotEmpty(invoiceDetailQuery.getString("taxRate")) && !taxRate.contains(invoiceDetailQuery.getString("taxRate"))) {
-                            taxRate = taxRate + invoiceDetailQuery.getString("taxRate");
+//                        if(i == dataArray.size() -1) {
-                        }else{
+//                            taxRate = taxRate + invoiceDetailQuery.getString("taxRate");
-                            taxRate = taxRate + invoiceDetailQuery.getString("taxRate") + ",";
+//                        }else{
-                        }
+//                            taxRate = taxRate + invoiceDetailQuery.getString("taxRate") + ",";
-                    }
+//                        }
+//                    }
                     if(invoiceDetailQuery.getString("taxRate") != null){
                         invoiceDetail.setTaxCode(getZSM(invoiceDetailQuery.getString("taxRate")));
                     }
@@ -348,6 +350,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
                     }
                     invoiceDetailList.add(invoiceDetail);
                 }
+                taxRate = taxRateArr.stream().distinct().collect(Collectors.joining(","));
                 return invoiceDetailList;
             } else {
                 return null;