yumeng před 10 měsíci
rodič
revize
ddf1426ce3

+ 4 - 1
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangDingPanController.java

@@ -456,7 +456,7 @@ public class JiaoYangDingPanController extends BaseController {
     // 分达人数据
     @GetMapping("/getPromoterList")
     @ApiOperation(value = "切片盯盘-成员数据")
-    public JSONObject getPromoterList(Long userId, String startDate, String endDate) {
+    public JSONObject getPromoterList(Long userId, String startDate, String endDate, Integer promoterType) {
         Map<String, Object> requestMap = new HashMap<>();
         JSONObject returnJson = new JSONObject();
         try {
@@ -492,6 +492,9 @@ public class JiaoYangDingPanController extends BaseController {
             if (!Check.isNull(promoterIds)) {
                 requestMap.put("promoterIds", promoterIds);
             }
+            if (promoterType != 0) {
+                requestMap.put("promoterType", promoterType);
+            }
             Long start = DateUtils.strDateToInt(startDate);
             Long end = DateUtils.strDateToInt(endDate);
             requestMap.put("start", start);

+ 5 - 7
ruixuan-live/src/main/resources/mapper/jiaoyang/JiaoYangDingPanMapper.xml

@@ -448,9 +448,7 @@
         2) as 'deliveryRadio',
         count(distinct t1.item_id) as 'itemCount',
         count(distinct t2.item_id) as 'addItemCount'
-
-
-        from jy_order_list  t1
+        from jy_order_list t1
         left join (
         select *
         from jy_order_item_list
@@ -477,10 +475,6 @@
         where photo_create_time &gt;= #{start}
         and photo_create_time &lt;= #{end}
         group by promoter_id) t3 on t1.clipUserId = t3.promoterId
-
-
-
-
         left join (select clip_user_id as 'clipUserId',
         count(oid) as 'orderNum',
         round(sum(pay_amount) / 100, 2) as 'payAmount'
@@ -498,6 +492,10 @@
             </foreach>
         </if>
         group by clip_user_id) t4 on t1.clipUserId = t4.clipUserId
+        where 1 = 1
+        <if test='promoterType != null and promoterType != ""'>
+            and t2.type = #{promoterType}
+        </if>
         order by t1.orderNum desc
     </select>
     <select id="getItemList" resultType="com.alibaba.fastjson.JSONObject">