update

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

@@ -2036,7 +2036,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             	
             	List<Long> paymentOrderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
             	
-            	Long minPaymentOrderId = Collections.min(paymentCalenderIdList);
+            	Long minPaymentOrderId = Collections.min(paymentOrderIdList);
 
                 List<StudentPaymentOrderDetail> orderDetailList = studentPaymentOrderDetailDao.getWithIds(paymentOrderIdList);
 
@@ -2307,7 +2307,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         	
         	List<Long> paymentOrderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
         	
-        	Long minPaymentOrderId = Collections.min(paymentCalenderIdList);
+        	Long minPaymentOrderId = Collections.min(paymentOrderIdList);
 
             List<StudentPaymentOrderDetail> orderDetailList = studentPaymentOrderDetailDao.getWithIds(paymentOrderIdList);
 

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

@@ -325,30 +325,38 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 			BigDecimal amount = BigDecimal.ZERO;
 			KitGroupPurchaseTypeEnum kitGroupPurchaseType = null;
 			String goodsId = null ,accessoriesId = null ;
+			BigDecimal orderTotalAmount = BigDecimal.ZERO;
+			BigDecimal withoutMusicalTotalAmount = BigDecimal.ZERO;
+			
 			for(StudentPaymentOrderDetail spod : orderDetailList){
 				
 				if (spod.getType() == OrderDetailTypeEnum.COURSE || spod.getType() == OrderDetailTypeEnum.HIGH_ONLINE_COURSE
 						|| spod.getType() == OrderDetailTypeEnum.SINGLE || spod.getType() == OrderDetailTypeEnum.VIP
-						|| spod.getType() == OrderDetailTypeEnum.HIGH || spod.getType() == OrderDetailTypeEnum.COURSE
+						|| spod.getType() == OrderDetailTypeEnum.HIGH || spod.getType() == OrderDetailTypeEnum.MIX
 						|| spod.getType() == OrderDetailTypeEnum.DEMO || spod.getType() == OrderDetailTypeEnum.COMPREHENSIVE
 						|| spod.getType() == OrderDetailTypeEnum.ENLIGHTENMENT || spod.getType() == OrderDetailTypeEnum.TRAINING_SINGLE
 						|| spod.getType() == OrderDetailTypeEnum.TRAINING_MIX || spod.getType() == OrderDetailTypeEnum.HIGH_ONLINE
-						|| spod.getType() == OrderDetailTypeEnum.MUSIC_NETWORK || spod.getType() == OrderDetailTypeEnum.CLASSROOM) {
+						|| spod.getType() == OrderDetailTypeEnum.MUSIC_NETWORK || spod.getType() == OrderDetailTypeEnum.CLASSROOM || spod.getType() == OrderDetailTypeEnum.THEORY_COURSE) {
 					spod.setType(OrderDetailTypeEnum.COURSE);
+					withoutMusicalTotalAmount = withoutMusicalTotalAmount.add(spod.getPrice().subtract(spod.getRemitFee()));
 				}else if(spod.getType() == OrderDetailTypeEnum.MUSICAL){
 					kitGroupPurchaseType = spod.getKitGroupPurchaseType();
 					goodsId = spod.getGoodsIdList();
 				}else if(spod.getType() == OrderDetailTypeEnum.ACCESSORIES){
 					accessoriesId = spod.getGoodsIdList();
+				}else{
+					withoutMusicalTotalAmount = withoutMusicalTotalAmount.add(spod.getPrice().subtract(spod.getRemitFee()));
 				}
 				
 				amount = userOrderTypeMap.get(spod.getType());
 				if(amount != null){
-					amount = amount.add(spod.getPrice());
+					amount = amount.add(spod.getPrice().subtract(spod.getRemitFee()));
 				}else{
-					amount = spod.getPrice();
+					amount = spod.getPrice().subtract(spod.getRemitFee());
 				}
 				userOrderTypeMap.put(spod.getType(), amount);
+				
+				orderTotalAmount = orderTotalAmount.add(spod.getPrice().subtract(spod.getRemitFee()));
 			}
         	
         	subjectChange = subjectChangeMap.get(studentRegistration.getUserId());
@@ -363,7 +371,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         		dto.setMusicalName(subjectChange.getChangeMusicalGoods().getName());
         		dto.setMusicGroupName(musicGroup.getName());
         		dto.setOrganName(organization.getName());
-        		//dto.setOrderAmount(orderAmount);
+        		dto.setOrderAmount(withoutMusicalTotalAmount.add(subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())));
         		dto.setUserId(userId);
         		dto.setSubjectName(userSubjectMap.get(userId));
         		dto.setUsername(usernameMap.get(userId));
@@ -384,7 +392,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         		}
         		dto.setMusicGroupName(musicGroup.getName());
         		dto.setOrganName(organization.getName());
-        		//dto.setOrderAmount(orderAmount);
+        		dto.setOrderAmount(orderTotalAmount);
         		dto.setUserId(userId);
         		dto.setSubjectName(userSubjectMap.get(userId));
         		dto.setUsername(usernameMap.get(userId));