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

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

@@ -3881,34 +3881,32 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //查询当前乐团报名订单中购买了乐保的订单
         List<StudentApplyInstrumentDto> maintenanceList = studentPaymentOrderDetailDao.queryByType(musicGroupId, OrderDetailTypeEnum.MAINTENANCE);
 
-        if (maintenanceList == null || maintenanceList.size() == 0) {
-            return true;
-        }
+        if (maintenanceList != null && maintenanceList.size() > 0) {
+        	List<Long> instrumentIdList = maintenanceList.stream().map(t -> t.getStudentInstrumentId()).collect(Collectors.toList());
 
-        List<Long> instrumentIdList = maintenanceList.stream().map(t -> t.getStudentInstrumentId()).collect(Collectors.toList());
+            List<StudentInstrument> studentInstrumentList = studentInstrumentDao.queryById(instrumentIdList);
 
-        List<StudentInstrument> studentInstrumentList = studentInstrumentDao.queryById(instrumentIdList);
+            List<StudentInstrument> updateList = new ArrayList<StudentInstrument>();
 
-        List<StudentInstrument> updateList = new ArrayList<StudentInstrument>();
+            for (StudentInstrument si : studentInstrumentList) {
+                if (si.getDelFlag() == 1) {
+                    continue;
+                }
+                if (si.getStatus() == 0 && si.getStartTime() == null) {
+                    si.setStatus(1);
+                    si.setStartTime(date);
+                    si.setEndTime(DateUtil.addYears(date, 1));
+                    si.setUpdateTime(date);
 
-        for (StudentInstrument si : studentInstrumentList) {
-            if (si.getDelFlag() == 1) {
-                continue;
+                    updateList.add(si);
+                }
             }
-            if (si.getStatus() == 0 && si.getStartTime() == null) {
-                si.setStatus(1);
-                si.setStartTime(date);
-                si.setEndTime(DateUtil.addYears(date, 1));
-                si.setUpdateTime(date);
 
-                updateList.add(si);
+            if (updateList.size() > 0) {
+                studentInstrumentDao.batchModify(updateList);
             }
         }
 
-        if (updateList.size() > 0) {
-            studentInstrumentDao.batchModify(updateList);
-        }
-        
         //添加记录
         MusicGroupDeliveryRecord dr = new MusicGroupDeliveryRecord();
         dr.setCreateTime(date);

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

@@ -376,7 +376,6 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             }
 
             Map<OrderDetailTypeEnum, BigDecimal> userOrderTypeMap = new HashMap<OrderDetailTypeEnum, BigDecimal>();
-            ;
 
             BigDecimal amount = BigDecimal.ZERO;
             KitGroupPurchaseTypeEnum kitGroupPurchaseType = null;
@@ -399,14 +398,18 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                         || spod.getType() == OrderDetailTypeEnum.MUSIC_NETWORK || spod.getType() == OrderDetailTypeEnum.CLASSROOM || spod.getType() == OrderDetailTypeEnum.THEORY_COURSE) {
                     spod.setType(OrderDetailTypeEnum.COURSE);
                     //courseAmount = courseAmount.add(spod.getPrice().subtract(spod.getRemitFee()));
-                } else if (spod.getType() == OrderDetailTypeEnum.MUSICAL) {
+                } else if (spod.getType() == OrderDetailTypeEnum.MUSICAL || spod.getType() == OrderDetailTypeEnum.ORGAN_SHARE_PROFIT) {
                     if (subjectChange != null && spod.getPaymentOrderId() <= subjectChange.getOriginalOrderId()) {
                         if (subjectChange.getChangeMusical() == null) {
                             continue;
                         }
                         kitGroupPurchaseType = subjectChange.getKitGroupPurchaseType();
                         musicalId = subjectChange.getChangeMusical() + "";
-                        spod.setPrice(subjectChange.getChangeMusicalPrice());
+                        if(spod.getType() == OrderDetailTypeEnum.MUSICAL){
+                            spod.setPrice(subjectChange.getChangeMusicalPrice());
+                        }else{
+                            spod.setPrice(subjectChange.getChangeCourseFee());
+                        }
                         spod.setRemitFee(BigDecimal.ZERO);
                         isChangeMusical = true;
                     } else {
@@ -414,6 +417,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                         musicalId = spod.getGoodsIdList();
                         //musicalAmount = musicalAmount.add(spod.getPrice());
                     }
+                    spod.setType(OrderDetailTypeEnum.MUSICAL);
                 } else if (spod.getType() == OrderDetailTypeEnum.ACCESSORIES) {
                     if (subjectChange != null && (subjectChange.getOriginalOrderId() != null && spod.getPaymentOrderId() <= subjectChange.getOriginalOrderId())) {
                         if (StringUtils.isBlank(subjectChange.getChangeAccessories()) || isCalculatedOfAccessories == true) {

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

@@ -103,6 +103,9 @@
 		left join sys_area ca on sa.region_city_id_ = ca.id_
 		left join sys_area coa on sa.region_county_id_ = coa.id_ 
 		where sa.del_flag_ = 0
+		<if test="musicGroupId != null">
+			and sa.music_group_id_ = #{musicGroupId}
+		</if>
 		ORDER BY sa.id_
 		<include refid="global.limit" />
 	</select>
@@ -111,5 +114,8 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_shipping_address sa
 		where sa.del_flag_ = 0
+		<if test="musicGroupId != null">
+			and sa.music_group_id_ = #{musicGroupId}
+		</if>
 	</select>
 </mapper>