feat : 支付管理应用接口修改

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

@@ -4,6 +4,7 @@ import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.common.enums.*;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.manage.domain.enums.PayApplicationTypeEnum;
 import com.zanxiang.manage.domain.vo.*;
 import com.zanxiang.manage.service.*;
 import io.swagger.annotations.Api;
@@ -204,7 +205,7 @@ public class ChoiceController {
     @PreAuthorize(permissionKey = "sdk:applicationTypeChoice:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = ApplicationTypeChoiceVO.class, responseContainer = "list")})
     public ResultVO<List<ApplicationTypeChoiceVO>> applicationTypeChoiceList() {
-        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(ApplicationTypeEnum.values()), ApplicationTypeChoiceVO.class));
+        return ResultVO.ok(BeanUtils.copyList(Arrays.asList(PayApplicationTypeEnum.values()), ApplicationTypeChoiceVO.class));
     }
 
     @ApiOperation(value = "支付应用选择列表")

game-module/game-common/src/main/java/com/zanxiang/common/enums/ApplicationTypeEnum.java → game-module/game-manage/src/main/java/com/zanxiang/manage/domain/enums/PayApplicationTypeEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.common.enums;
+package com.zanxiang.manage.domain.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -10,17 +10,22 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum ApplicationTypeEnum {
+public enum PayApplicationTypeEnum {
 
     /**
-     * 支付宝应用
+     * 微信小程序
      */
-    NORMAL_STATUS(1, "支付宝应用"),
+    WX_MINI_APP(1, "微信小程序"),
 
     /**
-     * 微信商城小程序
+     * 微信公众号
+     */
+    WX_MP(2, "微信公众号"),
+
+    /**
+     * 支付宝应用
      */
-    BAN_STATUS(2, "微信商城小程序");
+    ALI_PAY_APP(3, "支付宝应用");
 
     /**
      * 应用类型
@@ -33,8 +38,8 @@ public enum ApplicationTypeEnum {
     private String describe;
 
     public static String getDescByType(Integer type) {
-        ApplicationTypeEnum[] values = ApplicationTypeEnum.values();
-        for (ApplicationTypeEnum value : values) {
+        PayApplicationTypeEnum[] values = PayApplicationTypeEnum.values();
+        for (PayApplicationTypeEnum value : values) {
             if (value.getType().equals(type)) {
                 return value.getDescribe();
             }

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

@@ -21,7 +21,7 @@ public class PayApplicationAddUpdateParam {
      * 名称
      */
     @ApiModelProperty(notes = "应用名称")
-    private String name;
+    private String appName;
 
     /**
      * 类型 1 微信小程序
@@ -30,9 +30,9 @@ public class PayApplicationAddUpdateParam {
     private Integer type;
 
     /**
-     * 应用appid
+     * 应用appId
      */
-    @ApiModelProperty(notes = "应用appid")
+    @ApiModelProperty(notes = "应用appId")
     private String appId;
 
     /**

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

@@ -27,15 +27,15 @@ public class PayApplicationListParam extends BasePage<PayApplication> {
     private String name;
 
     /**
-     * 类型 1 微信小程序
+     * 类型,1 : 小程序, 2 : 公众号,3 : 支付宝应用
      */
-    @ApiModelProperty(notes = "类型 1 微信小程序")
+    @ApiModelProperty(notes = "类型,1 : 小程序, 2 : 公众号,3 : 支付宝应用")
     private Integer type;
 
     /**
-     * 应用appid
+     * 应用appId
      */
-    @ApiModelProperty(notes = "应用appid")
+    @ApiModelProperty(notes = "应用appId")
     private String appId;
 
     /**

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

@@ -23,34 +23,40 @@ public class PayApplicationVO {
     private Long id;
 
     /**
-     * 应用名称
+     * 应用appId
      */
-    @ApiModelProperty(notes = "应用名称")
-    private String name;
+    @ApiModelProperty(notes = "应用appid")
+    private String appId;
 
     /**
-     * 类型 1 微信小程序
+     * 应用原始id
      */
-    @ApiModelProperty(notes = "类型 1 微信小程序")
-    private Integer type;
+    @ApiModelProperty(notes = "应用原始id")
+    private String ghId;
 
     /**
-     * 类型名称
+     * 应用密钥
      */
-    @ApiModelProperty(notes = "类型名称")
-    private String typeName;
+    @ApiModelProperty(notes = "应用密钥")
+    private String appSecret;
 
     /**
-     * 应用appid
+     * 应用名称
      */
-    @ApiModelProperty(notes = "应用appid")
-    private String appId;
+    @ApiModelProperty(notes = "应用名称")
+    private String appName;
 
     /**
-     * 应用原始id
+     * 应用类型, 1 : 小程序, 2 : 公众号,3 : 支付宝应用
      */
-    @ApiModelProperty(notes = "应用原始id")
-    private String primevalId;
+    @ApiModelProperty(notes = "应用类型, 1 : 小程序, 2 : 公众号,3 : 支付宝应用")
+    private Integer type;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(notes = "类型名称")
+    private String typeName;
 
     /**
      * 应用主体
@@ -62,19 +68,19 @@ public class PayApplicationVO {
      * 登录账号
      */
     @ApiModelProperty(notes = "登录账号")
-    private String loginName;
+    private String account;
 
     /**
      * 登录密码
      */
     @ApiModelProperty(notes = "登录密码")
-    private String loginPassword;
+    private String password;
 
     /**
      * 管理员
      */
     @ApiModelProperty(notes = "管理员")
-    private String managePerson;
+    private String manager;
 
     /**
      * 备注
@@ -83,44 +89,26 @@ public class PayApplicationVO {
     private String remark;
 
     /**
-     * 状态 1 不可用 2 可用
+     * 状态, 0 正常, 1 不可用
      */
-    @ApiModelProperty(notes = "状态 1 不可用 0 可用")
+    @ApiModelProperty(notes = "状态, 0 正常, 1 不可用")
     private Integer status;
 
-    /**
-     * 应用AppSecret
-     */
-    @ApiModelProperty(notes = "应用AppSecret")
-    private String appSecret;
-
-    /**
-     * 版本
-     */
-    @ApiModelProperty(notes = "版本")
-    private String version;
-
-    /**
-     * 应用描述
-     */
-    @ApiModelProperty(notes = "应用描述")
-    private String appDesc;
-
     /**
      * 应用地址
      */
     @ApiModelProperty(notes = "应用地址")
-    private String appUrl;
+    private String path;
 
     /**
      * 应用头像
      */
     @ApiModelProperty(notes = "应用头像")
-    private String appLogo;
+    private String headImg;
 
     /**
-     * 小程序码
+     * 应用二维码
      */
-    @ApiModelProperty(notes = "小程序码")
-    private String miniCode;
+    @ApiModelProperty(notes = "应用二维码")
+    private String qrCode;
 }

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

@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.enums.ApplicationTypeEnum;
 import com.zanxiang.common.enums.DeleteEnum;
 import com.zanxiang.common.enums.StatusEnum;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.bo.PayApplicationBO;
 import com.zanxiang.manage.domain.dto.PayApplicationDTO;
+import com.zanxiang.manage.domain.enums.PayApplicationTypeEnum;
 import com.zanxiang.manage.domain.params.PayApplicationAddUpdateParam;
 import com.zanxiang.manage.domain.params.PayApplicationListNoPageParam;
 import com.zanxiang.manage.domain.params.PayApplicationListParam;
@@ -46,29 +46,18 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
     @Autowired
     private MiniAppletApiService miniAppletApiService;
 
-    /**
-     * 支付应用选择列表
-     *
-     * @return : 返回所有支付应用信息
-     */
     @Override
     public List<PayApplicationChoiceVO> payApplicationChoiceList() {
         List<PayApplication> payApplicationList = super.list(new LambdaQueryWrapper<PayApplication>()
-//                .select(PayApplication::getId, PayApplication::getName)
+                .select(PayApplication::getId, PayApplication::getAppName)
         );
         return BeanUtils.copyList(payApplicationList, PayApplicationChoiceVO.class);
     }
 
-    /**
-     * 分页获取应用列表
-     *
-     * @param param : 查询参数
-     * @return : 返回列表
-     */
     @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::getAppName, 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())
