| 
					
				 | 
			
			
				@@ -356,7 +356,7 @@ public class PayOrderController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //扫码进标签优惠:一码一签 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if(StringUtils.isNoneBlank(payOrderRequest.getLabelId()) && !payOrderRequest.getLabelId().equals("undefined")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //如果前端传来labelId,则表示一码一签; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                logger.info("labelId:"+payOrderRequest.getLabelId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                logger.info("传入标签labelId: "+payOrderRequest.getLabelId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 params.put("labelId", payOrderRequest.getLabelId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 payOrderResultInfo = this.calculateLabelDiscount(params); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //是否强制将该扫码用户拉入此标签:0、否;1、是; 
			 |