| 
														
															@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 
														 | 
														
														 | 
														
															 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 
														 | 
														
														 | 
														
															 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.game.module.base.pojo.enums.CpStatusEnum; 
														 | 
														
														 | 
														
															 import com.zanxiang.game.module.base.pojo.enums.CpStatusEnum; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+import com.zanxiang.game.module.base.pojo.enums.GameCategoryEnum; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.game.module.base.util.DateUtils; 
														 | 
														
														 | 
														
															 import com.zanxiang.game.module.base.util.DateUtils; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.game.module.mybatis.entity.*; 
														 | 
														
														 | 
														
															 import com.zanxiang.game.module.mybatis.entity.*; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 import com.zanxiang.game.module.sdk.enums.OrderStateEnum; 
														 | 
														
														 | 
														
															 import com.zanxiang.game.module.sdk.enums.OrderStateEnum; 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -69,6 +70,9 @@ public class PerformOrderServiceImpl implements IPerformOrderService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Autowired 
														 | 
														
														 | 
														
															     @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     private IGameAppletService gameAppletService; 
														 | 
														
														 | 
														
															     private IGameAppletService gameAppletService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    @Autowired 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+    private IGameService gameService; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Override 
														 | 
														
														 | 
														
															     @Override 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Transactional(rollbackFor = {RuntimeException.class, Exception.class}) 
														 | 
														
														 | 
														
															     @Transactional(rollbackFor = {RuntimeException.class, Exception.class}) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     public Boolean pushCp(PlatformOrderDTO orderInfo) { 
														 | 
														
														 | 
														
															     public Boolean pushCp(PlatformOrderDTO orderInfo) { 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -82,12 +86,14 @@ public class PerformOrderServiceImpl implements IPerformOrderService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             log.error("充值回调CP失败, 游戏拓展信息中的回调地址为空!"); 
														 | 
														
														 | 
														
															             log.error("充值回调CP失败, 游戏拓展信息中的回调地址为空!"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             return false; 
														 | 
														
														 | 
														
															             return false; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        //游戏信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        Game game = gameService.getById(orderInfo.getGameId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //用户信息 
														 | 
														
														 | 
														
															         //用户信息 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         User user = userService.getById(orderInfo.getUserId()); 
														 | 
														
														 | 
														
															         User user = userService.getById(orderInfo.getUserId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //回调CP 
														 | 
														
														 | 
														
															         //回调CP 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         Map<String, String> map = new HashMap<>(9); 
														 | 
														
														 | 
														
															         Map<String, String> map = new HashMap<>(9); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        //用户存在关联用户id, 且游戏存在导量游戏id, 判定为导量用户, 提交CP原始用户id 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        if (user.getRelationUserId() != null) { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        //用户存在关联用户id, 且不是微信小程序, 则判定为导量用户, 提交CP原始用户id 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        if (user.getRelationUserId() != null && !Objects.equals(game.getCategory(), GameCategoryEnum.CATEGORY_WX_APPLET.getId())) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             map.put("userId", String.valueOf(user.getRelationUserId())); 
														 | 
														
														 | 
														
															             map.put("userId", String.valueOf(user.getRelationUserId())); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } else { 
														 | 
														
														 | 
														
															         } else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             map.put("userId", String.valueOf(orderInfo.getUserId())); 
														 | 
														
														 | 
														
															             map.put("userId", String.valueOf(orderInfo.getUserId())); 
														 |