CID订单统计增加获客助手筛选条件

fs-admin/src/main/java/com/fs/company/controller/CompanyStatisticsController.java

@@ -5,6 +5,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.exception.CustomException;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.TimeUtils;
 import com.fs.common.utils.poi.ExcelUtil;
@@ -29,13 +30,17 @@ import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.service.IFsStorePaymentService;
 import com.fs.his.vo.FsStoreOrderStatsRowVo;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
+import com.fs.qw.domain.QwAcquisitionAssistant;
+import com.fs.qw.service.IQwAcquisitionAssistantService;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -75,6 +80,9 @@ public class CompanyStatisticsController extends BaseController
     //CID统计接口Service
     @Autowired
     private ICompanyStatisticsCIDService statisticsCIDService;
+
+    @Autowired
+    private IQwAcquisitionAssistantService qwAcquisitionAssistantService;
     @GetMapping("/storeOrder")
     public R storeOrder(FsStoreStatisticsParam param)
     {
@@ -711,4 +719,22 @@ public class CompanyStatisticsController extends BaseController
         List<SalesUserDetailCIDVO> list = statisticsCIDService.getSalesUserDetailCID(param);
         return getDataTable(list);
     }
+
+    /**
+     * CID订单统计，根据企微主体获取获客助手列表信息
+     * */
+    @PostMapping("/salesStat/{corpId}")
+    public AjaxResult salesStat(@PathVariable("corpId") String corpId) {
+        if (corpId== null) {
+            throw new CustomException("主体id为空");
+        }
+        QwAcquisitionAssistant queryCondition = new QwAcquisitionAssistant();
+        queryCondition.setCorpId(corpId);
+        List<QwAcquisitionAssistant> qwAcquisitionAssistants = qwAcquisitionAssistantService.selectQwAcquisitionAssistantList(queryCondition);
+        if (CollectionUtils.isEmpty(qwAcquisitionAssistants)){
+            return AjaxResult.success(Collections.emptyList());
+        }else {
+            return AjaxResult.success(qwAcquisitionAssistants);
+        }
+    }
 }

fs-service/src/main/java/com/fs/company/param/SalesStatCIDParam.java

@@ -12,6 +12,7 @@ public class SalesStatCIDParam {
     private String corpId; //主体id qw_user.corp_id
     private String qwUserName; //企微用户名 qw_user.qw_user_name 模糊匹配
     private String companyUserName;
+    private Long qwAcquisitionAssistantId;//获客链接主键id
     private String startAddTime;    // 进粉开始时间
     private String endAddTime;      // 进粉结束时间
     private String startOrderTime;  // 下单开始时间

fs-service/src/main/resources/mapper/company/CompanyStatisticsCIDMapper.xml

@@ -43,6 +43,9 @@
         <if test="param.startAddTime != null and param.endAddTime != null">
             AND ec.create_time BETWEEN #{param.startAddTime} AND #{param.endAddTime}
         </if>
+        <if test="param.qwAcquisitionAssistantId != null">
+            AND ec.qw_acquisition_assistant_id = #{param.qwAcquisitionAssistantId}
+        </if>
         GROUP BY qu.company_user_id
         ) fc ON fc.company_user_id = cu.user_id
 
@@ -138,6 +141,9 @@
         <if test="param.startAddTime != null and param.endAddTime != null">
             AND ec.create_time BETWEEN #{param.startAddTime} AND #{param.endAddTime}
         </if>
+        <if test="param.qwAcquisitionAssistantId != null">
+            AND ec.qw_acquisition_assistant_id = #{param.qwAcquisitionAssistantId}
+        </if>
         WHERE qu2.company_user_id IN (
         SELECT cu2.user_id FROM company_user cu2
         WHERE cu2.del_flag = '0'