|  | @@ -682,7 +682,6 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 | 
											
												
													
														|  |                  sellOrder.setTransNo(order.getTransNo());
 |  |                  sellOrder.setTransNo(order.getTransNo());
 | 
											
												
													
														|  |                  sellOrder.setOrderId(order.getId());
 |  |                  sellOrder.setOrderId(order.getId());
 | 
											
												
													
														|  |                  sellOrder.setOrderNo(order.getOrderNo());
 |  |                  sellOrder.setOrderNo(order.getOrderNo());
 | 
											
												
													
														|  | -                sellOrder.setSellCost(nowGoods.getDiscountPrice());
 |  | 
 | 
											
												
													
														|  |                  sellOrder.setUserId(order.getUserId());
 |  |                  sellOrder.setUserId(order.getUserId());
 | 
											
												
													
														|  |                  sellOrder.setPaymentChannel(order.getPaymentChannel());
 |  |                  sellOrder.setPaymentChannel(order.getPaymentChannel());
 | 
											
												
													
														|  |                  sellOrder.setMerNo(order.getMerNos());
 |  |                  sellOrder.setMerNo(order.getMerNos());
 |