Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/component/TaiPingCrawlerCacheComponent.java
#	tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/component/TaiPingCrawlerRequestComponent.java

commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoiceRecordResult.java

@@ -45,6 +45,11 @@ public class InvoiceRecordResult extends PageRequest {
      */
     private String invoiceParty;
 
+    /**
+     * 开票类型  1、手续费  2、跟单费  3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
+     */
+    private String invoiceType;
+
     /**
      * 虚增金额
      */

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/component/ZiJinApiRequestComponent.java

@@ -369,7 +369,7 @@ public class ZiJinApiRequestComponent {
             Config config = new Config();
             // 这里假设 Redis 在本地6379端口，没有密码
             config.useSingleServer()
-                    .setAddress("redis://192.168.5.250:6379")
+                    .setAddress("redis://192.168.1.250:6379")
                     .setPassword("123456");
 
             RedissonClient redisson = Redisson.create(config);

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -310,7 +310,7 @@ public class ReceivableController {
     @Operation(summary = "跟单费开票")
     public HttpResult<InvoiceingResult> otherInvoicing(@RequestBody InsPlyIncomeInvoiceVO invoicingVo){
         // 开票类型  1、手续费  2、跟单费  3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
-        invoicingVo.setInvoiceType("2");
+        invoicingVo.setInvoiceType(invoicingVo.getInvoiceType());
         InvoiceingResult result = receivableService.addInvoicing(invoicingVo);
         if (Objects.nonNull(result)){
             return HttpResult.ok("开票成功",result);

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

@@ -3935,12 +3935,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         invoice.setId(IdGenerate.nextId());
         invoice.setCompanyId(vo.getCompanyId());
         // 发票类型：2-跟单费
-        invoice.setInvoiceType("2");
+        invoice.setInvoiceType(vo.getInvoiceType());
         invoice.setInvoiceNo(vo.getInvoiceNo());
         //  开票类型  1、手续费  2、跟单费  3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
-        if("1".equals(vo.getInvoiceType()) || "2".equals(vo.getInvoiceType())){
+        if(InvoiceTypeEnum.FEE_1.getCode().equals(vo.getInvoiceType()) || InvoiceTypeEnum.FEE_2.getCode().equals(vo.getInvoiceType())){
             invoice.setInvoiceRiskType("10");
-        }else if("5".equals(vo.getInvoiceType()) || "6".equals(vo.getInvoiceType())){
+        }else if(InvoiceTypeEnum.FEE_5.getCode().equals(vo.getInvoiceType()) || InvoiceTypeEnum.FEE_6.getCode().equals(vo.getInvoiceType())){
             invoice.setInvoiceRiskType("30");
         }else{
             invoice.setInvoiceRiskType("20");
@@ -4620,18 +4620,19 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 // 回款差额
                 action.setSettlementPaymentDifference(settlementPaymentDifference);
 
-                if ("2".equals(invoiceRecordQueryVo.getInvoiceType())) {
+                if (invoiceRecordQueryVo.getInvoiceTypes().contains(InvoiceTypeEnum.FEE_2.getCode())) {
                     LambdaQueryWrapper<InsFeeFollowOrder> insFeeFollowOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
                     insFeeFollowOrderLambdaQueryWrapper.eq(InsFeeFollowOrder::getYear, action.getYear());
                     insFeeFollowOrderLambdaQueryWrapper.eq(InsFeeFollowOrder::getMonth, action.getMonth());
                     insFeeFollowOrderLambdaQueryWrapper.eq(InsFeeFollowOrder::getPartnerCompanyId, action.getPartnerCompanyId());
+                    insFeeFollowOrderLambdaQueryWrapper.in(InsFeeFollowOrder::getInvoiceType, action.getInvoiceType());
                     List<InsFeeFollowOrder> insFeeFollowOrders = insFeeFollowOrderMapper.selectList(insFeeFollowOrderLambdaQueryWrapper);
                     if (CollUtil.isNotEmpty(insFeeFollowOrders)){
                         InsFeeFollowOrder insFeeFollowOrder = insFeeFollowOrders.stream().findAny().get();
                         // 开票金额
                         action.setReceivableAmount(insFeeFollowOrder.getReceivablePremium().toString());
                     }
-                }else if ("1".equals(invoiceRecordQueryVo.getInvoiceType())){
+                }else if (invoiceRecordQueryVo.getInvoiceTypes().contains(InvoiceTypeEnum.FEE_1.getCode())){
                     action.setReceivableAmount(action.getReceivableSupervisePremium().subtract(action.getOverinflatedAmount()).toString());
                 }
             }).toList();

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

@@ -1524,13 +1524,11 @@
             <if test="invoiceRecordQueryVo.partnerCompanyId != null and invoiceRecordQueryVo.partnerCompanyId != ''">
                 AND eic.id = #{invoiceRecordQueryVo.partnerCompanyId}
             </if>
+            <if test="invoiceRecordQueryVo.settlementStatus != null and invoiceRecordQueryVo.settlementStatus != '' and invoiceRecordQueryVo.settlementStatus != '30'">
+                AND ipii.status = #{invoiceRecordQueryVo.settlementStatus}
+            </if>
         </where>
-        <if test="invoiceRecordQueryVo.settlementStatus != null and invoiceRecordQueryVo.settlementStatus != ''">
-            HAVING CASE
-            WHEN ipii.receivable_supervise_premium = SUM(ipiis.actual_received_amount) THEN '1'
-            ELSE '0'
-            END = #{invoiceRecordQueryVo.settlementStatus}
-        </if>
+
         GROUP BY
         ipii.id,
         ipii.receivable_supervise_premium,