个贷模版认领实收款bug修复

dao/src/main/resources/mapper/PersonalMapper.xml

@@ -492,7 +492,7 @@
         pt.acreage,
         pt.price,
         pt.amount,
-        pt.created AS valueTiming,
+        ps.created AS valueTiming,
         found.real_amount,
         cc1.NAME AS clientName,
         cc2.NAME AS clientSubName,
@@ -518,6 +518,7 @@
         f.business_type = 'PERSONAL_BUSINESS'
         AND f.deleted = 0
         ) found ON found.business_id = p.id
+        left join (select personal_id, created  from personal_scene) ps on ps.personal_id = p.id
         LEFT JOIN (select id,name from customer_company where deleted=0) cc1 ON cc1.id = p.clientele_id
         LEFT JOIN (select id,name from customer_company where deleted=0) cc2 ON cc2.id = p.clientele_sub_id
         LEFT JOIN (select id,name,mobile from customer_linkman where deleted = 0) cl1 ON cl1.id = p.clientele_contact_id
@@ -596,6 +597,7 @@
         f.business_type = 'PERSONAL_BUSINESS'
         AND f.deleted = 0
         ) found ON found.business_id = p.id
+        left join (select personal_id, created  from personal_scene) ps on ps.personal_id = p.id
         LEFT JOIN (select id,name from customer_company where deleted=0) cc1 ON cc1.id = p.clientele_id
         LEFT JOIN (select id,name from customer_company where deleted=0) cc2 ON cc2.id = p.clientele_sub_id
         LEFT JOIN (select id,name,mobile from customer_linkman where deleted = 0) cl1 ON cl1.id = p.clientele_contact_id

service/src/main/java/com/dayou/service/impl/FinanceClaimServiceImpl.java

@@ -38,6 +38,8 @@ import java.util.stream.Collectors;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import static com.dayou.enums.MainBusinessEnum.PERSONAL_BUSINESS;
+
 /**
  * <p>
  * 实收款认领 服务实现类
@@ -274,13 +276,16 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
         }
         personalClaimDTOS.stream().forEach(x->{
             //检查该订单是否创建应收款记录
-            OrderFund orderFund = orderFundService.getOne(new LambdaQueryWrapper<OrderFund>().eq(OrderFund::getOrderId, x.getOrderId()).eq(BaseEntity::getDeleted, Boolean.FALSE));
+            OrderFund orderFund = orderFundService.getOne(new LambdaQueryWrapper<OrderFund>()
+                    .eq(OrderFund::getOrderId, x.getOrderId())
+                    .eq(BaseEntity::getDeleted, Boolean.FALSE)
+                    .eq(OrderFund::getBusinessType,PERSONAL_BUSINESS.name()));
             if (orderFund==null){
                 Personal personal = personalService.getOne(new LambdaQueryWrapper<Personal>().select(BaseEntity::getId, Personal::getLocation).eq(Personal::getOrderId, x.getOrderId()).eq(BaseEntity::getDeleted, Boolean.FALSE));
                 if (personal!=null){
                     orderFund = new OrderFund();
                     orderFund.setOrderId(x.getOrderId());
-                    orderFund.setBusinessType(MainBusinessEnum.PERSONAL_BUSINESS.name());
+                    orderFund.setBusinessType(PERSONAL_BUSINESS.name());
                     orderFund.setBusinessId(personal.getId());
                     orderFund.setOrderName(personal.getLocation());
                     orderFundService.save(orderFund);