简税升级

jianshui-income/src/main/java/com/jianshui/income/service/impl/EleCheckInvoiceImpl.java

@@ -182,13 +182,15 @@ public class EleCheckInvoiceImpl implements ICheckInvoice {
             return new AjaxResult(Integer.parseInt(invoiceCheck.getCyjg()),invoiceCheck.getCyjgxx());
         }
 
-        // TODO: 2023/6/5 测试关闭
         // ：校验是否查询本企业发票
-        /*String xhfsbh = invoiceCheck.getXhfsbh() != null ? invoiceCheck.getXhfsbh() : "";
-        if(StrUtil.isEmpty(xhfsbh) || !companyservice.getSellertax().equals(xhfsbh)){
+        String xhfsbh = StrUtil.blankToDefault(invoiceCheck.getXhfsbh(), "");
+        String xhfmc = StrUtil.blankToDefault(invoiceCheck.getXhfmc(), "");
+        String sellerTax = companyservice.getSellertax();
+        String sellerName = companyservice.getSellername();
+        if (!sellerTax.equals(xhfsbh) || !StrUtil.equalsIgnoreCase(sellerName, xhfmc)) {
             log.info("单个发票校验非本企业发票：companyId=" + companyId + ",errorCode=" + invoiceCheck.getCyjg() + ",returnMessage=" + invoiceCheck.getCyjgxx());
             return new AjaxResult(34,"授权企业与所查询发票的购方不一致，请进行核实");
-        }*/
+        }
 
         // 更新成功处理返回数据
         return AjaxResult.success(result);