| 
					
				 | 
			
			
				@@ -4317,15 +4317,15 @@ public class OrderServiceImpl implements OrderService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 清空上一次计算活动价格的相关信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BigDecimal deductionPrice = good.getDeductionPrice(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (Objects.nonNull(deductionPrice)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                good.setDeductionPrice(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                good.setDeductionPrice(BigDecimal.ZERO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Integer deductionScore = good.getDeductionScore(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (Objects.nonNull(deductionScore)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                good.setDeductionScore(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                good.setDeductionScore(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BigDecimal discountedPrice = good.getDiscountedPrice(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (Objects.nonNull(discountedPrice)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                good.setDiscountedPrice(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                good.setDiscountedPrice(BigDecimal.ZERO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String activity = good.getActivity(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (Objects.nonNull(activity)) { 
			 |