|  | @@ -184,7 +184,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        logger.info("XXX-createOrder ---> cashAmount:{}, balance:{}", cashAmount, cashAmount.compareTo(BigDecimal.ZERO));
 | 
	
		
			
				|  |  | +        //logger.info("XXX-createOrder ---> cashAmount:{}, balance:{}", cashAmount, cashAmount.compareTo(BigDecimal.ZERO));
 | 
	
		
			
				|  |  |          if (cashAmount.compareTo(BigDecimal.ZERO) == 0) {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              studentPaymentRouteOrderService.addRouteOrder(studentPaymentOrder.getOrderNo(), studentPaymentOrder.getOrganId(), balance);
 | 
	
	
		
			
				|  | @@ -398,11 +398,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 | 
	
		
			
				|  |  |      @Transactional(rollbackFor = Exception.class)
 | 
	
		
			
				|  |  |      public void updateOrder(Map<String, String> rpMap) throws Exception {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        logger.info("XXX-createOrder ---> updateOrder:{}", rpMap);
 | 
	
		
			
				|  |  | +        //logger.info("XXX-createOrder ---> updateOrder:{}", rpMap);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
 | 
	
		
			
				|  |  |          StudentPaymentOrder order = findOrderByOrderNo(rpMap.get("merOrderNo"));
 | 
	
		
			
				|  |  | -        order = studentPaymentOrderDao.lockOrder(order.getId());
 | 
	
		
			
				|  |  | +        //order = studentPaymentOrderDao.lockOrder(order.getId());
 | 
	
		
			
				|  |  |          //关闭或失败的订单查询订单成功,订单改成成功,钱退到余额
 | 
	
		
			
				|  |  |          if (order != null && (order.getStatus().equals(DealStatusEnum.CLOSE) || order.getStatus().equals(DealStatusEnum.FAILED)) && status.equals(DealStatusEnum.SUCCESS)) {
 | 
	
		
			
				|  |  |              String memo = order.getStatus().equals(DealStatusEnum.CLOSE) ? "关闭订单" : "失败订单";
 | 
	
	
		
			
				|  | @@ -567,7 +567,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      //调用相应业务回调接口
 | 
	
		
			
				|  |  |      public void callOrderCallBack(StudentPaymentOrder order) throws Exception {
 | 
	
		
			
				|  |  | -        logger.info("XXX-createOrder ---> callOrderCallBack:{}", JSON.toJSONString(order));
 | 
	
		
			
				|  |  | +        //logger.info("XXX-createOrder ---> callOrderCallBack:{}", JSON.toJSONString(order));
 | 
	
		
			
				|  |  |          if(order.getGroupType() == GroupType.ACTIVITY){
 | 
	
		
			
				|  |  |              vipGroupActivityService.orderCallback(order);
 | 
	
		
			
				|  |  |          }else {
 |