1

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

@@ -667,7 +667,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         // 兼容渠道报备客户
         if (null == taRecommendCustomer) {
-            ChannelCustomer customer = channelCustomerMapper.selectById(id);
+            LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,id);
+            ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
             BeanUtils.copyProperties(customer,taRecommendCustomer);
         }
 

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

@@ -8,6 +8,7 @@ import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.service.ITaRecommendCustomerService;
 import com.yunzhi.marketing.xlk.dto.*;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
@@ -40,6 +41,9 @@ public class ChannelCustomerController extends BaseController {
     @Autowired
     public IChannelCustomerService iChannelCustomerService;
 
+    @Autowired
+    ITaRecommendCustomerService taRecommendCustomerService;
+
     @Autowired
     private ITaPersonService taPersonService;
 
@@ -94,6 +98,7 @@ public class ChannelCustomerController extends BaseController {
     @ApiOperation(value = "admin-渠道报备客户审核", notes = "admin-渠道报备客户审核")
     @RequestMapping(value="/admin/channelCustomer/{id}",method= RequestMethod.PUT)
     public ResponseBean channelCustomerUpdate(@PathVariable String id,
+                                              @RequestHeader("authorization") String token,
                                         @RequestBody ChannelCustomerDTO channelCustomerDTO){
         return iChannelCustomerService.auditCustomer(id,channelCustomerDTO);
     }
@@ -164,11 +169,13 @@ public class ChannelCustomerController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "森哥看这里-admin-后台获取详情信息", notes = "森哥看这里-admin-后台获取详情信息")
     @RequestMapping(value="/admin/channelCustomer/{id}",method= RequestMethod.GET)
-    public ResponseBean channelCustomerGet(@PathVariable String id){
+    public ResponseBean channelCustomerGet(@PathVariable String id, @RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iChannelCustomerService.getById(id));
+            ChannelCustomer channelCustomer = iChannelCustomerService.getById(id);
+            responseBean.addSuccess(taRecommendCustomerService.getCustDetail(channelCustomer.getCustomerId()));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("channelCustomerDelete -=- {}",e.toString());

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -131,13 +131,8 @@
     </select>
     <select id="getNewCustomerDetail" resultType="com.yunzhi.marketing.xlk.vo.CustomerDetailVO">
         SELECT
-        <if test="params.type == 'day''">
-            date_format( t.create_date, '%d' ) as coordinate,
-        </if>
-        <if test="params.type == 'month''">
-            date_format( t.create_date, '%m' ) as coordinate,
-        </if>
-        COUNT(1) as customerNum
+            date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            COUNT(1) as customerNum
         FROM
         xlk_channel_customer t
         WHERE t.channel_id  = #{params.channelId}
@@ -149,22 +144,17 @@
         <if test="params.startDate == null or params.endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        <if test="params.type == 'day''">
+        <if test="params.type == 'day'">
             group by date_format( t.create_date, '%Y-%m-%d' )
         </if>
-        <if test="params.type == 'month''">
+        <if test="params.type == 'month'">
             group by date_format( t.create_date, '%Y-%m' )
         </if>
     </select>
     <select id="getSuccessCustomerDetail" resultType="com.yunzhi.marketing.xlk.vo.CustomerDetailVO">
         SELECT
-        <if test="params.type == 'day''">
-            date_format( t.create_date, '%d' ) as coordinate,
-        </if>
-        <if test="params.type == 'month''">
-            date_format( t.create_date, '%m' ) as coordinate,
-        </if>
-        COUNT(1) as customerNum
+            date_format( t.create_date, '%%Y-%m-%d' ) as coordinate,
+            COUNT(1) as customerNum
         FROM
         xlk_channel_customer t
         LEFT join ta_recommend_customer r on t.customer_id = r.customer_id
@@ -177,10 +167,10 @@
         <if test="params.startDate == null or params.endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        <if test="params.type == 'day''">
+        <if test="params.type == 'day'">
             group by date_format( t.create_date, '%Y-%m-%d' )
         </if>
-        <if test="params.type == 'month''">
+        <if test="params.type == 'month'">
             group by date_format( t.create_date, '%Y-%m' )
         </if>
     </select>

src/main/resources/mapper/xlk/CustomerVisitMapper.xml

@@ -19,13 +19,8 @@
     </select>
     <select id="getFollowCustomerDetail" resultType="com.yunzhi.marketing.xlk.vo.CustomerDetailVO">
         SELECT
-        <if test="params.type == 'day''">
-            date_format( t.create_date, '%d' ) as coordinate,
-        </if>
-        <if test="params.type == 'month''">
-            date_format( t.create_date, '%m' ) as coordinate,
-        </if>
-        COUNT(1) as customerNum
+            date_format( t.create_date, '%Y-%m-%d' ) as coordinate,
+            COUNT(1) as customerNum
         FROM
         xlk_channel_customer t
         INNER JOIN xlk_customer_visit v on t.customer_id = v.customer_id