| 
														
															@@ -122,9 +122,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 i++; 
														 | 
														
														 | 
														
															                 i++; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 Map<String, BigDecimal> CostMap = new HashMap<>(); 
														 | 
														
														 | 
														
															                 Map<String, BigDecimal> CostMap = new HashMap<>(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                CostMap.put("sellCost",goods.getDiscountPrice()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                if(goods.getAgreeCostPrice() != null){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    CostMap.put("SellCost2",goods.getAgreeCostPrice()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                CostMap.put("sellCost", goods.getDiscountPrice()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                if (goods.getAgreeCostPrice() != null) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    CostMap.put("SellCost2", goods.getAgreeCostPrice()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 } 
														 | 
														
														 | 
														
															                 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 SellOrder sellOrder = new SellOrder(); 
														 | 
														
														 | 
														
															                 SellOrder sellOrder = new SellOrder(); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -133,6 +133,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setTransNo(studentPaymentRouteOrderDto.getTransNo()); 
														 | 
														
														 | 
														
															                 sellOrder.setTransNo(studentPaymentRouteOrderDto.getTransNo()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setOrderId(studentPaymentRouteOrderDto.getId()); 
														 | 
														
														 | 
														
															                 sellOrder.setOrderId(studentPaymentRouteOrderDto.getId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setOrderNo(orderNo); 
														 | 
														
														 | 
														
															                 sellOrder.setOrderNo(orderNo); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                sellOrder.setGoodsName(goods.getName()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setActualAmount(actualAmount); 
														 | 
														
														 | 
														
															                 sellOrder.setActualAmount(actualAmount); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setBalanceAmount(BigDecimal.ZERO); 
														 | 
														
														 | 
														
															                 sellOrder.setBalanceAmount(BigDecimal.ZERO); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setExpectAmount(actualAmount); 
														 | 
														
														 | 
														
															                 sellOrder.setExpectAmount(actualAmount); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -145,13 +146,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setSellTime(studentPaymentRouteOrderDto.getCreateTime()); 
														 | 
														
														 | 
														
															                 sellOrder.setSellTime(studentPaymentRouteOrderDto.getCreateTime()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setCreateIme(new Date()); 
														 | 
														
														 | 
														
															                 sellOrder.setCreateIme(new Date()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrder.setUpdateTime(new Date()); 
														 | 
														
														 | 
														
															                 sellOrder.setUpdateTime(new Date()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                if (goods.getType().equals(GoodsType.INSTRUMENT)) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    sellOrder.setType(SellTypeEnum.INSTRUMENT); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                } else if (goods.getType().equals(GoodsType.ACCESSORIES)) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    sellOrder.setType(SellTypeEnum.ACCESSORIES); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                } else { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    sellOrder.setType(SellTypeEnum.OTHER); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                sellOrder.setType(SellTypeEnum.SCHOOL_BUY); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 sellOrders.add(sellOrder); 
														 | 
														
														 | 
														
															                 sellOrders.add(sellOrder); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } 
														 | 
														
														 | 
														
															             } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             sellOrderDao.batchInsert(sellOrders); 
														 | 
														
														 | 
														
															             sellOrderDao.batchInsert(sellOrders); 
														 |