shangke 2 lat temu
rodzic
commit
cf7ab01576

+ 24 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImLiveBroadcastRoom.java

@@ -123,6 +123,14 @@ public class ImLiveBroadcastRoom implements Serializable {
     @ApiModelProperty("购物车标题")
     private String shoppingTitle;
 
+    @TableField("group_type_")
+    @ApiModelProperty("直播间类型")
+    private String groupType;
+
+    @TableField("subject_id_")
+    @ApiModelProperty("声部编号")
+    private String subjectId;
+
     @TableField("created_by_")
     @ApiModelProperty(value = "创建人")
     private Integer createdBy;
@@ -383,5 +391,21 @@ public class ImLiveBroadcastRoom implements Serializable {
     public void setShoppingTitle(String shoppingTitle) {
         this.shoppingTitle = shoppingTitle;
     }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
 }
 

+ 3 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupDefaultClassesUnitPriceServiceImpl.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -26,7 +27,8 @@ public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<
 
 	@Override
 	public long insert(VipGroupDefaultClassesUnitPrice bean) {
-		if(Objects.isNull(bean.getOrganId())){
+
+		if(Objects.isNull(bean.getOrganId()) && GroupType.VIP.getCode().equals(bean.getGroupType())) {
 			throw new BizException("请选择分部");
 		}
 		VipGroupDefaultClassesUnitPrice byVipGroupCategory = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(bean.getVipGroupCategoryId(),