Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/OrderServiceImpl.java

@@ -60,6 +60,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IAgentService agentService;
 
+    @Autowired
+    private IPayMerchantService payMerchantService;
+
     @Override
     public IPage<UserOrderListVO> orderList(UserOrderListParam param) {
         //执行查询
@@ -140,8 +143,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //游戏信息
         Map<Long, GameDTO> gameMap = gameService.gameMap(orderListVOList.stream()
                 .map(OrderVO::getGameId).collect(Collectors.toSet()));
+        //商户列表
+        Map<String, PayMerchantDTO> payMerchantMap = payMerchantService.payMerchantMap();
         //字段信息补充更新
-        orderListVOList.forEach(vo -> this.toVO(vo, userMap, gameMap, cpMap, agentMap));
+        orderListVOList.forEach(vo -> this.toVO(vo, userMap, gameMap, cpMap, agentMap, payMerchantMap));
         //设置返回
         OrderListVO orderListVO = new OrderListVO();
         orderListVO.setSize(page.getSize());
@@ -154,7 +159,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     private void toVO(OrderVO orderVO, Map<Long, UserDTO> userMap, Map<Long, GameDTO> gameMap, Map<Long, CpDTO> cpMap,
-                      Map<Long, AgentDTO> agentMap) {
+                      Map<Long, AgentDTO> agentMap, Map<String, PayMerchantDTO> payMerchantMap) {
         orderVO.setDateTime(orderVO.getCreateTime().toLocalDate());
         //用户信息补充
         UserDTO userDTO = userMap.get(orderVO.getUserId());
@@ -171,6 +176,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //CP名称
         CpDTO cpDTO = cpMap.get(orderVO.getCpId());
         orderVO.setCpName(cpDTO == null ? null : cpDTO.getCpName());
+        //商户名称
+        PayMerchantDTO payMerchantDTO = payMerchantMap.get(orderVO.getMerchantNo());
+        orderVO.setMerchantName(payMerchantDTO == null ? null : payMerchantDTO.getMerchantName());
         //游戏信息
         GameDTO gameDTO = gameMap.get(orderVO.getGameId());
         if (gameDTO != null) {

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/UserServiceImpl.java

@@ -120,7 +120,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         AgentDTO agentDTO = agentMap.get(userListVO.getAgentId());
         if (agentDTO != null) {
             userListVO.setAgentName(agentDTO.getAgentName());
-            userListVO.setAccountId(agentDTO.getId());
+            userListVO.setAccountId(agentDTO.getAccountId());
             userListVO.setPitcherId(agentDTO.getCreateBy());
             userListVO.setPitcherName(agentDTO.getCreateByName());
             userListVO.setAccountType(agentDTO.getAccountType());