系统收费商品分部

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsDao.java

@@ -150,10 +150,6 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
                                                                       @Param("courseViewType") Integer courseViewType,
                                                                       @Param("organId") Integer organId);
 
-    List<MusicGroupGoodsAndDiscountDto> getMusicGroupGoodsAndDiscountWithSubjects(@Param("subjectIds") String subjectIds,
-                                                                                  @Param("type") String type,
-                                                                                  @Param("organId") Integer organId);
-
     /**
      * 是否存在已上架的商品编号
      *

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

@@ -135,9 +135,6 @@ public class Goods {
 	@ApiModelProperty(value = "教务端展示分部")
 	private String educationShowOrganId;
 
-	@ApiModelProperty(value = "乐团展示分部")
-	private String musicShowOrganId;
-
 	@ApiModelProperty(value = "课程收费团展示分部")
 	private String courseFeeShowOrganId;
 
@@ -153,9 +150,6 @@ public class Goods {
 	@ApiModelProperty(value = "教务端展示分部")
 	private String educationShowOrganName;
 
-	@ApiModelProperty(value = "乐团展示分部")
-	private String musicShowOrganName;
-
 	@ApiModelProperty(value = "课程收费团展示分部")
 	private String courseFeeShowOrganName;
 
@@ -187,14 +181,6 @@ public class Goods {
 		this.educationShowOrganId = educationShowOrganId;
 	}
 
-	public String getMusicShowOrganId() {
-		return musicShowOrganId;
-	}
-
-	public void setMusicShowOrganId(String musicShowOrganId) {
-		this.musicShowOrganId = musicShowOrganId;
-	}
-
 	public String getCourseFeeShowOrganId() {
 		return courseFeeShowOrganId;
 	}
@@ -235,14 +221,6 @@ public class Goods {
 		this.educationShowOrganName = educationShowOrganName;
 	}
 
-	public String getMusicShowOrganName() {
-		return musicShowOrganName;
-	}
-
-	public void setMusicShowOrganName(String musicShowOrganName) {
-		this.musicShowOrganName = musicShowOrganName;
-	}
-
 	public String getCourseFeeShowOrganName() {
 		return courseFeeShowOrganName;
 	}

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

@@ -251,7 +251,6 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         if (StringUtils.isNotEmpty(musicGroupId)) {
             MusicGroup musicGroup = musicGroupService.get(musicGroupId);
             courseViewType = musicGroup.getCourseViewType().getCode();
-            courseViewType = courseViewType == 3?2:courseViewType;
             organId = musicGroup.getOrganId();
         }
         List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type, courseViewType,organId);

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -40,8 +40,6 @@
         <result column="student_show_organ_name_" property="studentShowOrganName"/>
         <result column="education_show_organ_id_" property="educationShowOrganId"/>
         <result column="education_show_organ_name_" property="educationShowOrganName"/>
-        <result column="music_show_organ_id_" property="musicShowOrganId"/>
-        <result column="music_show_organ_name_" property="musicShowOrganName"/>
         <result column="replacement_show_organ_id_" property="replacementShowOrganId"/>
         <result column="replacement_show_organ_name_" property="replacementShowOrganName"/>
         <result column="course_fee_show_organ_id_" property="courseFeeShowOrganId"/>
@@ -71,20 +69,20 @@
         (goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,tax_stock_count_,sell_count_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,
         complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,stock_warning_,stock_type_
-            ,student_show_organ_id_,education_show_organ_id_,music_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,member_fee_show_organ_id_)
+            ,student_show_organ_id_,education_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,member_fee_show_organ_id_)
         VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{taxStockCount},#{sellCount},#{marketPrice},
         #{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
         #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{memo},#{publishTime},#{complementGoodsIdList},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{agreeCostPrice},
         #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{studentShowOrganId},#{educationShowOrganId},#{musicShowOrganId},#{replacementShowOrganId},#{courseFeeShowOrganId},#{memberFeeShowOrganId})
+        #{studentShowOrganId},#{educationShowOrganId},#{replacementShowOrganId},#{courseFeeShowOrganId},#{memberFeeShowOrganId})
     </insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO goods
         (goods_category_id_,name_,brand_,specification_,image_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,update_time_,create_time_,type_,agree_cost_price_,sn_,
         stock_count_,tax_stock_count_,stock_warning_,stock_type_
-        ,student_show_organ_id_,education_show_organ_id_,music_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,member_fee_show_organ_id_)
+        ,student_show_organ_id_,education_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,member_fee_show_organ_id_)
         VALUES
         <foreach collection="list" separator="," item="goods">
             (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
@@ -93,7 +91,7 @@
             #{goods.stockCount},#{goods.taxStockCount},
             #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{goods.studentShowOrganId},#{goods.educationShowOrganId},#{goods.musicShowOrganId},#{goods.replacementShowOrganId},#{goods.courseFeeShowOrganId},#{goods.memberFeeShowOrganId}
+            #{goods.studentShowOrganId},#{goods.educationShowOrganId},#{goods.replacementShowOrganId},#{goods.courseFeeShowOrganId},#{goods.memberFeeShowOrganId}
             )
         </foreach>
     </insert>
@@ -107,9 +105,6 @@
             <if test="educationShowOrganId != null">
                 education_show_organ_id_ = #{educationShowOrganId},
             </if>
-            <if test="musicShowOrganId != null">
-                music_show_organ_id_ = #{musicShowOrganId},
-            </if>
             <if test="replacementShowOrganId != null">
                 replacement_show_organ_id_ = #{replacementShowOrganId},
             </if>
@@ -206,9 +201,6 @@
                 <if test="goods.educationShowOrganId != null">
                     education_show_organ_id_ = #{goods.educationShowOrganId},
                 </if>
-                <if test="goods.musicShowOrganId != null">
-                    music_show_organ_id_ = #{goods.musicShowOrganId},
-                </if>
                 <if test="goods.replacementShowOrganId != null">
                     replacement_show_organ_id_ = #{goods.replacementShowOrganId},
                 </if>
@@ -345,9 +337,6 @@
             <if test="educationShowOrganId != null">
                 AND FIND_IN_SET(#{educationShowOrganId},g.education_show_organ_id_)
             </if>
-            <if test="musicShowOrganId != null">
-                AND FIND_IN_SET(#{musicShowOrganId},g.music_show_organ_id_)
-            </if>
             <if test="courseFeeShowOrganId != null">
                 AND FIND_IN_SET(#{courseFeeShowOrganId},g.course_fee_show_organ_id_)
             </if>
@@ -359,7 +348,7 @@
             </if>
             <if test="organId != null and organId != ''">
                 AND INTE_ARRAY (#{organId},CONCAT_WS(",",replacement_show_organ_id_,member_fee_show_organ_id_,
-                course_fee_show_organ_id_,music_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
+                course_fee_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
             </if>
             <if test="search!=null and search!=''">
                 AND (g.sn_=#{search} OR g.id_=#{search} OR g.name_ LIKE CONCAT('%', #{search}, '%'))
@@ -441,29 +430,22 @@
     <select id="getMusicGroupGoodsAndDiscount" resultMap="MusicGroupGoods">
         SELECT g.* FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE sgm.subject_id_ = #{subjectId} AND g.music_group_show_ = 1 AND g.status_ != 0
+        WHERE sgm.subject_id_ = #{subjectId} AND g.status_ != 0
         <if test="organId != null">
-            AND FIND_IN_SET(#{organId},g.organ_id_list_)
+            <if test="courseViewType != null">
+                <if test="courseViewType == 1">
+                    AND FIND_IN_SET(#{organId},g.member_fee_show_organ_id_)
+                </if>
+                <if test="courseViewType == 0">
+                    AND FIND_IN_SET(#{organId},g.course_fee_show_organ_id_)
+                </if>
+            </if>
         </if>
         <if test="type!=null">
             AND g.type_ = #{type}
         </if>
-        <if test="courseViewType != null">
-            AND FIND_IN_SET(#{courseViewType},g.course_view_type_)
-        </if>
     </select>
 
-    <select id="getMusicGroupGoodsAndDiscountWithSubjects" resultMap="MusicGroupGoods">
-        SELECT g.* FROM subject_goods_mapper sgm
-        LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE FIND_IN_SET(sgm.subject_id_, #{subjectIds}) and g.status_ != 0
-        <if test="organId != null">
-            AND FIND_IN_SET(#{organId},g.organ_id_list_)
-        </if>
-        <if test="type!=null">
-            AND g.type_ = #{type}
-        </if>
-    </select>
     <select id="findByIdAndStatus" resultType="java.lang.Boolean">
         SELECT COUNT(0) FROM goods WHERE status_ = #{status} AND id_ = #{goodsId}
     </select>
@@ -519,12 +501,11 @@
 
     <sql id="replacementQuerySql">
         <where>
-            g.replacement_show_ = 1
-            AND g.status_ != 0
+            g.status_ != 0
             AND g.type_ = 'INSTRUMENT'
             AND gc.del_flag_ = 0
             <if test="organId != null">
-                AND FIND_IN_SET(#{organId},g.organ_id_list_)
+                AND FIND_IN_SET(#{organId},g.replacement_show_organ_id_)
             </if>
             <if test="subjectId != null">
                 AND sgm.subject_id_ = #{subjectId}

mec-student/src/main/java/com/ym/mec/student/controller/GoodsController.java

@@ -1,27 +1,21 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.GoodsCategory;
+import com.ym.mec.biz.dal.page.GoodsQueryInfo;
 import com.ym.mec.biz.service.GoodsCategoryService;
+import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.biz.dal.page.GoodsQueryInfo;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.common.controller.BaseController;
-
 import java.util.Objects;
 
 @RequestMapping("goods")
@@ -54,7 +48,7 @@ public class GoodsController extends BaseController {
         if(sysUser == null){
             throw new BizException("请先登录");
         }
-        queryInfo.setOrganId(sysUser.getOrganId().toString());
+        queryInfo.setStudentShowOrganId(sysUser.getOrganId());
         return succeed(goodsService.queryPage(queryInfo));
     }
 

mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -1,20 +1,6 @@
 package com.ym.mec.student.controller;
 
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.StudentGoodsSell;
@@ -27,14 +13,18 @@ import com.ym.mec.biz.dal.page.GoodsCategoryQueryInfo;
 import com.ym.mec.biz.dal.page.GoodsQueryInfo;
 import com.ym.mec.biz.dal.page.GoodsSellQueryInfo;
 import com.ym.mec.biz.dal.page.RepairStudentQueryInfo;
-import com.ym.mec.biz.service.GoodsCategoryService;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.StudentGoodsSellService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRepairService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 @RequestMapping("repair")
 @Api(tags = "学生维修服务")
@@ -147,7 +137,7 @@ public class RepairController extends BaseController {
         if(sysUser == null){
             throw new BizException("请先登录");
         }
-        queryInfo.setOrganId(sysUser.getOrganId().toString());
+        queryInfo.setStudentShowOrganId(sysUser.getOrganId());
         return succeed(goodsService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -474,13 +474,12 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"商品编号", "货号", "品牌", "商品名称",
-                    "是否组合商品", "学员是否展示", "教务端是否展示", "乐团是否展示", "乐团收费模式","是否乐器置换", "是否库存预警",
+                    "是否组合商品", "学员展示分部", "教务展示分部", "课程收费团展示分部", "系统收费团展示分部","乐器置换展示分部", "是否库存预警",
                     "商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
                     "零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
                     "id", "sn", "brand", "name",
-                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg",
-                    "courseViewType == null?'':courseViewType == '0'?'系统收费':courseViewType == '0,1'?'系统收费,课程收费':courseViewType == '0,2'?'系统收费,云教练收费':courseViewType == '1,2'?'课程收费,云教练收费':courseViewType == '0,1,2'?'系统收费,课程收费,云教练收费':''",
-                    "replacementShow.msg", "stockWarning.msg",
+                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "studentShowOrganName", "educationShowOrganName", "courseFeeShowOrganName",
+                    "memberFeeShowOrganName","replacementShowOrganName", "stockWarning.msg",
                     "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
                     "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);
             response.setContentType("application/octet-stream");