feat : 订单列表修改

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/GamePayWayDTO.java

@@ -0,0 +1,85 @@
+package com.zanxiang.manage.domain.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 游戏支付方式
+ */
+@Data
+public class GamePayWayDTO {
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 游戏id
+     */
+    private Long gameId;
+
+    /**
+     * 支付渠道id
+     */
+    private Long payWayId;
+
+    /**
+     * 支付方式id
+     */
+    private Long payDeviceId;
+
+    /**
+     * 支付名称
+     */
+    private String payName;
+
+    /**
+     * 支付盒子id
+     */
+    private Long payBoxId;
+
+    /**
+     * 应用appId
+     */
+    private String appId;
+
+    /**
+     * 应用名称
+     */
+    private String appName;
+
+    /**
+     * 商户号
+     */
+    private String merchantNo;
+
+    /**
+     * 客服消息卡片图片地址
+     */
+    private String thumbUrl;
+
+    /**
+     * 状态 1 不可用 0 可用
+     */
+    private Integer status;
+
+    /**
+     * 是否已删除 1 已删除 0 正常
+     */
+    private Integer isDelete;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/PayDeviceDTO.java

@@ -0,0 +1,27 @@
+package com.zanxiang.manage.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 支付方式
+ */
+@Data
+public class PayDeviceDTO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 支付方式
+     */
+    private String payDeviceKey;
+
+    /**
+     * 名称
+     */
+    private String payDeviceName;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/dto/PayWayDTO.java

@@ -0,0 +1,27 @@
+package com.zanxiang.manage.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 支付方式
+ */
+@Data
+public class PayWayDTO {
+
+    /**
+     * 支付方式
+     */
+    private Long id;
+
+    /**
+     * 支付渠道标识
+     */
+    private String payWayKey;
+
+    /**
+     * 支付渠道名称
+     */
+    private String payWayName;
+}

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

@@ -121,7 +121,7 @@ public class OrderVO {
     private String payWay;
 
     @ApiModelProperty(notes = "支付场景id")
-    private Integer payDevice;
+    private Long payDeviceId;
 
     @ApiModelProperty(notes = "支付场景")
     private String payDeviceName;

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

@@ -14,36 +14,18 @@ public class PayWayVO {
     /**
      * 支付方式
      */
-    @ApiModelProperty(notes = "支付方式id")
+    @ApiModelProperty(notes = "支付方式")
     private Long id;
 
     /**
-     * 支付通道
+     * 支付渠道标识
      */
-    @ApiModelProperty(notes = "支付通道")
-    private String code;
+    @ApiModelProperty(notes = "支付渠道标识")
+    private String payWayKey;
 
     /**
-     * 支付名称
+     * 支付渠道名称
      */
-    @ApiModelProperty(notes = "支付名称")
-    private String payName;
-
-    /**
-     * 父ID
-     */
-    @ApiModelProperty(notes = "父ID")
-    private Integer parentId;
-
-    /**
-     * 支付配置（存储需要配置的信息json）
-     */
-    @ApiModelProperty(notes = "支付配置")
-    private String payExt;
-
-    /**
-     * 描述
-     */
-    @ApiModelProperty(notes = "描述")
-    private String remark;
+    @ApiModelProperty(notes = "支付渠道名称")
+    private String payWayName;
 }

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

@@ -11,14 +11,15 @@ import com.zanxiang.advertising.oceanengine.track.base.pojo.dto.AppOrderRpcDTO;
 import com.zanxiang.advertising.oceanengine.track.base.pojo.rpc.IAppOrderRpc;
 import com.zanxiang.advertising.oceanengine.track.base.pojo.vo.AppReportLogRpcVO;
 import com.zanxiang.common.enums.CallBackEnum;
-import com.zanxiang.common.enums.PayDeviceEnum;
 import com.zanxiang.common.enums.PayWayEnum;
 import com.zanxiang.common.exception.BaseException;
 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.*;
+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.service.*;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -72,6 +73,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private OrderService orderService;
 
+    @Autowired
+    private PayDeviceService payDeviceService;
+
     @DubboReference(providedBy = PlatformServer.SERVER_DUBBO_NAME)
     private IAppOrderRpc appOrderRpc;
 
@@ -191,7 +195,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             return new OrderListVO(param.toPage().getSize());
         }
         IPage<OrderVO> page = page(param.toPage(), getListWrapper(param, agentIds, "*")).convert(this::orderToVo);
-
         if (page.getTotal() == 0) {
             return new OrderListVO(param.toPage().getSize());
         }
@@ -226,10 +229,13 @@ 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();
+        //支付渠道列表
+        Map<Long, PayWayDTO> payWayMap = payWayService.payWayMap();
+        //支付方式列表
+        Map<Long, PayDeviceDTO> payDeviceMap = payDeviceService.payDeviceMap();
         //字段信息补充更新
-        orderListVOList.forEach(vo -> this.update(vo, userMap, channelMap, gameMap, gameCategoryMap, cpMap, promoAccountMap, payWayMap));
+        orderListVOList.forEach(vo -> this.update(vo, userMap, channelMap, gameMap, gameCategoryMap, cpMap,
+                promoAccountMap, payWayMap, payDeviceMap));
         //设置返回
         OrderListVO orderListVO = new OrderListVO();
         orderListVO.setSize(page.getSize());
@@ -243,7 +249,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     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) {
+                        Map<Long, PromoAccountDTO> promoAccountMap, Map<Long, PayWayDTO> payWayMap, Map<Long, PayDeviceDTO> payDeviceMap) {
         orderVO.setDateTime(orderVO.getCreateTime().toLocalDate());
         //用户信息补充
         UserDTO userDTO = userMap.get(orderVO.getUserId());
@@ -292,18 +298,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //注册游戏应用类型
             GameCategoryDTO gameCategoryDTO = gameCategoryMap.get(gameDTO.getCategory());
             if (gameCategoryDTO != null) {
-                orderVO.setGameCategoryId(gameCategoryDTO.getId());
                 orderVO.setGameCategory(gameCategoryDTO.getName());
+                orderVO.setGameCategoryId(gameCategoryDTO.getId());
             }
         }