@@ -76,27 +65,15 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
                 .convert(this::toVo);
     }
 
-    /**
-     * 给签证官
-     *
-     * @param payApplication 支付应用程序
-     * @return {@link PayApplicationVO}
-     */
     private PayApplicationVO toVo(PayApplication payApplication) {
         PayApplicationVO applicationVO = BeanUtils.copy(payApplication, PayApplicationVO.class);
         if (Objects.isNull(applicationVO)) {
             return null;
         }
-        applicationVO.setTypeName(ApplicationTypeEnum.getDescByType(applicationVO.getType()));
+        applicationVO.setTypeName(PayApplicationTypeEnum.getDescByType(applicationVO.getType()));
         return applicationVO;
     }
 
-    /**
-     * 支付应用添加或者更新
-     *
-     * @param param : 参数
-     * @return : 返回结果
-     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean addOrUpdate(PayApplicationAddUpdateParam param) {
@@ -161,12 +138,6 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
                 .build());
     }
 
-    /**
-     * 获取游戏应用二维码图片地址
-     *
-     * @param id : 应用id
-     * @return : 返回游戏二维码
-     */
     @Override
     public String getQrCode(Long id) {
         PayApplication payApplication = super.getById(id);
@@ -176,13 +147,6 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         return miniAppletApiService.getQrCode(payApplication.getAppId(), payApplication.getAppSecret(), payApplication.getAppName());
     }
 
-    /**
-     * 根据主键更新状态
-     *
-     * @param id     : 主键id
-     * @param status : 状态
-     * @return : 返回更新结果
-     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean statusUpdate(Long id, Integer status) {
@@ -192,28 +156,12 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
                 .eq(PayApplication::getId, id));
     }
 
-    /**
-     * 删除
-     *
-     * @param id : 要删除的信息id
-     * @return : 返回删除结果
-     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteById(Long id) {
         return super.removeById(id);
     }
 
-
-    /**
-     * 支付应用情况
-     *
-     * @param payApplicationId   : 支付应用程序id
-     * @param payApplicationType : 支付应用程序类型
-     * @param appId              : 应用程序id
-     * @param company            : 公司
-     * @return {@link Map}<{@link Long}, {@link PayApplicationDTO}>
-     */
     @Override
     public Map<Long, PayApplicationDTO> payApplicationCondition(Integer payApplicationId, Integer payApplicationType,
                                                                 String appId, String company) {
@@ -233,11 +181,6 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
                 .stream().collect(Collectors.toMap(PayApplicationDTO::getId, Function.identity()));
     }
 
-    /**
-     * 支付应用程序地图
-     *
-     * @return {@link Map}<{@link Long}, {@link PayApplicationDTO}>
-     */
     @Override
     public Map<Long, PayApplicationDTO> payApplicationMap() {
         List<PayApplication> payApplicationList = this.list();

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

@@ -3,7 +3,7 @@ package com.zanxiang.manage.service.Impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.enums.ApplicationTypeEnum;
+import com.zanxiang.manage.domain.enums.PayApplicationTypeEnum;
 import com.zanxiang.common.enums.DeleteEnum;
 import com.zanxiang.common.enums.StatusEnum;
 import com.zanxiang.common.exception.BaseException;
@@ -81,7 +81,7 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
         if (Objects.isNull(payBoxListVO)) {
             return null;
         }
-        payBoxListVO.setTypeName(ApplicationTypeEnum.getDescByType(payBoxListVO.getType()));
+        payBoxListVO.setTypeName(PayApplicationTypeEnum.getDescByType(payBoxListVO.getType()));
         return payBoxListVO;
     }