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

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

@@ -5,7 +5,10 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.github.wxiaoqi.security.admin.dto.MemberShareRecordDto;
-import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.entity.MemberShareCountRecord;
+import com.github.wxiaoqi.security.admin.entity.MemberShareRecord;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.admin.mapper.MemberShareRecordMapper;
 import com.github.wxiaoqi.security.admin.util.DateUtils;
@@ -241,7 +244,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 								memberShareRecord.setMemberLevelId(baseUserMemberLevel.getId());
 								memberShareRecord.setUserId(orderMemberDetail.getBaseOrder().getUserId().longValue());
 								memberShareRecord.setOrderTime(orderMemberDetail.getCrtTime());
-								memberShareRecord.setTotalAmount(baseUserMemberLevel.getShareAmount());
+								memberShareRecord.setTotalAmount(orderMemberDetail.getBaseOrder().getOrderAmount().multiply(baseUserMemberLevel.getShareAmount()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP));
 								memberShareRecord.setMemberNum(userIds.size());
 								memberShareRecord.setAmount(baseUserMemberLevel.getShareAmount().divide(new BigDecimal(userIds.size()).setScale(2, BigDecimal.ROUND_HALF_UP)));
 								StringBuilder stringBuilder = new StringBuilder();