-        //支付方式
-        PayWayVO payWayVO = payWayMap.get(orderVO.getPayWayId());
-        if (payWayVO != null) {
-            orderVO.setPayWay(payWayVO.getPayName());
+        //支付渠道
+        if (payWayMap.get(orderVO.getPayWayId()) != null) {
+            orderVO.setPayWay(payWayMap.get(orderVO.getPayWayId()).getPayWayName());
         }
         //支付场景
-        String descByNum = PayDeviceEnum.getDescByNum(orderVO.getPayDevice());
-        orderVO.setPayDeviceName(descByNum);
+        if (payDeviceMap.get(orderVO.getPayDeviceId()) != null) {
+            orderVO.setPayDeviceName(payDeviceMap.get(orderVO.getPayDeviceId()).getPayDeviceName());
+        }
     }
 
     private LambdaQueryWrapper<Order> getListWrapper(OrderParam param, List<Long> agentIdList, String select) {

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

@@ -0,0 +1,39 @@
+package com.zanxiang.manage.service.Impl;
+
+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.dto.PayDeviceDTO;
+import com.zanxiang.manage.service.PayDeviceService;
+import com.zanxiang.mybatis.entity.PayDevice;
+import com.zanxiang.mybatis.mapper.PayDeviceMapper;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 支付方式
+ */
+@Service
+@Slf4j
+public class PayDeviceServiceImpl extends ServiceImpl<PayDeviceMapper, PayDevice> implements PayDeviceService {
+
+    @Override
+    public Map<Long, PayDeviceDTO> payDeviceMap() {
+        //查询
+        List<PayDevice> payDeviceList = super.list();
+        if (CollectionUtils.isEmpty(payDeviceList)) {
+            return Collections.emptyMap();
+        }
+        List<PayDeviceDTO> list = BeanUtils.copyList(payDeviceList, PayDeviceDTO.class);
+        //构造返回
+        return list.stream().collect(Collectors.toMap(PayDeviceDTO::getId, Function.identity()));
+    }
+}

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

@@ -4,11 +4,12 @@ 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.dto.PayWayDTO;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
@@ -18,42 +19,31 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * 支付方式 服务实现类
- *
- * @author xufeng
- * @date 2022-06-17 16:05
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 支付渠道
  */
 @Service
+@Slf4j
 public class PayWayServiceImpl extends ServiceImpl<PayWayMapper, PayWay> implements PayWayService {
 
-    /**
-     * 支付方式选择列表查询
-     *
-     * @return : 返回支付方式列表
-     */
     @Override
     public List<PayWayChoiceVO> payWayChoiceList() {
         List<PayWay> payWayList = super.list(new LambdaQueryWrapper<PayWay>()
-//                        .select(PayWay::getId, PayWay::getPayName)
+                .select(PayWay::getId, PayWay::getPayWayName)
         );
         return BeanUtils.copyList(payWayList, PayWayChoiceVO.class);
     }
 
-
-    /**
-     * 支付方式图
-     *
-     * @return {@link Map}<{@link Long}, {@link PayWayVO}>
-     */
     @Override
-    public Map<Long, PayWayVO> payWayMap() {
+    public Map<Long, PayWayDTO> payWayMap() {
         //查询
         List<PayWay> payWayList = super.list();
         if (CollectionUtils.isEmpty(payWayList)) {
             return Collections.emptyMap();
         }
-        List<PayWayVO> list = BeanUtils.copyList(payWayList, PayWayVO.class);
+        List<PayWayDTO> list = BeanUtils.copyList(payWayList, PayWayDTO.class);
         //构造返回
-        return list.stream().collect(Collectors.toMap(PayWayVO::getId, Function.identity()));
+        return list.stream().collect(Collectors.toMap(PayWayDTO::getId, Function.identity()));
     }
 }

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

@@ -0,0 +1,22 @@
+package com.zanxiang.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.manage.domain.dto.PayDeviceDTO;
+import com.zanxiang.mybatis.entity.PayDevice;
+
+import java.util.Map;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 支付方式
+ */
+public interface PayDeviceService extends IService<PayDevice> {
+
+    /**
+     * 支付方式
+     *
+     * @return {@link Map}<{@link Long}, {@link PayDeviceDTO}>
+     */
+    Map<Long, PayDeviceDTO> payDeviceMap();
+}

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

@@ -1,6 +1,7 @@
 package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.manage.domain.dto.PayWayDTO;
 import com.zanxiang.manage.domain.vo.PayWayChoiceVO;
 import com.zanxiang.manage.domain.vo.PayWayVO;
 import com.zanxiang.mybatis.entity.PayWay;
@@ -9,17 +10,16 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 支付方式 服务类接口
- *
- * @author xufeng
- * @date 2022-06-17 16:05
+ * @author : lingfeng
+ * @time : 2023-02-09
+ * @description : 支付渠道
  */
 public interface PayWayService extends IService<PayWay> {
 
     /**
      * 支付方式选择列表查询
      *
-     * @return : 返回支付方式列表
+     * @return {@link List}<{@link PayWayChoiceVO}>
      */
     List<PayWayChoiceVO> payWayChoiceList();
 
@@ -28,6 +28,6 @@ public interface PayWayService extends IService<PayWay> {
      *
      * @return {@link Map}<{@link Long}, {@link PayWayVO}>
      */
-    Map<Long, PayWayVO> payWayMap();
+    Map<Long, PayWayDTO> payWayMap();
 
 }