feat : 支付应用接口

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

@@ -18,34 +18,40 @@ public class PayApplicationAddUpdateParam {
     private Long id;
 
     /**
-     * 名称
+     * 应用appId
      */
-    @ApiModelProperty(notes = "应用名称")
-    private String appName;
+    @ApiModelProperty(notes = "应用appId")
+    private String appId;
 
     /**
-     * 类型 1 微信小程序
+     * 应用原始id
      */
-    @ApiModelProperty(notes = "类型 1 微信小程序")
-    private Integer type;
+    @ApiModelProperty(notes = "应用原始id")
+    private String ghId;
 
     /**
-     * 应用appId
+     * 应用密钥
      */
-    @ApiModelProperty(notes = "应用appId")
-    private String appId;
+    @ApiModelProperty(notes = "应用密钥")
+    private String appSecret;
 
     /**
-     * 应用AppSecret
+     * 应用名称
      */
-    @ApiModelProperty(notes = "应用AppSecret")
-    private String appSecret;
+    @ApiModelProperty(notes = "应用名称")
+    private String appName;
 
     /**
-     * 应用原始id
+     * 应用类型, 1 : 小程序, 2 : 公众号,3 : 支付宝应用
      */
-    @ApiModelProperty(notes = "应用原始id")
-    private String ghId;
+    @ApiModelProperty(notes = "应用类型, 1 : 小程序, 2 : 公众号,3 : 支付宝应用")
+    private Integer type;
+
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(notes = "类型名称")
+    private String typeName;
 
     /**
      * 应用主体
@@ -57,23 +63,47 @@ public class PayApplicationAddUpdateParam {
      * 登录账号
      */
     @ApiModelProperty(notes = "登录账号")
-    private String loginName;
+    private String account;
 
     /**
      * 登录密码
      */
     @ApiModelProperty(notes = "登录密码")
-    private String loginPassword;
+    private String password;
 
     /**
      * 管理员
      */
     @ApiModelProperty(notes = "管理员")
-    private String managePerson;
+    private String manager;
 
     /**
      * 备注
      */
     @ApiModelProperty(notes = "备注")
     private String remark;
+
+    /**
+     * 应用地址
+     */
+    @ApiModelProperty(notes = "应用地址")
+    private String path;
+
+    /**
+     * 应用头像
+     */
+    @ApiModelProperty(notes = "应用头像")
+    private String headImg;
+
+    /**
+     * 应用二维码
+     */
+    @ApiModelProperty(notes = "应用二维码")
+    private String qrCode;
+
+    /**
+     * 商户号
+     */
+    @ApiModelProperty(notes = "商户号")
+    private String merchantNo;
 }

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

@@ -91,27 +91,24 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
                     throw new BaseException("应用id已经存在");
                 }
             }
-//            payApplication.setName(param.getName());
+            payApplication.setAppId(param.getAppId());
+            payApplication.setGhId(param.getGhId());
+            payApplication.setAppName(param.getAppName());
             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.setAppId(param.getAppId());
-//            payApplication.setPrimevalId(param.getPrimevalId());
+            payApplication.setPath(param.getPath());
+            payApplication.setMerchantNo(param.getMerchantNo());
             payApplication.setCompany(param.getCompany());
-//            payApplication.setLoginName(param.getLoginName());
-//            payApplication.setLoginPassword(param.getLoginPassword());
-//            payApplication.setManagePerson(param.getManagePerson());
+            payApplication.setAccount(param.getAccount());
+            payApplication.setPassword(param.getPassword());
+            payApplication.setManager(param.getManager());
             payApplication.setRemark(param.getRemark());
-            payApplication.setIsDelete(DeleteEnum.NO.getCode());
-            payApplication.setStatus(StatusEnum.YES.getCode());
+            payApplication.setHeadImg(param.getHeadImg());
+            payApplication.setQrCode(param.getQrCode());
             payApplication.setUpdateTime(LocalDateTime.now());
             return super.updateById(payApplication);
         }
-        //判断名称是否已经存在
+        //判断应用是否已经存在
         int count = super.count(new LambdaQueryWrapper<PayApplication>()
                 .eq(PayApplication::getAppId, param.getAppId()));
         if (count > 0) {
@@ -119,16 +116,20 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         }
         //创建
         return super.save(PayApplication.builder()
-//                .name(param.getName())
-                .type(param.getType())
                 .appId(param.getAppId())
+                .ghId(param.getGhId())
+                .appName(param.getAppName())
+                .type(param.getType())
                 .appSecret(param.getAppSecret())
-//                .primevalId(param.getPrimevalId())
+                .path(param.getPath())
+                .merchantNo(param.getMerchantNo())
                 .company(param.getCompany())
-//                .loginName(param.getLoginName())
-//                .loginPassword(param.getLoginPassword())
-//                .managePerson(param.getManagePerson())
+                .account(param.getAccount())
+                .password(param.getPassword())
+                .manager(param.getManager())
                 .remark(param.getRemark())
+                .headImg(param.getHeadImg())
+                .qrCode(param.getQrCode())
                 .status(StatusEnum.YES.getCode())
                 .isDelete(DeleteEnum.NO.getCode())
                 .createTime(LocalDateTime.now())
@@ -142,6 +143,10 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
         if (payApplication == null) {
             throw new BaseException("支付应用信息不存在");
         }
+        //判断是否为支付宝应用
+        if (Objects.equals(payApplication.getType(), PayApplicationTypeEnum.ALI_PAY_APP.getType())) {
+            throw new BaseException("支付宝应用不支持生成小程序码!");
+        }
         return miniAppletApiService.getQrCode(payApplication.getAppId(), payApplication.getAppSecret(), payApplication.getAppName());
     }
 

game-module/game-sdk/src/main/java/com/zanxiang/sdk/SDKApplication.java

@@ -18,7 +18,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功123 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功2.0 ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +