feat : 项目运行整理

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/ChoiceController.java

@@ -220,7 +220,7 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:payBoxChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayBoxTypeChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<PayBoxTypeChoiceVO>> payBoxChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PayBoxTypeEnum.values()), PayBoxTypeChoiceVO.class));
+        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(AppletStoreEnum.values()), PayBoxTypeChoiceVO.class));
     }
 
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/GamePayWayController.java

@@ -52,7 +52,8 @@ public class GamePayWayController {
     @PreAuthorize(permissionKey = "sdk:gamePayWay:allGamePayWayByGameId")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = AllGamePayWayByGameIdVO.class)})
     public ResultVO<AllGamePayWayByGameIdVO> getInfo(@RequestParam Long gameId) {
-        return new ResultVO<>(gamePayWayService.getAllGamePayWayByGameId(gameId));
+//        return new ResultVO<>(gamePayWayService.getAllGamePayWayByGameId(gameId));
+        return null;
     }
 
     @ApiOperation(value = "获取游戏虚拟支付配置")
@@ -60,7 +61,8 @@ public class GamePayWayController {
     @PreAuthorize(permissionKey = "sdk:gamePayWay:analogPayInfo")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameAnalogPayVO.class)})
     public ResultVO<GameAnalogPayVO> getGameAnalogPay(@RequestParam Long id) {
-        return new ResultVO<>(gamePayWayService.getGameAnalogPay(id));
+//        return new ResultVO<>(gamePayWayService.getGameAnalogPay(id));
+        return null;
     }
 
     @ApiOperation(value = "游戏虚拟支付配置添加或者更新")
@@ -68,6 +70,7 @@ public class GamePayWayController {
     @PreAuthorize(permissionKey = "sdk:gamePayWay:analogPayAddOrUpdate")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
     public ResultVO<Boolean> gameAnalogPayAddOrUpdate(@Validated @RequestBody GameAnalogPayParam param) {
-        return new ResultVO<>(gamePayWayService.gameAnalogPayAddOrUpdate(param));
+//        return new ResultVO<>(gamePayWayService.gameAnalogPayAddOrUpdate(param));
+        return null;
     }
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/PayWayController.java

@@ -1,13 +1,9 @@
 package com.zanxiang.manage.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.common.enums.HttpStatusEnum;
-import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.manage.domain.vo.PayWayVO;
 import com.zanxiang.manage.service.PayWayService;
-import com.zanxiang.mybatis.entity.PayWay;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,10 +31,11 @@ public class PayWayController {
     @GetMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:payWay:list")
     public ResultVO<List<PayWayVO>> list() {
-        List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>().eq(PayWay::getParentId, 0));
-        if (list.isEmpty()) {
-            return new ResultVO<>(HttpStatusEnum.SUCCESS);
-        }
-        return new ResultVO<>(HttpStatusEnum.SUCCESS, BeanUtils.copyList(list, PayWayVO.class));
+//        List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>().eq(PayWay::getParentId, 0));
+//        if (list.isEmpty()) {
+//            return new ResultVO<>(HttpStatusEnum.SUCCESS);
+//        }
+//        return new ResultVO<>(HttpStatusEnum.SUCCESS, BeanUtils.copyList(list, PayWayVO.class));
+        return null;
     }
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/PayApplicationAddUpdateParam.java

@@ -18,7 +18,7 @@ public class PayApplicationAddUpdateParam {
     private Long id;
 
     /**
-     * 应用名称
+     * 名称
      */
     @ApiModelProperty(notes = "应用名称")
     private String name;
@@ -45,7 +45,7 @@ public class PayApplicationAddUpdateParam {
      * 应用原始id
      */
     @ApiModelProperty(notes = "应用原始id")
-    private String primevalId;
+    private String ghId;
 
     /**
      * 应用主体
@@ -76,34 +76,4 @@ public class PayApplicationAddUpdateParam {
      */
     @ApiModelProperty(notes = "备注")
     private String remark;
-
-    /**
-     * 应用介绍
-     */
-    @ApiModelProperty(notes = "应用介绍")
-    private String appDesc;
-
-    /**
-     * 版本
-     */
-    @ApiModelProperty(notes = "版本")
-    private String version;
-
-    /**
-     * 应用地址
-     */
-    @ApiModelProperty(notes = "应用地址")
-    private String appUrl;
-
-    /**
-     * 应用头像
-     */
-    @ApiModelProperty(notes = "应用头像")
-    private String appLogo;
-
-    /**
-     * 小程序码
-     */
-    @ApiModelProperty(notes = "小程序码")
-    private String miniCode;
 }

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

@@ -2,11 +2,8 @@ package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.manage.domain.params.GameAnalogPayParam;
 import com.zanxiang.manage.domain.params.GamePayWayListParam;
 import com.zanxiang.manage.domain.params.GamePayWayParam;
-import com.zanxiang.manage.domain.vo.AllGamePayWayByGameIdVO;
-import com.zanxiang.manage.domain.vo.GameAnalogPayVO;
 import com.zanxiang.manage.domain.vo.GamePayWayListVO;
 import com.zanxiang.manage.domain.vo.GamePayWayVO;
 import com.zanxiang.mybatis.entity.GamePayWay;
@@ -29,13 +26,13 @@ public interface GamePayWayService extends IService<GamePayWay> {
      */
     List<GamePayWayVO> getByGameId(Long gameId);
 
-    /**
-     * 根据游戏id查询(状态yes)
-     *
-     * @param gameId
-     * @return
-     */
-    List<GamePayWayVO> getByGameIdForStatusYes(Long gameId);
+//    /**
+//     * 根据游戏id查询(状态yes)
+//     *
+//     * @param gameId
+//     * @return
+//     */
+//    List<GamePayWayVO> getByGameIdForStatusYes(Long gameId);
 
     /**
      * 游戏配置更新/保存/删除
@@ -53,27 +50,27 @@ public interface GamePayWayService extends IService<GamePayWay> {
      */
     IPage<GamePayWayListVO> list(GamePayWayListParam param);
 
-    /**
-     * 根据游戏id获取虚拟支付配置
-     *
-     * @param id : 游戏id
-     * @return : 返回游戏虚拟支付配置
-     */
-    GameAnalogPayVO getGameAnalogPay(Long id);
+//    /**
+//     * 根据游戏id获取虚拟支付配置
+//     *
+//     * @param id : 游戏id
+//     * @return : 返回游戏虚拟支付配置
+//     */
+//    GameAnalogPayVO getGameAnalogPay(Long id);
 
-    /**
-     * 虚拟支付更新或者新增
-     *
-     * @param payParam : 新增或者更新参数
-     * @return : 返回新增或者更新的结果
-     */
-    Boolean gameAnalogPayAddOrUpdate(GameAnalogPayParam payParam);
+//    /**
+//     * 虚拟支付更新或者新增
+//     *
+//     * @param payParam : 新增或者更新参数
+//     * @return : 返回新增或者更新的结果
+//     */
+//    Boolean gameAnalogPayAddOrUpdate(GameAnalogPayParam payParam);
 
-    /**
-     * 获取游戏所有支付方式
-     *
-     * @param gameId 游戏id
-     * @return
-     */
-    AllGamePayWayByGameIdVO getAllGamePayWayByGameId(Long gameId);
+//    /**
+//     * 获取游戏所有支付方式
+//     *
+//     * @param gameId 游戏id
+//     * @return
+//     */
+//    AllGamePayWayByGameIdVO getAllGamePayWayByGameId(Long gameId);
 }

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

@@ -72,7 +72,7 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
         gameApplet.setGhId(param.getGhId());
         gameApplet.setAccount(param.getAccount());
         gameApplet.setPassword(param.getPassword());
-        gameApplet.setAdminVx(param.getAdminVx());
+//        gameApplet.setAdminVx(param.getAdminVx());
         gameApplet.setCompany(param.getCompany());
         gameApplet.setAppSecret(param.getAppSecret());
         gameApplet.setUpdateTime(LocalDateTime.now());

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

@@ -61,19 +61,19 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
     public List<GamePayWayVO> getByGameId(Long gameId) {
         List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
                 .eq(GamePayWay::getGameId, gameId)
-                .select(GamePayWay::getId, GamePayWay::getPayWayName));
+                .select(GamePayWay::getId, GamePayWay::getPayName));
         return BeanUtils.copyList(gamePayWayList, GamePayWayVO.class);
     }
 
 
-    @Override
-    public List<GamePayWayVO> getByGameIdForStatusYes(Long gameId) {
-        List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
-                .eq(GamePayWay::getGameId, gameId)
-                .eq(GamePayWay::getStatus, StatusEnum.YES.getCode())
-                .select(GamePayWay::getId, GamePayWay::getPayWayName));
-        return BeanUtils.copyList(gamePayWayList, GamePayWayVO.class);
-    }
+//    @Override
+//    public List<GamePayWayVO> getByGameIdForStatusYes(Long gameId) {
+//        List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
+//                .eq(GamePayWay::getGameId, gameId)
+//                .eq(GamePayWay::getStatus, StatusEnum.YES.getCode())
+//                .select(GamePayWay::getId, GamePayWay::getPayName));
+//        return BeanUtils.copyList(gamePayWayList, GamePayWayVO.class);
+//    }
 
     @Override
     public Boolean saveOrUpdate(GamePayWayParam bo) {
@@ -114,135 +114,135 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
         return gamePayWayListVO;
     }
 
-    /**
-     * 根据游戏id获取虚拟支付配置
-     *
-     * @param id : 游戏id
-     * @return : 返回游戏虚拟支付配置
-     */
-    @Override
-    public GameAnalogPayVO getGameAnalogPay(Long id) {
-        GamePayWay gamePayWay = super.getOne(new LambdaQueryWrapper<GamePayWay>()
-                .eq(GamePayWay::getPayWayId, PayWayEnum.MIPAY.getNum())
-                .eq(GamePayWay::getGameId, id));
-        if (gamePayWay == null || Strings.isBlank(gamePayWay.getPayConfig())) {
-            return GameAnalogPayVO.builder().gameId(id).build();
-        }
-        return GameAnalogPayVO.builder()
-                .id(gamePayWay.getId().toString())
-                .gameId(id)
-                .payConfig(JsonUtil.toObj(gamePayWay.getPayConfig(), GameAnalogPayVO.PayConfigBean.class))
-                .build();
-    }
-
-    /**
-     * 虚拟支付更新或者新增
-     *
-     * @param payParam : 新增或者更新参数
-     * @return : 返回新增或者更新的结果
-     */
-    @Override
-    public Boolean gameAnalogPayAddOrUpdate(GameAnalogPayParam payParam) {
-        GamePayWay gamePayWay = super.getOne(new LambdaQueryWrapper<GamePayWay>()
-                .eq(GamePayWay::getPayWayId, PayWayEnum.MIPAY.getNum())
-                .eq(GamePayWay::getGameId, payParam.getGameId()));
-        if (gamePayWay == null) {
-            gamePayWay = GamePayWay.builder()
-                    .gameId(payParam.getGameId())
-                    .payWayId(Long.valueOf(PayWayEnum.MIPAY.getNum()))
-                    .payWayCode(PayWayEnum.MIPAY.getCode())
-                    .payWayName(PayWayEnum.MIPAY.getName())
-                    .payConfig(JsonUtil.toString(payParam.getPayConfig()))
-                    .createTime(LocalDateTime.now())
-                    .updateTime(LocalDateTime.now())
-                    .build();
-        } else {
-            gamePayWay.setPayConfig(JsonUtil.toString(payParam.getPayConfig()));
-            gamePayWay.setUpdateTime(LocalDateTime.now());
-        }
-        return super.saveOrUpdate(gamePayWay);
-    }
-
-    @Override
-    public AllGamePayWayByGameIdVO getAllGamePayWayByGameId(Long gameId) {
-        List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
-                .eq(GamePayWay::getGameId, gameId)
-                .eq(GamePayWay::getStatus, StatusEnum.YES.getCode())
-        );
-        if (CollectionUtils.isEmpty(gamePayWayList)) {
-            return null;
-        }
-        AllGamePayWayByGameIdVO data = new AllGamePayWayByGameIdVO();
-        gamePayWayList.stream().forEach(t -> {
-            //支付宝
-            if (PayWayEnum.ALIPAY.getNum().equals(t.getPayWayId())) {
-                if (Objects.isNull(t.getPayMerchantId()) || t.getPayMerchantId() == 0) {
-                    //商户号为空则跳过
-                    return;
-                }
-                PayMerchant payMerchantInfo = payMerchantService.getById(t.getPayMerchantId());
-                if (Objects.isNull(payMerchantInfo)) {
-                    //商户号内容为空
-                    return;
-                }
-                GameAlipayPayVO alipayPayVO = new GameAlipayPayVO();
-                alipayPayVO.setMerchantNo(payMerchantInfo.getMerchantNo());
-                alipayPayVO.setMerchantName(payMerchantInfo.getMerchantName());
-                alipayPayVO.setLoginName(payMerchantInfo.getLoginName());
-                alipayPayVO.setManagePerson(payMerchantInfo.getManagePerson());
-                data.setAlipayPayVO(alipayPayVO);
-            }
-            //微信
-            if (PayWayEnum.WXPAY.getNum().equals(t.getPayWayId())) {
-
-                if (Objects.isNull(t.getPayBoxId()) || t.getPayBoxId() == 0) {
-                    //商户号为空则跳过
-                    return;
-                }
-                PayBox payBoxInfo = payBoxService.getById(t.getPayBoxId());
-                if (Objects.isNull(payBoxInfo) || Objects.isNull(payBoxInfo.getPayApplicationId()) ||
-                        payBoxInfo.getPayApplicationId() <= 0) {
-                    return;
-                }
-                PayApplication payApplicationInfo = payApplicationService.getById(payBoxInfo.getPayApplicationId());
-                if (Objects.isNull(payApplicationInfo)) {
-                    return;
-                }
-                GameWxpayPayVO gameWxpayPayVO = new GameWxpayPayVO();
-                gameWxpayPayVO.setBoxName(payBoxInfo.getName());
-                gameWxpayPayVO.setApplicationName(payApplicationInfo.getName());
-                gameWxpayPayVO.setAppId(payApplicationInfo.getAppId());
-                gameWxpayPayVO.setPrimevalId(payApplicationInfo.getPrimevalId());
-                gameWxpayPayVO.setCompany(payApplicationInfo.getCompany());
-                gameWxpayPayVO.setManagePerson(payApplicationInfo.getManagePerson());
-
-                //获取商户号列表
-                List<PayMerchant> payMerchantList = payMerchantService.list();
-                Map<String, PayMerchant> payMerchantData = payMerchantList.stream().collect(Collectors.toMap(PayMerchant::getMerchantNo, PayMerchant -> PayMerchant));
-                if (StringUtils.isNotEmpty(payBoxInfo.getPayMerchantId())) {
-                    String merchantDetail = payBoxService.getMerchantDetail(payMerchantData, payBoxInfo.getPayMerchantId());
-                    gameWxpayPayVO.setPayMerchantDetail(merchantDetail);
-                }
-                data.setWxpayPayVO(gameWxpayPayVO);
-            }
-            //米大师虚拟支付
-            if (PayWayEnum.MIPAY.getNum().equals(t.getPayWayId())) {
-                GameAnalogPayVO.PayConfigBean payConfigBean = JsonUtil.toObj(t.getPayConfig(), GameAnalogPayVO.PayConfigBean.class);
-                data.setAnalogPayVO(payConfigBean);
-            }
-            //支付策略配置
-            GameStrategy gameStrategy = gameStrategyService.getOne(new LambdaQueryWrapper<GameStrategy>()
-                    .eq(GameStrategy::getGameId, gameId)
-                    .eq(GameStrategy::getStatus, StatusEnum.YES.getCode()).last("limit 1")
-            );
-            if (!Objects.isNull(gameStrategy)) {
-                GameStrategyInfoVO gameStrategyInfo = BeanUtils.copy(gameStrategy, GameStrategyInfoVO.class);
-                if (StringUtils.isNotEmpty(gameStrategy.getConfig())) {
-                    gameStrategyInfo.setConfig(BeanUtils.copy(gameStrategy.getConfig(), GameStrategyOrderVO.class));
-                }
-                data.setGameStrategyVO(gameStrategyInfo);
-            }
-        });
-        return data;
-    }
+//    /**
+//     * 根据游戏id获取虚拟支付配置
+//     *
+//     * @param id : 游戏id
+//     * @return : 返回游戏虚拟支付配置
+//     */
+//    @Override
+//    public GameAnalogPayVO getGameAnalogPay(Long id) {
+//        GamePayWay gamePayWay = super.getOne(new LambdaQueryWrapper<GamePayWay>()
+//                .eq(GamePayWay::getPayWayId, PayWayEnum.MIPAY.getNum())
+//                .eq(GamePayWay::getGameId, id));
+//        if (gamePayWay == null || Strings.isBlank(gamePayWay.getPayConfig())) {
+//            return GameAnalogPayVO.builder().gameId(id).build();
+//        }
+//        return GameAnalogPayVO.builder()
+//                .id(gamePayWay.getId().toString())
+//                .gameId(id)
+//                .payConfig(JsonUtil.toObj(gamePayWay.getPayConfig(), GameAnalogPayVO.PayConfigBean.class))
+//                .build();
+//    }
+
+//    /**
+//     * 虚拟支付更新或者新增
+//     *
+//     * @param payParam : 新增或者更新参数
+//     * @return : 返回新增或者更新的结果
+//     */
+//    @Override
+//    public Boolean gameAnalogPayAddOrUpdate(GameAnalogPayParam payParam) {
+//        GamePayWay gamePayWay = super.getOne(new LambdaQueryWrapper<GamePayWay>()
+//                .eq(GamePayWay::getPayWayId, PayWayEnum.MIPAY.getNum())
+//                .eq(GamePayWay::getGameId, payParam.getGameId()));
+//        if (gamePayWay == null) {
+//            gamePayWay = GamePayWay.builder()
+//                    .gameId(payParam.getGameId())
+//                    .payWayId(Long.valueOf(PayWayEnum.MIPAY.getNum()))
+//                    .payWayCode(PayWayEnum.MIPAY.getCode())
+//                    .payWayName(PayWayEnum.MIPAY.getName())
+//                    .payConfig(JsonUtil.toString(payParam.getPayConfig()))
+//                    .createTime(LocalDateTime.now())
+//                    .updateTime(LocalDateTime.now())
+//                    .build();
+//        } else {
+//            gamePayWay.setPayConfig(JsonUtil.toString(payParam.getPayConfig()));
+//            gamePayWay.setUpdateTime(LocalDateTime.now());
+//        }
+//        return super.saveOrUpdate(gamePayWay);
+//    }
+//
+//    @Override
+//    public AllGamePayWayByGameIdVO getAllGamePayWayByGameId(Long gameId) {
+//        List<GamePayWay> gamePayWayList = super.list(new LambdaQueryWrapper<GamePayWay>()
+//                .eq(GamePayWay::getGameId, gameId)
+//                .eq(GamePayWay::getStatus, StatusEnum.YES.getCode())
+//        );
+//        if (CollectionUtils.isEmpty(gamePayWayList)) {
+//            return null;
+//        }
+//        AllGamePayWayByGameIdVO data = new AllGamePayWayByGameIdVO();
+//        gamePayWayList.stream().forEach(t -> {
+//            //支付宝
+//            if (PayWayEnum.ALIPAY.getNum().equals(t.getPayWayId())) {
+//                if (Objects.isNull(t.getPayMerchantId()) || t.getPayMerchantId() == 0) {
+//                    //商户号为空则跳过
+//                    return;
+//                }
+//                PayMerchant payMerchantInfo = payMerchantService.getById(t.getPayMerchantId());
+//                if (Objects.isNull(payMerchantInfo)) {
+//                    //商户号内容为空
+//                    return;
+//                }
+//                GameAlipayPayVO alipayPayVO = new GameAlipayPayVO();
+//                alipayPayVO.setMerchantNo(payMerchantInfo.getMerchantNo());
+//                alipayPayVO.setMerchantName(payMerchantInfo.getMerchantName());
+//                alipayPayVO.setLoginName(payMerchantInfo.getLoginName());
+//                alipayPayVO.setManagePerson(payMerchantInfo.getManagePerson());
+//                data.setAlipayPayVO(alipayPayVO);
+//            }
+//            //微信
+//            if (PayWayEnum.WXPAY.getNum().equals(t.getPayWayId())) {
+//
+//                if (Objects.isNull(t.getPayBoxId()) || t.getPayBoxId() == 0) {
+//                    //商户号为空则跳过
+//                    return;
+//                }
+//                PayBox payBoxInfo = payBoxService.getById(t.getPayBoxId());
+//                if (Objects.isNull(payBoxInfo) || Objects.isNull(payBoxInfo.getPayApplicationId()) ||
+//                        payBoxInfo.getPayApplicationId() <= 0) {
+//                    return;
+//                }
+//                PayApplication payApplicationInfo = payApplicationService.getById(payBoxInfo.getPayApplicationId());
+//                if (Objects.isNull(payApplicationInfo)) {
+//                    return;
+//                }
+//                GameWxpayPayVO gameWxpayPayVO = new GameWxpayPayVO();
+//                gameWxpayPayVO.setBoxName(payBoxInfo.getName());
+//                gameWxpayPayVO.setApplicationName(payApplicationInfo.getName());
+//                gameWxpayPayVO.setAppId(payApplicationInfo.getAppId());
+//                gameWxpayPayVO.setPrimevalId(payApplicationInfo.getPrimevalId());
+//                gameWxpayPayVO.setCompany(payApplicationInfo.getCompany());
+//                gameWxpayPayVO.setManagePerson(payApplicationInfo.getManagePerson());
+//
+//                //获取商户号列表
+//                List<PayMerchant> payMerchantList = payMerchantService.list();
+//                Map<String, PayMerchant> payMerchantData = payMerchantList.stream().collect(Collectors.toMap(PayMerchant::getMerchantNo, PayMerchant -> PayMerchant));
+//                if (StringUtils.isNotEmpty(payBoxInfo.getPayMerchantId())) {
+//                    String merchantDetail = payBoxService.getMerchantDetail(payMerchantData, payBoxInfo.getPayMerchantId());
+//                    gameWxpayPayVO.setPayMerchantDetail(merchantDetail);
+//                }
+//                data.setWxpayPayVO(gameWxpayPayVO);
+//            }
+//            //米大师虚拟支付
+//            if (PayWayEnum.MIPAY.getNum().equals(t.getPayWayId())) {
+//                GameAnalogPayVO.PayConfigBean payConfigBean = JsonUtil.toObj(t.getPayConfig(), GameAnalogPayVO.PayConfigBean.class);
+//                data.setAnalogPayVO(payConfigBean);
+//            }
+//            //支付策略配置
+//            GameStrategy gameStrategy = gameStrategyService.getOne(new LambdaQueryWrapper<GameStrategy>()
+//                    .eq(GameStrategy::getGameId, gameId)
+//                    .eq(GameStrategy::getStatus, StatusEnum.YES.getCode()).last("limit 1")
+//            );
+//            if (!Objects.isNull(gameStrategy)) {
+//                GameStrategyInfoVO gameStrategyInfo = BeanUtils.copy(gameStrategy, GameStrategyInfoVO.class);
+//                if (StringUtils.isNotEmpty(gameStrategy.getConfig())) {
+//                    gameStrategyInfo.setConfig(BeanUtils.copy(gameStrategy.getConfig(), GameStrategyOrderVO.class));
+//                }
+//                data.setGameStrategyVO(gameStrategyInfo);
+//            }
+//        });
+//        return data;
+//    }
 }

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

@@ -92,15 +92,15 @@ public class GamePictureServiceImpl extends ServiceImpl<GamePictureMapper, GameP
             gamePicture = GamePicture.builder()
                     .gameId(gameId)
                     .avatarImg(param.getAvatarImg())
-                    .gamePictureImg(param.getGamePictureImg())
-                    .loginBackGroundImg(param.getLoginBackGroundImg())
+//                    .gamePictureImg(param.getGamePictureImg())
+//                    .loginBackGroundImg(param.getLoginBackGroundImg())
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
                     .build();
         } else {
             gamePicture.setAvatarImg(param.getAvatarImg());
-            gamePicture.setGamePictureImg(param.getGamePictureImg());
-            gamePicture.setLoginBackGroundImg(param.getLoginBackGroundImg());
+//            gamePicture.setGamePictureImg(param.getGamePictureImg());
+//            gamePicture.setLoginBackGroundImg(param.getLoginBackGroundImg());
             gamePicture.setUpdateTime(LocalDateTime.now());
         }
         //游戏图片信息更新
@@ -130,31 +130,31 @@ public class GamePictureServiceImpl extends ServiceImpl<GamePictureMapper, GameP
                     .gameId(gameId)
                     .avatarImg(param.getAvatarImg())
                     .appletImg(param.getAppletImg())
-                    .cardTitle(param.getCardTitle())
-                    .cardUrl(param.getCardUrl())
-                    .cardImg(param.getCardImg())
-                    .isOpenInlet(param.getIsOpenInlet())
-                    .inletImg(param.getInletImg())
-                    .findImg(param.getFindImg())
-                    .recommendImg(param.getRecommendImg())
-                    .tryPayImg(param.getTryPayImg())
-                    .shareImgName(param.getShareImgName())
-                    .shareImg(param.getShareImg())
+//                    .cardTitle(param.getCardTitle())
+//                    .cardUrl(param.getCardUrl())
+//                    .cardImg(param.getCardImg())
+//                    .isOpenInlet(param.getIsOpenInlet())
+//                    .inletImg(param.getInletImg())
+//                    .findImg(param.getFindImg())
+//                    .recommendImg(param.getRecommendImg())
+//                    .tryPayImg(param.getTryPayImg())
+//                    .shareImgName(param.getShareImgName())
+//                    .shareImg(param.getShareImg())
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
                     .build();
         } else {
             gamePicture.setAvatarImg(param.getAvatarImg());
             gamePicture.setAppletImg(param.getAppletImg());
-            gamePicture.setCardTitle(param.getCardTitle());
-            gamePicture.setCardUrl(param.getCardUrl());
-            gamePicture.setCardImg(param.getCardImg());
-            gamePicture.setIsOpenInlet(param.getIsOpenInlet());
-            gamePicture.setInletImg(param.getInletImg());
-            gamePicture.setFindImg(param.getFindImg());
-            gamePicture.setRecommendImg(param.getRecommendImg());
-            gamePicture.setTryPayImg(param.getTryPayImg());
-            gamePicture.setShareImgName(param.getShareImgName());
+//            gamePicture.setCardTitle(param.getCardTitle());
+//            gamePicture.setCardUrl(param.getCardUrl());
+//            gamePicture.setCardImg(param.getCardImg());
+//            gamePicture.setIsOpenInlet(param.getIsOpenInlet());
+//            gamePicture.setInletImg(param.getInletImg());
+//            gamePicture.setFindImg(param.getFindImg());
+//            gamePicture.setRecommendImg(param.getRecommendImg());
+//            gamePicture.setTryPayImg(param.getTryPayImg());
+//            gamePicture.setShareImgName(param.getShareImgName());
             gamePicture.setShareImg(param.getShareImg());
             gamePicture.setUpdateTime(LocalDateTime.now());
         }

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

