私有协议-我的发票。 点击详情，查看发票对对应的订单详情

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncomeInvoice.java

@@ -28,7 +28,7 @@ public class InsPlyIncomeInvoice extends BaseModel {
     private BigDecimal overinflatedAmount;
 
     @Schema(description = "应收项")
-    private String invoickRiskType;
+    private String invoiceRiskType;
 
     public BigDecimal getOverinflatedAmount(){
         return Objects.requireNonNullElse(this.overinflatedAmount, BigDecimal.ZERO);
@@ -38,10 +38,7 @@ public class InsPlyIncomeInvoice extends BaseModel {
     private BigDecimal receivableSupervisePremium;
 
     public BigDecimal getReceivableSupervisePremium(){
-        if(this.receivableSupervisePremium == null){
-            return BigDecimal.ZERO;
-        }
-        return this.receivableSupervisePremium;
+        return Objects.requireNonNullElse(this.receivableSupervisePremium, BigDecimal.ZERO);
     }
 
     @Schema(description = "税点")

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -505,15 +505,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             invoice.setInvoiceType(invoicingVo.getInvoiceType());
             // 开票类型  1 手续费  2 跟单费  3 驾意险手续费 4 驾意险跟单费
             if("1".equals(invoicingVo.getInvoiceType()) || "2".equals(invoicingVo.getInvoiceType())){
-                invoice.setInvoickRiskType("10");
+                invoice.setInvoiceRiskType("10");
             }else{
-                invoice.setInvoickRiskType("20");
+                invoice.setInvoiceRiskType("20");
             }
             invoice.setInvoiceParty(invoicingVo.getInvoiceParty());
             invoice.setOverinflatedAmount(invoicingVo.getOverinflatedAmount());
             invoice.setReceivableSupervisePremium(invoicingVo.getReceivablePremium());
             invoice.setTaxPoint(invoicingVo.getTaxPoint());
-            int insert = insPlyIncomeInvoiceMapper.insert(invoice);
+            insPlyIncomeInvoiceMapper.insert(invoice);
 
             List<InsPlyIncomeInvoiceLink> invoicingLinkList = new ArrayList();
 
@@ -529,6 +529,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             result.setSumPrice(invoicingVo.getReceivablePremium().toString());
             return result;
         } catch (Exception e) {
+            log.info("开票异常.invoicingVo=[{}]",JSONUtil.toJsonStr(invoicingVo), e);
             // 回滚事务
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return null;
@@ -1222,6 +1223,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 // 设置待结算金额
                 action.setRemainSettlementAmount(remainSettlementAmount);
                 action.setCompanyALlName(allCompanyHierarchyPaths.get(Objects.toString(action.getCompanyId(),"")));
+                action.setSettlementStatus(settlementStatusName);
             }).toList();
             invoiceRecordList.setRecords(records);
         }

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -127,10 +127,6 @@
         io.id = #{orderNo}
         AND
         io.order_status = #{orderStatus}
-        <if test="auditStatus != null and auditStatus != ''">
-            AND
-            ifa.audit_status = #{auditStatus}
-        </if>
     </select>
 
 
@@ -1070,17 +1066,13 @@
             ipii.update_by,
             eic.name as company_name,
             sum( ipiis.actual_received_amount ) AS actual_received_amount,
-            ipii.status,
-            CASE
-                WHEN ifnull(ipii.receivable_supervise_premium,0)  + ifnull(ipii.overinflated_amount,0) = SUM( ipiis.actual_received_amount ) THEN
-                    '已结清' ELSE '已开票未结算'
-                END AS settlement_status
+            ipii.status
         FROM
             ins_ply_income_invoice ipii
                 LEFT JOIN ins_ply_income_invoice_settlement ipiis ON ipii.id = ipiis.invoice_id
                 LEFT JOIN esm_ins_company eic on eic.id = ipii.company_id
         WHERE
-            1=1 AND ipii.is_delete = 0 AND ipiis.is_delete = 0 AND eic.is_delete = 0
+            1=1
         <if test="invoiceRecordQueryVo.invoiceType != null and invoiceRecordQueryVo.invoiceType != ''">
             AND ipii.invoice_type = #{invoiceRecordQueryVo.invoiceType}
         </if>
@@ -1107,7 +1099,7 @@
             ipii.receivable_supervise_premium,
             ipii.invoice_type,
             ipii.company_id,
-            ipii.invoice_party;
+            ipii.invoice_party
     </select>
 
     <!-- 基础结果集映射 -->