pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-10 14:56:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat 微信支付联调,

Browse Source
This commit is contained in:
nws
2024-01-04 00:22:49 +08:00
parent d405eafb90
commit 6d38269cb3
11 changed files with 20 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayCloseService.java
View File

@@ -31,7 +31,7 @@ public class AliPayCloseService {
* 交易关闭: 只有订单在未支付的状态下才可以进行关闭, 商户不需要额外申请就有此接口的权限
* 交易撤销: 如果用户支付成功，会将此订单资金退还给用户. 限制时间为1天，过了24小时，该接口无法再使用。可以视为一个特殊的接口, 需要专门签约这个接口的权限
*
* TODO 如果返回已经关闭, 也视为关闭成功
* TODO 如果返回已经关闭, 也视为关闭成功, 考虑如果关闭识别, 查询一下网关的状态进行对比
*/
@Retryable(value = RetryableException.class)
public void close(PayOrder payOrder) {

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayOrderService.java
View File

@@ -81,6 +81,7 @@ public class AliPayOrderService {
.setRefundableBalance(amount)
.setBusinessNo(payOrder.getBusinessNo())
.setStatus(PayStatusEnum.SUCCESS.getCode())
// 读取回调中的支付时间
.setPayTime(LocalDateTime.now());
aliPayOrderManager.save(aliPayOrder);
}

42
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayConfig.java
View File

@@ -5,14 +5,11 @@ import cn.bootx.platform.common.core.annotation.EncryptionField;
import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
import cn.bootx.platform.common.mybatisplus.handler.StringListTypeHandler;
import cn.bootx.platform.daxpay.service.code.WeChatPayCode;
import cn.bootx.platform.daxpay.service.core.channel.wechat.convert.WeChatConvert;
import cn.bootx.platform.daxpay.service.dto.channel.wechat.WeChatPayConfigDto;
import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayConfigParam;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType;
import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -36,21 +33,6 @@ import java.util.List;
@TableName(value = "pay_wechat_pay_config",autoResultMap = true)
public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction<WeChatPayConfigDto> {
/** 名称 */
@DbColumn(comment = "名称")
private String name;
/** 商户编码 */
@TableField(updateStrategy = FieldStrategy.NEVER)
@DbColumn(comment = "商户编码")
private String mchCode;
/** 商户应用编码 */
@TableField(updateStrategy = FieldStrategy.NEVER)
@DbMySqlIndex(comment = "商户应用编码唯一索引")
@DbColumn(comment = "商户应用编码")
private String mchAppCode;
/** 微信商户Id */
@DbColumn(comment = "微信商户号")
private String wxMchId;
@@ -59,13 +41,6 @@ public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction<
@DbColumn(comment = "微信应用appId")
private String wxAppId;
/**
* api版本
* @see WeChatPayCode#API_V2
*/
@DbColumn(comment = "api版本")
private String apiVersion;
/** 商户平台「API安全」中的 APIv2 密钥 */
@TableField(updateStrategy = FieldStrategy.ALWAYS)
@BigField
@@ -94,22 +69,14 @@ public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction<
@DbColumn(comment = "API证书中p12证书Base64")
private String p12;
/** 服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https */
@DbColumn(comment = "异步通知页面")
/** 这个是跳转到当前网关服务上的, 不是通知到客户系统的 */
@DbColumn(comment = "异步通知路径")
private String notifyUrl;
/** 页面跳转同步通知页面路径 */
@DbColumn(comment = "同步通知页面")
private String returnUrl;
/** 是否沙箱环境 */
@DbColumn(comment = "是否沙箱环境")
private boolean sandbox;
/** 超时时间(分钟) */
@DbColumn(comment = "超时时间(分钟)")
private Integer expireTime;
/** 可用支付方式 */
@DbColumn(comment = "可用支付方式")
@DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT)
@@ -124,9 +91,4 @@ public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction<
public WeChatPayConfigDto toDto() {
return WeChatConvert.CONVERT.convert(this);
}
public static WeChatPayConfig init(WeChatPayConfigParam in) {
return WeChatConvert.CONVERT.convert(in);
}
}

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayOrder.java
View File

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
@Data
@DbTable(comment = "微信支付记录")
@Accessors(chain = true)
@TableName("pay_wechat_payment")
@TableName("pay_wechat_pay_order")
public class WeChatPayOrder extends BasePayOrder implements EntityBaseFunction<WeChatPayOrderDto> {
/**

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayCloseService.java
View File

@@ -32,7 +32,7 @@ import java.util.Optional;
public class WeChatPayCloseService {
/**
* 关闭支付
* 关闭支付, 微信对已经关闭的支付单也可以重复关闭
*/
@Retryable(value = RetryableException.class)
public void close(PayOrder payOrder, WeChatPayConfig weChatPayConfig) {

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayConfigService.java
View File

@@ -36,9 +36,7 @@ public class WeChatPayConfigService {
*/
@Transactional(rollbackFor = Exception.class)
public void update(WeChatPayConfigParam param) {
WeChatPayConfig weChatPayConfig = weChatPayConfigManager.findById(ID)
.orElseThrow(() -> new PayFailureException("微信支付配置不存在"));
param.setActivity(null);
WeChatPayConfig weChatPayConfig = weChatPayConfigManager.findById(ID).orElseThrow(() -> new PayFailureException("微信支付配置不存在"));
BeanUtil.copyProperties(param, weChatPayConfig, CopyOptions.create().ignoreNullValue());
weChatPayConfigManager.updateById(weChatPayConfig);
}

21
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java
View File

@@ -1,18 +1,17 @@
package cn.bootx.platform.daxpay.service.core.payment.pay.strategy;
import cn.bootx.platform.daxpay.code.PayChannelEnum;
import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo;
import cn.bootx.platform.daxpay.service.core.channel.wechat.dao.WeChatPayConfigManager;
import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayCloseService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayOrderService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPaySyncService;
import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException;
import cn.bootx.platform.daxpay.exception.pay.PayFailureException;
import cn.bootx.platform.daxpay.param.pay.PayWayParam;
import cn.bootx.platform.daxpay.service.common.exception.ExceptionInfo;
import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayCloseService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayConfigService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayOrderService;
import cn.bootx.platform.daxpay.service.core.channel.wechat.service.WeChatPayService;
import cn.bootx.platform.daxpay.service.func.AbsPayStrategy;
import cn.bootx.platform.daxpay.service.param.channel.wechat.WeChatPayParam;
import cn.bootx.platform.daxpay.param.pay.PayWayParam;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONException;
import cn.hutool.json.JSONUtil;
@@ -33,7 +32,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT
@RequiredArgsConstructor
public class WeChatPayStrategy extends AbsPayStrategy {
private final WeChatPayConfigManager weChatPayConfigManager;
private final WeChatPayConfigService weChatPayConfigService;
private final WeChatPayService weChatPayService;
@@ -41,8 +40,6 @@ public class WeChatPayStrategy extends AbsPayStrategy {
private final WeChatPayCloseService weChatPayCloseService;
private final WeChatPaySyncService weChatPaySyncService;
private WeChatPayConfig weChatPayConfig;
private WeChatPayParam weChatPayParam;
@@ -60,6 +57,7 @@ public class WeChatPayStrategy extends AbsPayStrategy {
*/
@Override
public void doBeforePayHandler() {
this.initWeChatPayConfig();
try {
// 微信参数验证
String extraParamsJson = this.getPayWayParam().getChannelExtra();
@@ -122,6 +120,7 @@ public class WeChatPayStrategy extends AbsPayStrategy {
* 初始化微信支付
*/
private void initWeChatPayConfig() {
this.weChatPayConfig = weChatPayConfigService.getConfig();
}
}

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WeChatPayRefundStrategy.java
View File

@@ -57,7 +57,6 @@ public class WeChatPayRefundStrategy extends AbsPayRefundStrategy {
wechatRefundService.refund(this.getOrder(), this.getChannelParam().getAmount(), this.weChatPayConfig);
weChatPayOrderService.updateRefund(this.getOrder().getId(), this.getChannelParam().getAmount());
payOrderService.updateRefundSuccess(this.getOrder(), this.getChannelParam().getAmount(), PayChannelEnum.WECHAT);
}
}

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/service/PayRepairService.java
View File

@@ -72,6 +72,7 @@ public class PayRepairService {
// 修改订单支付状态为成功
payment.setStatus(PayStatusEnum.SUCCESS.getCode());
// TODO 读取支付网关中的时间
payment.setPayTime(LocalDateTime.now());
payOrderService.updateById(payment);
}

18
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WeChatPayConfigDto.java
View File

@@ -1,7 +1,6 @@
package cn.bootx.platform.daxpay.service.dto.channel.wechat;
import cn.bootx.platform.common.core.rest.dto.BaseDto;
import cn.bootx.platform.daxpay.service.code.WeChatPayCode;
import cn.bootx.platform.starter.data.perm.sensitive.SensitiveInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -21,9 +20,6 @@ import java.util.List;
@Schema(title = "微信支付配置")
public class WeChatPayConfigDto extends BaseDto implements Serializable {
@Schema(description = "名称")
private String name;
@Schema(description = "微信商户号")
@SensitiveInfo
private String wxMchId;
@@ -32,12 +28,6 @@ public class WeChatPayConfigDto extends BaseDto implements Serializable {
@SensitiveInfo
private String wxAppId;
/**
* @see WeChatPayCode#API_V2
*/
@Schema(description = "api版本")
private String apiVersion;
@Schema(description = "商户平台「API安全」中的 APIv2 密钥")
@SensitiveInfo
private String apiKeyV2;
@@ -57,17 +47,11 @@ public class WeChatPayConfigDto extends BaseDto implements Serializable {
@Schema(description = "服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https ")
private String notifyUrl;
@Schema(description = "页面跳转同步通知页面路径")
private String returnUrl;
@Schema(description = "是否沙箱环境")
private boolean sandbox;
@Schema(description = "超时时间(分钟)")
private Integer expireTime;
@Schema(description = "可用支付方式")
private List<String> payWayList;
private List<String> payWays;
@Schema(description = "是否启用")
private Boolean activity;

27
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/channel/wechat/WeChatPayConfigParam.java
View File

@@ -1,7 +1,6 @@
package cn.bootx.platform.daxpay.service.param.channel.wechat;
import cn.bootx.platform.common.core.annotation.QueryParam;
import cn.bootx.platform.daxpay.service.code.WeChatPayCode;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -20,27 +19,12 @@ import java.util.List;
@Schema(title = "微信支付配置参数")
public class WeChatPayConfigParam {
@Schema(description = "名称")
private String name;
@Schema(description = "商户编码")
private String mchCode;
@Schema(description = "商户应用编码")
private String mchAppCode;
@Schema(description = "微信商户号")
private String wxMchId;
@Schema(description = "微信应用appId")
private String wxAppId;
/**
* @see WeChatPayCode#API_V2
*/
@Schema(description = "api版本")
private String apiVersion;
@Schema(description = "商户平台「API安全」中的 APIv2 密钥")
private String apiKeyV2;
@@ -56,20 +40,11 @@ public class WeChatPayConfigParam {
@Schema(description = "服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https ")
private String notifyUrl;
@Schema(description = "页面跳转同步通知页面路径")
private String returnUrl;
@Schema(description = "是否沙箱环境")
private boolean sandbox;
@Schema(description = "超时时间(分钟)")
private Integer expireTime;
@Schema(description = "可用支付方式")
private List<String> payWayList;
@Schema(description = "是否启用")
private Boolean activity;
private List<String> payWays;
@Schema(description = "状态")
private String state;