@@ -98,7 +98,7 @@ public class GameStrategyServiceImpl extends ServiceImpl<GameStrategyMapper, Gam
             if (gamePayWayMap.get(t.getGameId()) == null) {
                 List<GamePayWay> gamePayWayList = gamePayWayService.list(new QueryWrapper<GamePayWay>().lambda().eq(GamePayWay::getGameId, t.getGameId()));
                 if (CollectionUtils.isNotEmpty(gamePayWayList)) {
-                    String payWayName = gamePayWayList.stream().map(b -> b.getPayWayName()).collect(Collectors.joining(","));
+                    String payWayName = gamePayWayList.stream().map(b -> b.getPayName()).collect(Collectors.joining(","));
                     t.setGamePayWay(payWayName);
                 }
                 gamePayWayMap.put(t.getGameId(), t.getGamePayWay());

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

@@ -54,7 +54,8 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
     @Override
     public List<PayApplicationChoiceVO> payApplicationChoiceList() {
         List<PayApplication> payApplicationList = super.list(new LambdaQueryWrapper<PayApplication>()
-                .select(PayApplication::getId, PayApplication::getName));
+//                .select(PayApplication::getId, PayApplication::getName)
+        );
         return BeanUtils.copyList(payApplicationList, PayApplicationChoiceVO.class);
     }
 
