* 商品详情接口bug修复

src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -88,16 +88,21 @@ public class UserController {
 
     @GetMapping("data_total")
     public TDBAResponse data_total(BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
         return buildSuccess("");
     }
 
     @GetMapping("data_list")
     public TDBAResponse data_list(@RequestParam(name = "type", required = false) @NotNull(message = "类型不能为空") Integer type, BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
+
         return buildSuccess("");
     }
 
     @GetMapping("detail_list")
-    public TDBAResponse detail_list(@RequestParam(name = "userId", required = false) Integer userId, BaseUser baseUser){
-        return buildSuccess("");
+    public TDBAResponse detail_list(@RequestParam(name = "userId", required = false) @NotNull(message = "用户ID不能为空") Integer userId,
+                                    @RequestParam(name = "userType", required = false) Integer userType, BaseUser baseUser){
+        Objects.requireNonNull(baseUser, "请登录后操作");
+        return buildSuccess(userService.detailList(userId, userType));
     }
 }

src/main/java/com/tdba/cxb/ares/api/model/DetailListResp.java

@@ -1,5 +1,7 @@
 package com.tdba.cxb.ares.api.model;
 
+import java.time.LocalDate;
+
 /**
  * @program: order-web
  * @description:
@@ -17,6 +19,9 @@ public class DetailListResp {
     /** 手机号*/
     private String mobile;
 
+    /** 日期*/
+    private LocalDate date;
+
     public Integer getId() {
         return id;
     }
@@ -40,4 +45,12 @@ public class DetailListResp {
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(LocalDate date) {
+        this.date = date;
+    }
 }

src/main/java/com/tdba/cxb/ares/api/repository/UserRelateMapper.java

@@ -1,5 +1,6 @@
 package com.tdba.cxb.ares.api.repository;
 
+import com.tdba.cxb.ares.api.model.DetailListResp;
 import com.tdba.cxb.ares.api.model.UserRelate;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -33,4 +34,7 @@ public interface UserRelateMapper {
 
     Integer countByUid(@Param("uid") Integer uid,
                        @Param("pidList") List<Integer> pidList);
+
+    List<DetailListResp> selectByPid(@Param("pid") Integer pid,
+                                     @Param("userType") Integer userType);
 }

src/main/java/com/tdba/cxb/ares/api/service/UserService.java

@@ -399,4 +399,14 @@ public class UserService {
                 .withCreateTime(LocalDateTime.now())
                 .withType(isFilter? 1: 0).build());
     }
+
+    /**
+     * 团队用户数据详情
+     * @param uid       用户ID
+     * @param userType  用户类型
+     * @return
+     */
+    public List<DetailListResp> detailList(Integer uid, Integer userType){
+        return userRelateMapper.selectByPid(uid, (null == userType)?0:userType);
+    }
 }

src/main/resources/mapper/UserMapper.xml

@@ -9,8 +9,7 @@
         from
             rrx_user
         where
-            test_user = 0
-            <![CDATA[ and spread_uid > 0 ]]>
+            <![CDATA[  spread_uid > 0 ]]>
             <![CDATA[ and create_time >= #{beginTime} ]]>
             <![CDATA[ and create_time <= #{endTime} ]]>
     </select>
@@ -28,7 +27,6 @@
             da.status = 1
              <![CDATA[ and da.ctime >= #{beginTime} ]]>
              <![CDATA[ and da.ctime <= #{endTime} ]]>
-            and u.test_user = 0
             and u.spread_uid > 0
     </select>
 
@@ -45,7 +43,6 @@
             da.status = 1
             <![CDATA[ and da.create_time >= #{beginTime} ]]>
             <![CDATA[ and da.create_time <=#{endTime} ]]>
-            and u.test_user = 0
             and u.spread_uid > 0
     </select>
 
@@ -62,7 +59,6 @@
             da.status = 1
             <![CDATA[ and da.ctime >= #{beginTime} ]]>
             <![CDATA[ and da.ctime <= #{endTime} ]]>
-            and u.test_user = 0
             and u.spread_uid > 0
     </select>
 
@@ -79,7 +75,6 @@
             da.status = 1
             <![CDATA[ and da.add_time >= #{beginTime} ]]>
             <![CDATA[ and da.add_time <= #{endTime} ]]>
-            and u.test_user = 0
             and u.spread_uid > 0
     </select>
 
@@ -133,7 +128,6 @@
             on ub.uid = u.uid
         where
             ub.del_flag = 0
-          and u.test_user = 0
           and ub.bind_uid = #{bindUid}
     </select>
 
@@ -146,8 +140,7 @@
         from
             rrx_user u
         where
-            u.test_user = 0
-          and u.account = #{mobile}
+           u.account = #{mobile}
         limit 1
     </select>
 </mapper>

src/main/resources/mapper/UserRelateMapper.xml

@@ -137,4 +137,56 @@
           and pid in
         <foreach collection="pidList" item="item" open="(" separator="," close=")"></foreach>
     </select>
+
+    <select id="selectByPid" resultType="com.tdba.cxb.ares.api.model.DetailListResp">
+        select
+            u.account 'mobile',
+                u.uid 'id',
+                u.nickname 'name'
+                ur.date
+        from
+            user_relate ur
+                left join
+            rrx_user u
+            on ur.uid = u.uid
+        where
+            ur.del_flag = 0
+          and ur.pid = #{pid}
+
+        <choose>
+            <when test="userType == 1">
+                and ur.is_dacang = 1
+            </when>
+            <otherwise>
+                and ur.is_dacang = 0
+            </otherwise>
+        </choose>
+
+        <choose>
+            <when test="userType == 2">
+                and ur.is_merchant = 1
+            </when>
+            <otherwise>
+                and ur.is_merchant = 0
+            </otherwise>
+        </choose>
+
+        <choose>
+            <when test="userType == 3">
+                and ur.is_channel = 1
+            </when>
+            <otherwise>
+                and ur.is_channel = 0
+            </otherwise>
+        </choose>
+
+        <choose>
+            <when test="userType == 4">
+                and ur.is_agent = 1
+            </when>
+            <otherwise>
+                and ur.is_agent = 0
+            </otherwise>
+        </choose>
+    </select>
 </mapper>