会员分成记录信息

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/MemberShareRecordDto.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @ClassName : MemberShareRecordDto
+ * @Description : 会员分成记录
+ * @Author : jiaoruizhen
+ * @Date: 2020-11-09 11:39
+ */
+@Data
+public class MemberShareRecordDto extends PageParam {
+	Integer userId;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MemberShareRecord.java

@@ -120,4 +120,7 @@ public class MemberShareRecord implements Serializable {
     private Integer memberNum;
 
 
+    @Transient
+	private String levelName;
+
 }

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

 package com.github.wxiaoqi.security.admin.biz;
 
 import cn.hutool.core.map.MapUtil;
+import com.github.wxiaoqi.security.admin.dto.MemberShareRecordDto;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.entity.MemberShareCountRecord;
@@ -10,6 +11,8 @@ import com.github.wxiaoqi.security.admin.mapper.MemberShareRecordMapper;
 import com.github.wxiaoqi.security.admin.util.DateUtils;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -85,10 +88,10 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 	 * 查看某一用户分成记录明细
 	 * @return
 	 */
-	public ObjectRestResponse<List<MemberShareRecord>> getAllRecord(Long userId) {
-		Example example = new Example(MemberShareRecord.class);
-		example.createCriteria().andLike("memberIds", "%," + userId + ",%");
-		return ObjectRestResponse.succ(mapper.selectByExample(example));
+	public ObjectRestResponse<List<MemberShareRecord>> getAllRecord(MemberShareRecordDto memberShareRecordDto) {
+		Query query = new Query(memberShareRecordDto);
+		PageDataVO<MemberShareRecord> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectList(query.getSuper()));
+		return ObjectRestResponse.succ(pageDataVO);
 	}
 
 	/**
@@ -219,7 +222,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 				if (orderMemberDetail.getMemberLevel().compareTo(baseUserMemberLevelList.get(0).getLevel() - 1) >= 0) {
 					//所有分成会员都需要新增一条记录
 					for (BaseUserMemberLevel baseUserMemberLevel : baseUserMemberLevelList) {
-						List<BaseUserMember> baseUserMemberList = baseUserMemberBiz.selectList(new BaseUserMember(){{setIsDel(0); setMemberLevel(orderMemberDetail.getMemberLevel());}});
+						List<BaseUserMember> baseUserMemberList = baseUserMemberBiz.selectList(new BaseUserMember(){{setIsDel(0); setMemberLevel(baseUserMemberLevel.getLevel());}});
 						if (baseUserMemberList != null && baseUserMemberList.size() > 0) {
 							List<Integer> userIds = baseUserMemberList.stream().map(BaseUserMember::getUserId).collect(Collectors.toList());
 							if (userIds != null && userIds.size() > 0) {
@@ -227,8 +230,8 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 								memberShareRecord.setOrderNo(orderMemberDetail.getBaseOrder().getNo());
 								memberShareRecord.setPayTime(orderMemberDetail.getBaseOrder().getPayTime());
 								memberShareRecord.setOrderAmount(orderMemberDetail.getBaseOrder().getOrderAmount());
-								memberShareRecord.setMemberLevel(orderMemberDetail.getMemberLevel());
-								memberShareRecord.setMemberLevelId(orderMemberDetail.getMemberLevelId());
+								memberShareRecord.setMemberLevel(baseUserMemberLevel.getLevel());
+								memberShareRecord.setMemberLevelId(baseUserMemberLevel.getId());
 								memberShareRecord.setUserId(orderMemberDetail.getBaseOrder().getUserId().longValue());
 								memberShareRecord.setOrderTime(orderMemberDetail.getCrtTime());
 								memberShareRecord.setTotalAmount(baseUserMemberLevel.getShareAmount());

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

@@ -3,6 +3,9 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.entity.MemberShareRecord;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 会员分成记录
  * 
@@ -11,5 +14,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2020-11-03 11:12:15
  */
 public interface MemberShareRecordMapper extends Mapper<MemberShareRecord> {
-	
+	List<MemberShareRecord> selectList(Map<String, Object> params);
 }

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

 package com.github.wxiaoqi.security.admin.rest.admin;
 
 import com.github.wxiaoqi.security.admin.biz.MemberShareRecordBiz;
+import com.github.wxiaoqi.security.admin.dto.MemberShareRecordDto;
 import com.github.wxiaoqi.security.admin.entity.MemberShareRecord;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -14,12 +15,12 @@ public class MemberShareRecordController extends BaseController<MemberShareRecor
 
 	/**
 	 *  获取用户分成明细
-	 * @param userId
+	 * @param memberShareRecordDto
 	 * @return
 	 */
 	@GetMapping(value = "getAllRecord")
-	public ObjectRestResponse getAllRecord(Long userId) {
-		return baseBiz.getAllRecord(userId);
+	public ObjectRestResponse getAllRecord(MemberShareRecordDto memberShareRecordDto) {
+		return baseBiz.getAllRecord(memberShareRecordDto);
 	}
 
 	/**

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

@@ -28,7 +28,7 @@
     </insert>
 
     <select id="selectList" resultType="com.github.wxiaoqi.security.admin.entity.MemberShareCountRecord">
-        select msr.count_month as countMonth, msr.user_id as userId, sum(msr.amount) as amount, aud.realname as realName from member_share_count_record msr
+        select msr.count_month as countMonth, msr.user_id as userId, msr.member_level as memberLevel, sum(msr.amount) as amount, aud.realname as realName from member_share_count_record msr
         LEFT JOIN app_user_detail aud on aud.userid = msr.user_id
         <where>
             <if test="userId != null">
@@ -41,7 +41,7 @@
                 and msr.count_month = #{countMonth}
             </if>
         </where>
-        group by msr.count_month, msr.user_id
+        group by msr.count_month, msr.member_level,msr.user_id
         order By msr.count_month DESC
     </select>
 

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

@@ -3,22 +3,11 @@
 
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.MemberShareRecordMapper">
 
-	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.github.wxiaoqi.security.admin.entity.MemberShareRecord" id="memberShareRecordMap">
-        <result property="id" column="id"/>
-        <result property="orderNo" column="order_no"/>
-        <result property="memberIds" column="member_ids"/>
-        <result property="payTime" column="pay_time"/>
-        <result property="memberLevel" column="member_level"/>
-        <result property="memberLevelId" column="member_level_id"/>
-        <result property="orderAmount" column="order_amount"/>
-        <result property="totalAmount" column="total_amount"/>
-        <result property="amount" column="amount"/>
-        <result property="crtTime" column="crt_time"/>
-        <result property="updTime" column="upd_time"/>
-        <result property="userId" column="user_id"/>
-        <result property="orderTime" column="order_time"/>
-        <result property="memberNum" column="member_num"/>
-    </resultMap>
+    <select id="selectList" resultType="com.github.wxiaoqi.security.admin.entity.MemberShareRecord">
+        select msr.*,bml.name as levelName from member_share_record msr
+        LEFT JOIN base_user_member_level bml on bml.id = msr.member_level_id
+        where msr.member_ids like concat('%', #{userId}, '%')
+        order by msr.pay_time DESC
+    </select>
 
 </mapper>
\ No newline at end of file