feat : 调试修改

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/OrderVO.java

@@ -114,6 +114,9 @@ public class OrderVO {
     @ApiModelProperty(notes = "订单实付金额")
     private BigDecimal realAmount;
 
+    @ApiModelProperty(notes = "支付方式id")
+    private Long payWayId;
+
     @ApiModelProperty(notes = "支付方式")
     private String payWay;
 

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/PayWayVO.java

@@ -15,7 +15,7 @@ public class PayWayVO {
      * 支付方式
      */
     @ApiModelProperty(notes = "支付方式id")
-    private Integer id;
+    private Long id;
 
     /**
      * 支付通道

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

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.common.enums.PayDeviceEnum;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.dto.*;
 import com.zanxiang.manage.domain.params.OrderParam;
 import com.zanxiang.manage.domain.params.UserOrderListParam;
-import com.zanxiang.manage.domain.vo.GameCategoryVO;
-import com.zanxiang.manage.domain.vo.OrderListVO;
-import com.zanxiang.manage.domain.vo.OrderVO;
-import com.zanxiang.manage.domain.vo.UserOrderListVO;
+import com.zanxiang.manage.domain.vo.*;
 import com.zanxiang.manage.service.*;
 import com.zanxiang.mybatis.entity.Order;
 import com.zanxiang.mybatis.mapper.OrderMapper;
@@ -57,6 +55,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private PayWayService payWayService;
+
     /**
      * 获取用户下单记录
      *
@@ -157,8 +158,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Map<Long, GameDTO> gameMap = gameService.gameMap(gameIdSet);
         //游戏分类信息
         Map<Long, GameCategoryDTO> gameCategoryMap = gameCategoryService.gameCategoryMap();
+        //支付方式
+        Map<Long, PayWayVO> payWayMap = payWayService.payWayMap();
         //字段信息补充更新
-        orderListVOList.forEach(vo -> this.update(vo, userMap, channelMap, gameMap, gameCategoryMap, cpMap, promoAccountMap));
+        orderListVOList.forEach(vo -> this.update(vo, userMap, channelMap, gameMap, gameCategoryMap, cpMap, promoAccountMap, payWayMap));
         //设置返回
         OrderListVO orderListVO = new OrderListVO();
         orderListVO.setSize(page.getSize());
@@ -170,8 +173,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return orderListVO;
     }
 
-    private void update(OrderVO orderVO, Map<Long, UserDTO> userMap, Map<Long, PromoChannelDTO> channelMap, Map<Long, GameDTO> gameMap,
-                        Map<Long, GameCategoryDTO> gameCategoryMap, Map<Long, CpDTO> cpMap, Map<Long, PromoAccountDTO> promoAccountMap) {
+    private void update(OrderVO orderVO, Map<Long, UserDTO> userMap, Map<Long, PromoChannelDTO> channelMap,
+                        Map<Long, GameDTO> gameMap, Map<Long, GameCategoryDTO> gameCategoryMap, Map<Long, CpDTO> cpMap,
+                        Map<Long, PromoAccountDTO> promoAccountMap, Map<Long, PayWayVO> payWayMap) {
         orderVO.setDateTime(orderVO.getCreateTime().toLocalDate());
         orderVO.setOrderId(orderVO.getId());
         //用户信息补充
@@ -225,6 +229,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 orderVO.setGameCategory(gameCategoryDTO.getName());
             }
         }
+        //支付方式
+        PayWayVO payWayVO = payWayMap.get(orderVO.getPayWayId());
+        if (payWayVO != null) {
+            orderVO.setPayWay(payWayVO.getPayName());
+        }
+        //支付场景
+        String descByNum = PayDeviceEnum.getDescByNum(Integer.valueOf(orderVO.getPayDevice()));
+        orderVO.setPayDevice(descByNum);
     }
 
     private LambdaQueryWrapper<Order> getListWrapper(OrderParam param, List<Long> agentIdList, String select) {

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/PayWayServiceImpl.java

@@ -1,15 +1,21 @@
 package com.zanxiang.manage.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.vo.PayWayChoiceVO;
+import com.zanxiang.manage.domain.vo.PayWayVO;
 import com.zanxiang.manage.service.PayWayService;
 import com.zanxiang.mybatis.entity.PayWay;
 import com.zanxiang.mybatis.mapper.PayWayMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 支付方式 服务实现类
@@ -31,4 +37,22 @@ public class PayWayServiceImpl extends ServiceImpl<PayWayMapper, PayWay> impleme
                 select(PayWay::getId, PayWay::getPayName));
         return BeanUtils.copyList(payWayList, PayWayChoiceVO.class);
     }
+
+
+    /**
+     * 支付方式图
+     *
+     * @return {@link Map}<{@link Long}, {@link PayWayVO}>
+     */
+    @Override
+    public Map<Long, PayWayVO> payWayMap() {
+        //查询
+        List<PayWay> payWayList = super.list();
+        if (CollectionUtils.isEmpty(payWayList)) {
+            return Collections.emptyMap();
+        }
+        List<PayWayVO> list = BeanUtils.copyList(payWayList, PayWayVO.class);
+        //构造返回
+        return list.stream().collect(Collectors.toMap(PayWayVO::getId, Function.identity()));
+    }
 }

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

@@ -2,9 +2,11 @@ package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.manage.domain.vo.PayWayChoiceVO;
+import com.zanxiang.manage.domain.vo.PayWayVO;
 import com.zanxiang.mybatis.entity.PayWay;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 支付方式 服务类接口
@@ -21,4 +23,11 @@ public interface PayWayService extends IService<PayWay> {
      */
     List<PayWayChoiceVO> payWayChoiceList();
 
+    /**
+     * 支付方式图
+     *
+     * @return {@link Map}<{@link Long}, {@link PayWayVO}>
+     */
+    Map<Long, PayWayVO> payWayMap();
+
 }

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Order.java

@@ -144,7 +144,7 @@ public class Order {
     private Integer status;
 
     /**
-     * 支付方式
+     * 支付配置id
      */
     private String gamePaywayId;
 
@@ -269,11 +269,6 @@ public class Order {
      */
     private Long payWayId;
 
-    /**
-     * 支付配置id
-     */
-    private Long gamePayWayId;
-
     /**
      * 注册游戏id
      */
@@ -289,4 +284,15 @@ public class Order {
      */
     private String adId;
 
+    /**
+     * 角色等级
+     */
+    private Long roleLevel;
+
+    /**
+     * 角色VIP
+     */
+    private Long roleVipLevel;
+
+
 }