cs

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/wxPaymentV3/WechatPayV3Controller.java

@@ -1,7 +1,7 @@
 package com.zhongshu.payment.server.core.controller.wxPaymentV3;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dataConfig.WxV3PayConfig;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/unionFrictionlessPay/config/WithdrawConfig.java

@@ -1,5 +1,6 @@
 package com.zhongshu.payment.server.core.pay.impl.unionFrictionlessPay.config;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -17,13 +18,16 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "withdraw")
 public class WithdrawConfig {
 
-    public String appId = "";
+    private String appId = "";
 
-    public String appKey = "";
+    private String appKey = "";
 
     // 系统编号
-    public String sysid = "";
+    private String sysid = "";
 
     // 多应用类型
-    public String appType = "74";
+    private String appType = "74";
+
+    @Schema(description = "通知地址")
+    private String withdrawNotify;
 }

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/wallet/WalletMainService.java

@@ -10,7 +10,7 @@ import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.card.client.service.feign.UserFeignService;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/wxPaymentV3/WxPayNotifyService.java

@@ -10,7 +10,7 @@ import com.wechat.pay.java.core.notification.RequestParam;
 import com.wechat.pay.java.service.payments.model.Transaction;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.MqttFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.card.client.utils.DateUtils;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/wxPaymentV3/WxPaymentMainService.java

@@ -13,7 +13,7 @@ import com.wechat.pay.java.core.util.PemUtil;
 import com.wechat.pay.java.service.payments.jsapi.model.*;
 import com.wechat.pay.java.service.payments.model.Transaction;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.model.wechat.MiniAppUserInfoVo;
 import com.zhongshu.card.client.service.feign.OperationLogsFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/pay/impl/wxPaymentV3/WxTransferBatchService.java

@@ -7,7 +7,7 @@ import com.wechat.pay.java.service.transferbatch.model.GetTransferDetailByOutNoR
 import com.wechat.pay.java.service.transferbatch.model.InitiateBatchTransferRequest;
 import com.wechat.pay.java.service.transferbatch.model.InitiateBatchTransferResponse;
 import com.wechat.pay.java.service.transferbatch.model.TransferDetailEntity;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/RechargeService.java

@@ -11,7 +11,7 @@ import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OperationLogsFeignService;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/TransferService.java

@@ -6,7 +6,7 @@ import com.wechat.pay.java.service.transferbatch.model.*;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.OrgUserDetailParam;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
-import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.model.projectAbout.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.feign.OrganizationFeignService;
 import com.zhongshu.card.client.service.feign.ProjectPaySettingFeignService;
 import com.zhongshu.payment.client.model.RechargeRecordModel;