@@ -67,7 +68,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
     @Override
     public IPage<PayApplicationVO> list(PayApplicationListParam param) {
         return page(param.toPage(), new LambdaQueryWrapper<PayApplication>()
-                .like(Strings.isNotBlank(param.getName()), PayApplication::getName, param.getName())
+//                .like(Strings.isNotBlank(param.getName()), PayApplication::getName, param.getName())
                 .eq(param.getType() != null, PayApplication::getType, param.getType())
                 .like(Strings.isNotBlank(param.getAppId()), PayApplication::getAppId, param.getAppId())
                 .like(Strings.isNotBlank(param.getCompany()), PayApplication::getCompany, param.getCompany())
@@ -115,20 +116,20 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
                     throw new BaseException("应用id已经存在");
                 }
             }
-            payApplication.setName(param.getName());
+//            payApplication.setName(param.getName());
             payApplication.setType(param.getType());
             payApplication.setAppSecret(param.getAppSecret());
-            payApplication.setVersion(param.getVersion());
-            payApplication.setAppDesc(param.getAppDesc());
-            payApplication.setAppUrl(param.getAppUrl());
-            payApplication.setAppLogo(param.getAppLogo());
-            payApplication.setMiniCode(param.getMiniCode());
+//            payApplication.setVersion(param.getVersion());
+//            payApplication.setAppDesc(param.getAppDesc());
+//            payApplication.setAppUrl(param.getAppUrl());
+//            payApplication.setAppLogo(param.getAppLogo());
+//            payApplication.setMiniCode(param.getMiniCode());
             payApplication.setAppId(param.getAppId());
-            payApplication.setPrimevalId(param.getPrimevalId());
+//            payApplication.setPrimevalId(param.getPrimevalId());
             payApplication.setCompany(param.getCompany());
-            payApplication.setLoginName(param.getLoginName());
-            payApplication.setLoginPassword(param.getLoginPassword());
-            payApplication.setManagePerson(param.getManagePerson());
+//            payApplication.setLoginName(param.getLoginName());
+//            payApplication.setLoginPassword(param.getLoginPassword());
+//            payApplication.setManagePerson(param.getManagePerson());
             payApplication.setRemark(param.getRemark());
             payApplication.setIsDelete(DeleteEnum.NO.getCode());
             payApplication.setStatus(StatusEnum.YES.getCode());
