Merge branch 'dev-tiande-member' into dev-tiande

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

@@ -78,6 +78,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 				updateAllLevelInfo(old);
 			}
 		}
+		generateData();
 	}
 
 	/**
@@ -86,7 +87,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 	 */
 	public ObjectRestResponse<List<MemberShareRecord>> getAllRecord(Long userId) {
 		Example example = new Example(MemberShareRecord.class);
-		example.createCriteria().andLike("memberIds", "," + userId + ",");
+		example.createCriteria().andLike("memberIds", "%," + userId + ",%");
 		return ObjectRestResponse.succ(mapper.selectByExample(example));
 	}
 
@@ -188,6 +189,8 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 					memberShareCountRecord.setAmount(entry.getValue());
 					memberShareCountRecord.setMemberLevel(level);
 					memberShareCountRecord.setCountMonth(dateTime.toString("yyyy-MM"));
+					memberShareCountRecord.setCrtTime(System.currentTimeMillis());
+					memberShareCountRecord.setUpdTime(System.currentTimeMillis());
 					memberShareCountRecordList.add(memberShareCountRecord);
 				}
 
@@ -207,7 +210,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 	public void generateMemberShareQueue(OrderMemberDetail orderMemberDetail) {
 		if (orderMemberDetail != null) {
 			log.info("会员订单信息: {}", orderMemberDetail);
-			BaseUserMemberLevel baseUserMemberLevel = baseUserMemberLevelMapper.selectOne(new BaseUserMemberLevel(){{setIsdel(0); setLevel(orderMemberDetail.getMemberLevel());}});
+			BaseUserMemberLevel baseUserMemberLevel = baseUserMemberLevelMapper.selectOne(new BaseUserMemberLevel(){{setIsdel(0); setId(orderMemberDetail.getMemberLevelId());}});
 			log.info("会员等级信息: {}", baseUserMemberLevel);
 			if (baseUserMemberLevel != null && baseUserMemberLevel.getIsShare() == 1) {
 				List<BaseUserMember> baseUserMemberList = baseUserMemberBiz.selectList(new BaseUserMember(){{setIsDel(0); setMemberLevel(orderMemberDetail.getMemberLevel());}});

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.MemberShareCountRecordMapper">
 
     <insert id="batchSave" parameterType="list">
-        insert into pay_detail_info ( user_id, real_name, count_month, amount, crt_time, upd_time, member_level)
+        insert into member_share_count_record ( user_id, real_name, count_month, amount, crt_time, upd_time, member_level)
         VALUES
         <foreach collection="list" item="emp" index="index" separator=",">
             (