Merge branch 'zx_saas_goodsCopy' of http://git.dayaedu.com/yonge/mec into test

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

@@ -197,6 +197,9 @@ public class Goods {
 
 	private String brandName;
 
+	@ApiModelProperty(value = "被复制的次数")
+	private Integer copyNum;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1522,17 +1522,14 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 			throw new BizException("商品不存在");
 		}
 		Date now = new Date();
-		if(goods.getName().contains("-副本")){
-			//截取副本后的数字
-			String copyNum = goods.getName().substring(goods.getName().lastIndexOf("-副本") + 3);
-			if(NumberUtils.isNumber(copyNum)){
-				goods.setName(goods.getName().replace("-副本"+copyNum,"")+"-副本"+(Integer.parseInt(copyNum)+1));
-			}else{
-				goods.setName(goods.getName()+"-副本1");
-			}
-		}else {
-			goods.setName(goods.getName()+"-副本1");
+		if(goods.getCopyNum() == null){
+			goods.setCopyNum(0);
 		}
+		//修改原有商品
+		goods.setCopyNum(goods.getCopyNum() + 1);
+		goodsDao.update(goods);
+		goods.setName(goods.getName() + "-副本" + goods.getCopyNum());
+		goods.setCopyNum(0);
 		goods.setId(null);
 		goods.setStatus(YesOrNoEnum.NO);
 		goods.setCreateTime(now);

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

@@ -12,6 +12,7 @@ import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.LessonCourseware;
 import com.ym.mec.biz.dal.entity.LessonCoursewareUserMapper;
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.mapper.LessonCoursewareMapper;
 import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
 import com.ym.mec.biz.service.LessonCoursewareService;
@@ -223,7 +224,10 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
                         CbsMaterialRefWrapper.RelateMaterialInfo relateMaterialInfo = materialRef.getRelateMaterialInfo();
                         if(relateMaterialInfo != null && StringUtils.equals(relateMaterialInfo.getType(),"SONG")
                                 && CollectionUtils.isNotEmpty(relateMaterialInfo.getApplicationIdList())){
-                            materialRef.setResourceIdStr(relateMaterialInfo.getId().toString());
+                            SysMusicScore musicScore = sysMusicScoreService.getDao().getCbsId(relateMaterialInfo.getId());
+                            if(musicScore != null) {
+                                materialRef.setResourceIdStr(musicScore.getId().toString());
+                            }
                         }
                     }
                 }

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

@@ -56,6 +56,7 @@
         <result column="child_organ_cost_price_" property="childOrganCostPrice"/>
         <result column="group_goods_" property="groupGoods"/>
         <result column="del_flag_" property="delFlag"/>
+        <result column="copy_num_" property="copyNum"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -81,14 +82,14 @@
          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_,replacement_show_organ_id_,course_fee_show_organ_id_,
-         member_fee_show_organ_id_,free_fee_show_organ_id_,tenant_id_,organ_cost_price_,group_goods_)
+         member_fee_show_organ_id_,free_fee_show_organ_id_,tenant_id_,organ_cost_price_,group_goods_,copy_num_)
         VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{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},#{replacementShowOrganId},#{courseFeeShowOrganId},
-               #{memberFeeShowOrganId},#{freeFeeShowOrganId},#{tenantId},#{organCostPrice},#{groupGoods})
+               #{memberFeeShowOrganId},#{freeFeeShowOrganId},#{tenantId},#{organCostPrice},#{groupGoods},#{copyNum})
     </insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO goods
@@ -96,7 +97,7 @@
         discount_price_,group_purchase_price_,brief_,desc_,update_time_,create_time_,type_,agree_cost_price_,sn_,
         stock_count_,stock_warning_,stock_type_
         ,student_show_organ_id_,education_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,
-        member_fee_show_organ_id_,free_fee_show_organ_id_,tenant_id_,organ_cost_price_,group_goods_)
+        member_fee_show_organ_id_,free_fee_show_organ_id_,tenant_id_,organ_cost_price_,group_goods_,copy_num_)
         VALUES
         <foreach collection="list" separator="," item="goods">
             (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
@@ -106,7 +107,8 @@
             #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.studentShowOrganId},#{goods.educationShowOrganId},#{goods.replacementShowOrganId},
-            #{goods.courseFeeShowOrganId},#{goods.memberFeeShowOrganId},#{goods.freeFeeShowOrganId},#{goods.tenantId},#{goods.organCostPrice},#{goods.groupGoods}
+            #{goods.courseFeeShowOrganId},#{goods.memberFeeShowOrganId},#{goods.freeFeeShowOrganId},
+             #{goods.tenantId},#{goods.organCostPrice},#{goods.groupGoods},#{goods.copyNum}
             )
         </foreach>
     </insert>
@@ -141,6 +143,9 @@
             <if test="sn != null">
                 sn_ = #{sn},
             </if>
+            <if test="copyNum != null">
+                copy_num_ = #{copyNum},
+            </if>
             <if test="marketPrice != null">
                 market_price_ = #{marketPrice},
             </if>