Merge branch 'dev-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/MemberShareRecordVo.java

@@ -21,4 +21,6 @@ public class MemberShareRecordVo {
 	private Integer userNum;
 
 	private BigDecimal totalAmount;
+
+	private String memberIds;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MemberShareRecordBiz.java

@@ -356,6 +356,22 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 		}
 	}
 
+	public ObjectRestResponse selectCountList(MemberShareRecordDto memberShareRecordDto) {
+		Query query = new Query(memberShareRecordDto);
+		PageDataVO<MemberShareRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectCountList(query.getSuper()));
+		if (pageDataVO != null && pageDataVO.getData() != null) {
+			pageDataVO.getData().parallelStream().forEach(memberShareRecordVo -> {
+				if (StringUtils.isNotBlank(memberShareRecordVo.getMemberIds())) {
+					String[] arr = memberShareRecordVo.getMemberIds().split(",");
+					Set<String> idList =
+							new HashSet<>(Arrays.asList(arr));
+					Iterables.removeIf(idList, Predicates.equalTo(""));
+					memberShareRecordVo.setUserNum(idList.size());
+				}
+			});
+		}
+		return ObjectRestResponse.succ(pageDataVO);
+	}
 
 	public ObjectRestResponse<List<MemberShareRecordVo>> getAllCountRecord(MemberShareRecordDto memberShareRecordDto) {
 		List<MemberShareRecordVo> memberShareRecordVoList = new ArrayList<>();

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/MemberShareRecordMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.MemberShareRecord;
+import com.github.wxiaoqi.security.admin.vo.MemberShareRecordVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -15,4 +16,6 @@ import java.util.Map;
  */
 public interface MemberShareRecordMapper extends Mapper<MemberShareRecord> {
 	List<MemberShareRecord> selectList(Map<String, Object> params);
+
+	List<MemberShareRecordVo> selectCountList(Map<String, Object> params);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/MemberShareRecordController.java

@@ -48,7 +48,7 @@ public class MemberShareRecordController extends BaseController<MemberShareRecor
 
 	@GetMapping(value = "getAllCountRecord")
 	public ObjectRestResponse getAllCountRecord(MemberShareRecordDto memberShareRecordDto) {
-		return baseBiz.getAllCountRecord(memberShareRecordDto);
+		return baseBiz.selectCountList(memberShareRecordDto);
 	}
 
 	@GetMapping(value = "exportCountRecordList")

ace-modules/ace-admin/src/main/resources/mapper/MemberShareRecordMapper.xml

@@ -11,4 +11,35 @@
         order by msr.pay_time DESC
     </select>
 
+    <select id="selectCountList" resultType="com.github.wxiaoqi.security.admin.vo.MemberShareRecordVo">
+        SELECT
+        msr.member_level as level,
+        <if test="type == 1">
+            FROM_UNIXTIME(msr.pay_time/1000,'%Y-%m-%d') date,
+        </if>
+        <if test="type == 2">
+            FROM_UNIXTIME(msr.pay_time/1000,'%Y-%m') date,
+        </if>
+        <if test="type == 3">
+            FROM_UNIXTIME(msr.pay_time/1000,'%Y') date,
+        </if>
+        sum(msr.total_amount) totalAmount,
+        bml.`name` as levelName,
+        GROUP_CONCAT(msr.member_ids) as memberIds
+        FROM
+        member_share_record msr
+        LEFT JOIN base_user_member_level bml on bml.level = msr.member_level
+        <where>
+            <if test="level != null">
+                and msr.member_level = #{level}
+            </if>
+            <if test="startDate != null">
+                and msr.pay_time between #{startDate} and #{endDate}
+            </if>
+        </where>
+        GROUP BY
+        date,
+        msr.member_level
+    </select>
+
 </mapper>
\ No newline at end of file