| 
														
															@@ -14,6 +14,7 @@ import java.util.concurrent.TimeUnit; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import java.util.function.BiPredicate; 
														 | 
														
														 | 
														
															 import java.util.function.BiPredicate; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import java.util.stream.Collectors; 
														 | 
														
														 | 
														
															 import java.util.stream.Collectors; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.alibaba.fastjson.JSON; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.service.*; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.service.*; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.apache.commons.collections.CollectionUtils; 
														 | 
														
														 | 
														
															 import org.apache.commons.collections.CollectionUtils; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import org.apache.commons.lang3.StringUtils; 
														 | 
														
														 | 
														
															 import org.apache.commons.lang3.StringUtils; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -32,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.alibaba.fastjson.JSONArray; 
														 | 
														
														 | 
														
															 import com.alibaba.fastjson.JSONArray; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.auth.api.client.SysUserFeignService; 
														 | 
														
														 | 
														
															 import com.ym.mec.auth.api.client.SysUserFeignService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.auth.api.entity.SysUser; 
														 | 
														
														 | 
														
															 import com.ym.mec.auth.api.entity.SysUser; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-import com.ym.mec.biz.dal.dao.ActivityUserMapperDao; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.dao.MemberRankSettingDao; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.dao.MemberRankSettingDao; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao; 
														 | 
														
														 | 
														
															 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -664,6 +664,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     public boolean liveBuyOrderCallback(StudentPaymentOrder studentPaymentOrder) { 
														 | 
														
														 | 
														
															     public boolean liveBuyOrderCallback(StudentPaymentOrder studentPaymentOrder) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //查询原定的是否已处理 
														 | 
														
														 | 
														
															         //查询原定的是否已处理 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.lockOrder(studentPaymentOrder.getId()); 
														 | 
														
														 | 
														
															         StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.lockOrder(studentPaymentOrder.getId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        logger.info("XXX-createOrder ---> liveBuyOrderCallback:{}", JSON.toJSONString(orignStudentPaymentOrder)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (orignStudentPaymentOrder == null) { 
														 | 
														
														 | 
														
															         if (orignStudentPaymentOrder == null) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             return false; 
														 | 
														
														 | 
														
															             return false; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 |