Merge remote-tracking branch 'origin/saas' into saas

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

@@ -1361,12 +1361,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = saveLog(musicGroupId, MusicGroupStatusEnum.PREPARE);
 
         //乐器采购清单是否确认
-        Map<String, Object> param = new HashMap<>();
-        param.put("musicGroupId", musicGroupId);
-        int i = musicGroupPurchaseListDao.queryCount(param);
-        if (i <= 0) {
-            throw new BizException("采购清单未确认");
+        List<StudentPaymentOrderDetail> applyOrder = studentPaymentOrderDetailService.findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
+        if(applyOrder != null && applyOrder.size() > 0){
+            //是否购买了乐器，支持无乐器乐团
+            long count = applyOrder.stream().filter(e -> StringUtils.isNotEmpty(e.getGoodsIdList())).count();
+            if(count > 0l){
+                Map<String, Object> param = new HashMap<>();
+                param.put("musicGroupId", musicGroupId);
+                int i = musicGroupPurchaseListDao.queryCount(param);
+                if (i <= 0) {
+                    throw new BizException("采购清单未确认");
+                }
+            }
         }
+
         //课酬是否确认
         Integer courseScheduleNum = courseScheduleDao.countCourseScheduleByMusicGroupId(musicGroupId);
         if (courseScheduleNum != null && courseScheduleNum > 0) {

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

@@ -33,11 +33,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPurchaseList" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
         INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_,tenant_id_)
         VALUES(#{id},#{musicGroupId},#{goodsId},#{purchaseNum},now(),now(),#{tenantId})
     </insert>
@@ -49,15 +44,13 @@
             <if test="purchaseNum != null">
                 purchase_num_ = #{purchaseNum},
             </if>
-            <if test="updateTime != null">
-                update_time_ = NOW(),
-            </if>
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},
             </if>
             <if test="goodsId != null">
                 goods_id_ = #{goodsId},
             </if>
+            update_time_ = NOW()
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>