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

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

@@ -351,43 +351,51 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
 
     @Override
     public Boolean subjectChangeUpdateInstrument(SubjectChange subjectChange) {
+    	
         StudentInstrument studentInstrument = null;
     	
 		if (subjectChange.getOriginalOrderId() != null) {
-		    //获取购买了乐器的报名订单
-            Integer orderId = studentPaymentOrderService.getOrderIdByMusical(subjectChange.getMusicGroupId(),subjectChange.getStudentId());
-            if(orderId != null){
-                studentInstrument = studentInstrumentDao.getByOrderId(orderId.longValue());
-            }
+            studentInstrument = studentInstrumentDao.getByOrderId(subjectChange.getOriginalOrderId().longValue());
 		}
+    	if(subjectChange.getChangeMusical() == null){
+    		if(studentInstrument != null){
+    			studentInstrumentDao.delete(studentInstrument.getId());
+    		}
+    		return true;
+    	}
+		
+		Date date = new Date();
         
-		if (subjectChange == null || subjectChange.getChangeMusical() == null ||
-                KitGroupPurchaseTypeEnum.OWNED.equals(subjectChange.getKitGroupPurchaseType())) {
-        	
-        	if(studentInstrument != null){
-        		studentInstrument.setDelFlag(1);
-        		update(studentInstrument);
-        	}
-        	
-            return false;
-        }
         if (studentInstrument == null) {
             studentInstrument = new StudentInstrument();
             studentInstrument.setStudentId(subjectChange.getStudentId());
             studentInstrument.setOrganId(subjectChange.getOrganId());
-            if (subjectChange.getOriginalOrderId() != null) {
-            	studentInstrument.setOrderId(subjectChange.getOriginalOrderId().longValue());
-            }
-            studentInstrument.setStatus(0);
+            studentInstrument.setCreateTime(date);
         }
-        studentInstrument.setChangeOrderId(subjectChange.getOrderId().longValue());
+        studentInstrument.setStatus(0);
         studentInstrument.setGoodsId(subjectChange.getChangeMusical());
+        studentInstrument.setChangeOrderId(subjectChange.getOrderId().longValue());
+        if(subjectChange.getOriginalOrderId() != null){
+        	studentInstrument.setOrderId(subjectChange.getOriginalOrderId().longValue());
+        }
+        
+        Goods goods = goodsService.get(studentInstrument.getGoodsId());
+        GoodsCategory goodsCategory = goodsCategoryService.get(goods.getGoodsCategoryId());
+        studentInstrument.setGoodsCategoryId(goods.getGoodsCategoryId());
+        studentInstrument.setGoodsCategoryName(goodsCategory.getName());
+        studentInstrument.setGoodsName(goods.getName());
+        studentInstrument.setGoodsBrand(goods.getBrand());
+        studentInstrument.setSpecification(goods.getSpecification());
+        studentInstrument.setGoodsImg(goods.getImage());
+        studentInstrument.setUpdateTime(date);
+        studentInstrument.setDelFlag(0);
+        //studentInstrument.setOperation(operation);
         
         if (studentInstrument.getId() == null) {
-            addStudentInstrument(studentInstrument);
+        	studentInstrumentDao.insert(studentInstrument);
             return true;
         }
-        updateStudentInstrument(studentInstrument);
+        studentInstrumentDao.update(studentInstrument);
         return true;
     }
 

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

@@ -499,6 +499,13 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 throw new BizException("声部更换失败，当前用户是0元入团，且当前声部已有0元入团学生");
             }
         }
+        
+        if(StringUtils.isBlank(subjectChange.getChangeAccessories()) && StringUtils.isBlank(subjectChange.getOriginalAccessories())
+        		&& subjectChange.getOriginalMusical() == null && subjectChange.getChangeMusical() == null){
+        	studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
+        	return subjectChange;
+        }
+        
         Date nowDate = new Date();
         SubjectChange lastSubjectChange = getStudentOriginal(subjectChange.getStudentId(), subjectChange.getMusicGroupId());
         if (lastSubjectChange != null) {
@@ -788,7 +795,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
     		}
 
             //退原订单商品
-            sellOrderService.refundByOrderId(subjectChange.getOriginalOrderId().longValue(), false);
+    		if(subjectChange.getOriginalOrderId() != null) {
+    			sellOrderService.refundByOrderId(subjectChange.getOriginalOrderId().longValue(), false);
+    		}
 
             if (StringUtils.isNotBlank(goodsIds)) {
                 List<Integer> goodsIdList = Arrays.stream(goodsIds.split(",")).map(Integer::parseInt).collect(Collectors.toList());