Merge branch 'zx_saas_imGroup' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.im.EImGroupRoleType;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.common.entity.BaseEntity;
@@ -98,6 +99,9 @@ public class ImGroupMember extends BaseEntity {
 
 	public void setIsAdmin(boolean admin) {
 		isAdmin = admin;
+		if (admin){
+			this.groupRoleType = EImGroupRoleType.Owner;
+		}
 	}
 
 	public void setGroupRoleType(EImGroupRoleType groupRoleType) {
@@ -106,6 +110,9 @@ public class ImGroupMember extends BaseEntity {
 
 	public void setRoleType(String roleType) {
 		this.roleType = roleType;
+		if(this.groupRoleType == null){
+			this.groupRoleType = StringUtils.isEmpty(roleType)? EImGroupRoleType.Admin:EImGroupRoleType.Member;
+		}
 	}
 
 	public void setType(String type) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -23,6 +23,7 @@ import com.microsvc.toolkit.middleware.im.impl.RongCloudImPlugin;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.enums.im.ClientEnum;
+import com.ym.mec.biz.dal.enums.im.EImGroupRoleType;
 import com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.biz.service.*;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2834,7 +2834,7 @@ public class ExportServiceImpl implements ExportService {
                     .map(e -> e.getGoodsId().toString()).distinct().collect(Collectors.joining(",")));
             goodsList.addAll(goodsService.findGoodsByIds(sellOrders.stream().filter(e->e.getGoodsSkuId() != null)
                     .map(e -> e.getParentGoodsId().toString()).distinct().collect(Collectors.joining(","))));
-            goodsMap = goodsList.stream().collect(Collectors.toMap(Goods::getId, Function.identity()));
+            goodsMap = goodsList.stream().collect(Collectors.groupingBy(e -> e.getId(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
         }
 
         //获取订单详情