TRX vor 1 Jahr
Ursprung
Commit
b58d206779

+ 3 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/feign/ProjectWxPayParam.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.feign;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.internal.build.AllowPrintStacktrace;
@@ -12,5 +13,7 @@ import org.hibernate.internal.build.AllowPrintStacktrace;
 @AllowPrintStacktrace
 @NoArgsConstructor
 public class ProjectWxPayParam {
+
+    @Schema(description = "appId", required = true)
     private String appId;
 }

+ 2 - 2
FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/WxPayConfigParam.java

@@ -14,10 +14,10 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class WxPayConfigParam {
-    @Schema(description = "项目id")
+    @Schema(description = "项目id", required = true)
     private String projectOid;
 
-    @Schema(description = "appid")
+    @Schema(description = "appid 小程序", required = true)
     private String appid;
 
     @Schema(description = "商户证书序列号")

+ 1 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/WxPayConfigDao.java

@@ -11,4 +11,5 @@ public interface WxPayConfigDao extends MongoDao<WxPayConfig> {
 
     WxPayConfig findTopByProjectOid(String projectOid);
 
+    WxPayConfig findTopByAppId(String appId);
 }

+ 14 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ProjectPaySettingServiceImpl.java

@@ -94,10 +94,17 @@ public class ProjectPaySettingServiceImpl extends SuperService implements Projec
             return ResultContent.buildFail(String.format("%s 结构不属于项目类型", projectOrg.getName()));
         }
         WxPayConfig wxPayConfig = wxPayConfigDao.findTopByProjectOid(param.getProjectOid());
+        WxPayConfig temp = wxPayConfigDao.findTopByAppId(param.getAppid());
         if (ObjectUtils.isEmpty(wxPayConfig)) {
             wxPayConfig = new WxPayConfig();
             initEntity(wxPayConfig);
+        } else {
+            // 编辑
+            if (ObjectUtils.isNotEmpty(temp) && !temp.getId().equals(wxPayConfig.getId())) {
+                return ResultContent.buildFail(String.format("appId已存在:%s", wxPayConfig.getAppid()));
+            }
         }
+
         BeanUtils.copyProperties(param, wxPayConfig);
         wxPayConfigDao.save(wxPayConfig);
         return ResultContent.buildSuccess();
@@ -145,9 +152,13 @@ public class ProjectPaySettingServiceImpl extends SuperService implements Projec
      */
     @Override
     public ResultContent<WxPayConfigModel> getProjectWxPayConfig(ProjectWxPayParam param) {
-
-
-        return null;
+        String appId = param.getAppId();
+        WxPayConfigModel model = null;
+        WxPayConfig wxPayConfig = wxPayConfigDao.findTopByAppId(appId);
+        if (ObjectUtils.isNotEmpty(wxPayConfig)) {
+            model = toModel(wxPayConfig);
+        }
+        return ResultContent.buildSuccess(model);
     }
 
 }