111

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

@@ -33,4 +33,10 @@ public class TaRecommendCustomerPO {
      * 过了保护期的时间
      */
     private LocalDateTime expirationDate;
+
+    private String recommendPerson;
+
+    private String recommendPersonName;
+
+    private String recommendPersonPhone;
 }

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

@@ -137,6 +137,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private CustomerSignatoryMapper customerSignatoryMapper;
 
+    @Autowired
+    private TaBuildingApartmentMapper taBuildingApartmentMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -467,6 +470,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 查询出此楼盘下的职业顾问
         IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber,pageSize);
         IPage<TaRecommendCustomerPO> result = taRecommendCustomerMapper.getMarkingCustList(page, keywords,buildingId);
+        List<TaRecommendCustomerPO> records = result.getRecords();
+        records.forEach(e -> {
+            TaPerson recommendPerson = taPersonMapper.selectById(e.getRecommendPerson());
+            if (null != recommendPerson) {
+                e.setRecommendPersonName(recommendPerson.getName());
+                e.setRecommendPersonPhone(recommendPerson.getPhone());
+            }
+        });
         return ResponseBean.success(result);
     }
 
@@ -713,6 +724,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             LambdaQueryWrapper<CustomerSignatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
             List<CustomerSignatory> customerSignatories = customerSignatoryMapper.selectList(lambdaQueryWrapper);
+            customerSignatories.forEach(e -> {
+                TaBuildingApartment taBuildingApartment = taBuildingApartmentMapper.selectById(e.getHouseType());
+                e.setBuildingApartment(taBuildingApartment);
+            });
             taRecommendCustomerVO.setCustomerSignatory(customerSignatories);
         }
 

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -203,6 +203,24 @@ public class ChannelCustomerController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 根据id查询对象
+     * @param customerId  实体ID
+     */
+    @ApiOperation(value = "森哥看这里-admin-后台获取详情信息", notes = "森哥看这里-admin-后台获取详情信息")
+    @RequestMapping(value="/admin/customer/detail/{customerId}",method= RequestMethod.GET)
+    public ResponseBean detailCustomerGet(@PathVariable String customerId, @RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = taRecommendCustomerService.getCustDetail(customerId);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelCustomerDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 
     /**
      * 根据id查询对象

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerSignatory.java

@@ -1,8 +1,10 @@
 package com.yunzhi.marketing.xlk.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.entity.TaBuildingApartment;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -97,25 +99,14 @@ public class CustomerSignatory implements Serializable {
      */
     private String houseType;
 
-    /**
-     * 栋
-     */
-    private String ridgepole;
-
-    /**
-     * 单元
-     */
-    private String unit;
-
-    /**
-     * 室
-     */
-    private String room;
+    /** 房屋信息 */
+    private String houseInfo;
 
     /**
      * 金额
      */
     private String price;
 
-
+    @TableField(exist = false)
+    private TaBuildingApartment buildingApartment;
 }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1003,7 +1003,8 @@ FROM
             t.building_id as buildingId,
             t.realty_consultant as consultant,
             t.status as customerStatus,
-            null as channelStatus
+            null as channelStatus,
+            t.recommend_person
         FROM
             ta_recommend_customer t
 --         INNER JOIN ta_person p ON t.recommend_person = p.person_id
@@ -1023,12 +1024,14 @@ FROM
             "report" AS type,
             null as buildingId,
             null as consultant,
-            null as customerStatus,
-            status as channelStatus
+            1 as customerStatus,
+            null as channelStatus,
+            recommend_person
         FROM
             xlk_channel_customer
         WHERE
             building_id = #{buildingId}
+        and status = 1
         <if test="keywords != null and keywords !=''">
             and name like CONCAT('%',#{keywords}, '%')
         </if>