@@ -143,15 +144,15 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         }
         //创建
         return super.save(PayApplication.builder()
-                .name(param.getName())
+//                .name(param.getName())
                 .type(param.getType())
                 .appId(param.getAppId())
                 .appSecret(param.getAppSecret())
-                .primevalId(param.getPrimevalId())
+//                .primevalId(param.getPrimevalId())
                 .company(param.getCompany())
-                .loginName(param.getLoginName())
-                .loginPassword(param.getLoginPassword())
-                .managePerson(param.getManagePerson())
+//                .loginName(param.getLoginName())
+//                .loginPassword(param.getLoginPassword())
+//                .managePerson(param.getManagePerson())
                 .remark(param.getRemark())
                 .status(StatusEnum.YES.getCode())
                 .isDelete(DeleteEnum.NO.getCode())
@@ -172,7 +173,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         if (payApplication == null) {
             throw new BaseException("支付应用信息不存在");
         }
-        return miniAppletApiService.getQrCode(payApplication.getAppId(), payApplication.getAppSecret(), payApplication.getName());
+        return miniAppletApiService.getQrCode(payApplication.getAppId(), payApplication.getAppSecret(), payApplication.getAppName());
     }
 
     /**

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

@@ -110,8 +110,8 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
                 }
             }
             payBox.setName(param.getName());
-            payBox.setPayApplicationId(param.getPayApplicationId());
-            payBox.setPayMerchantId(StringUtils.join(param.getPayMerchantIds(), ","));
+//            payBox.setPayApplicationId(param.getPayApplicationId());
+//            payBox.setPayMerchantId(StringUtils.join(param.getPayMerchantIds(), ","));
             payBox.setType(param.getType());
             payBox.setRemark(param.getRemark());
             payBox.setUpdateTime(LocalDateTime.now());
@@ -125,8 +125,8 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
         //创建
         return super.save(PayBox.builder()
                 .name(param.getName())
-                .payApplicationId(param.getPayApplicationId())
-                .payMerchantId(StringUtils.join(param.getPayMerchantIds(), ","))
+//                .payApplicationId(param.getPayApplicationId())
+//                .payMerchantId(StringUtils.join(param.getPayMerchantIds(), ","))
                 .type(param.getType())
                 .remark(param.getRemark())
                 .status(StatusEnum.YES.getCode())

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

@@ -70,12 +70,12 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         //删除时候增加删除时间
         if (data.getIsDelete() != null && data.getIsDelete() == DeleteEnum.YES.getCode()) {
             data.setIsDelete(DeleteEnum.YES.getCode());
-            data.setDeleteTime(LocalDateTime.now());
+//            data.setDeleteTime(LocalDateTime.now());
             return removeById(bo.getId());
         }
-        if (!StringUtils.isEmpty(data.getPayDevice())) {
-            data.setPayDevice("," + data.getPayDevice().trim() + ",");
-        }
+//        if (!StringUtils.isEmpty(data.getPayDevice())) {
+//            data.setPayDevice("," + data.getPayDevice().trim() + ",");
+//        }
         return saveOrUpdate(BeanUtils.copy(data, PayMerchant.class));
     }
 
@@ -86,14 +86,16 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         if (convert == null) {
             return null;
         }
-        List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>().eq(PayWay::getParentId, 0));
+        List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>()
+//                .eq(PayWay::getParentId, 0)
+        );
         Map<Long, PayWay> payWayMap = list.stream().collect(Collectors.toMap(PayWay::getId, PayWay -> PayWay));
         convert.getRecords().forEach(t -> {
             PayWay payWayInfo = payWayMap.get(t.getPayWayId());
             if (t.getPayWayId() == null || payWayInfo == null) {
                 return;
             }
-            t.setPayWayName(payWayInfo.getPayName());
+//            t.setPayWayName(payWayInfo.getPayName());
             t.setPayDeviceName(PayDeviceEnum.getDesc(t.getPayDevice()));
         });
         return convert;

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

@@ -33,8 +33,9 @@ public class PayWayServiceImpl extends ServiceImpl<PayWayMapper, PayWay> impleme
      */
     @Override
     public List<PayWayChoiceVO> payWayChoiceList() {
-        List<PayWay> payWayList = super.list(new LambdaQueryWrapper<PayWay>().
-                select(PayWay::getId, PayWay::getPayName));
+        List<PayWay> payWayList = super.list(new LambdaQueryWrapper<PayWay>()
+//                        .select(PayWay::getId, PayWay::getPayName)
+        );
         return BeanUtils.copyList(payWayList, PayWayChoiceVO.class);
     }