111

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -313,5 +313,5 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     IPage<TaRecommendCustomerPO> getMarkingCustList(IPage<TaRecommendCustomerPO> page,@Param("keywords") String keywords,@Param("buildingId") String buildingId);
 
-    IPage<TaRecommendCustomerPO> getCustomersRecommended(IPage<TaRecommendCustomerPO> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("startDate") LocalDateTime startDate,@Param("endDate") LocalDateTime endDate);
+    IPage<TaRecommendCustomer> getCustomersRecommended(IPage<TaRecommendCustomer> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("startDate") LocalDateTime startDate,@Param("endDate") LocalDateTime endDate);
 }

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -55,7 +55,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomerPO> getCustomersRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status);
+    IPage<TaRecommendCustomer> getCustomersRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status);
 
     IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status);
 

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -1367,26 +1367,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomerPO> getCustomersRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status) {
-
-//        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        // todo
-        // 此处可能不是 person_id 而是 recommend_person
-        IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber, pageSize);
-        IPage<TaRecommendCustomerPO> customersIRecommended = taRecommendCustomerMapper.getCustomersRecommended(page, customerId, status, orgId, taPersonBuildingList, startDate, endDate);
-        List<TaRecommendCustomerPO> records = customersIRecommended.getRecords();
-        records.forEach(e -> {
-            LambdaQueryWrapper<BuildingChannel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(BuildingChannel::getBuildingId,e.getBuildingId());
-            lambdaQueryWrapper.last("limit 1");
-            BuildingChannel buildingChannel = buildingChannelMapper.selectOne(lambdaQueryWrapper);
-
-            if (null != buildingChannel) {
-                Integer expirationDay = buildingChannel.getExpirationDate();
-                LocalDateTime expirationDate = e.getCreateDate().plusDays(expirationDay);
-                e.setExpirationDate(expirationDate);
-            }
-        });
+    public IPage<TaRecommendCustomer> getCustomersRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, LocalDateTime startDate,LocalDateTime endDate,Integer status) {
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        IPage<TaRecommendCustomer> customersIRecommended = taRecommendCustomerMapper.getCustomersRecommended(page, customerId, status, orgId, taPersonBuildingList, startDate, endDate);
         return customersIRecommended;
     }
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1041,20 +1041,8 @@ FROM
             and t.name like CONCAT('%',#{keywords}, '%')
         </if>
     </select>
-    <select id="getCustomersRecommended" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
-        select a.customer_id AS id,
-        a.NAME,
-        a.phone,
-        a.picture,
-        a.sex,
-        a.building_id AS buildingId,
-        "customer" AS type,
-        a.create_date as createDate,
-        a.realty_consultant AS consultant,
-        a.STATUS AS customerStatus,
-        NULL AS channelStatus,
-        b.avatarurl
-        from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
+    <select id="getCustomersRecommended" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">
+        select a.*,b.avatarurl from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
         where a.recommend_person = #{customerId}
         <if test="status != null and status !=''">
             and a.status = #{status}