cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复支付 导出最新sql

Browse Source
This commit is contained in:
hupeng
2023-10-11 11:39:10 +08:00
parent 85b0868dde
commit 441dad9ef6
30 changed files with 838 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-module-pay/yshop-module-pay-api/src/main/java/co/yixiang/yshop/module/pay/config/MerchantPayServiceConfigurer.java
View File

@ -26,6 +26,10 @@ public class MerchantPayServiceConfigurer implements PayServiceConfigurer {
@Resource
private JdbcTemplate jdbcTemplate;
@Resource
private AliPayMessageHandler aliPayMessageHandler;
@Resource
private WxPayMessageHandler wxPayMessageHandler;
/**
* 商户配置
@ -49,7 +53,7 @@ public class MerchantPayServiceConfigurer implements PayServiceConfigurer {
public void configure(PayMessageConfigurer configurer) {
PaymentPlatform aliPaymentPlatform = PaymentPlatforms.getPaymentPlatform(AliPaymentPlatform.PLATFORM_NAME);
PaymentPlatform wxPaymentPlatform = PaymentPlatforms.getPaymentPlatform(WxPaymentPlatform.PLATFORM_NAME);
configurer.addHandler(aliPaymentPlatform, new AliPayMessageHandler());
configurer.addHandler(wxPaymentPlatform, new WxPayMessageHandler());
configurer.addHandler(aliPaymentPlatform, aliPayMessageHandler);
configurer.addHandler(wxPaymentPlatform, wxPayMessageHandler);
}
}

3
yshop-module-pay/yshop-module-pay-api/src/main/java/co/yixiang/yshop/module/pay/config/handlers/AliPayMessageHandler.java
View File

@ -6,6 +6,7 @@ import com.egzosn.pay.ali.bean.AliPayMessage;
import com.egzosn.pay.common.api.PayMessageHandler;
import com.egzosn.pay.common.bean.PayOutMessage;
import com.egzosn.pay.common.exception.PayErrorException;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Map;
@ -15,7 +16,7 @@ import java.util.Map;
* @author hupeng
* @date 2023/7/15
*/
//@Component
@Component
public class AliPayMessageHandler implements PayMessageHandler<AliPayMessage, AliPayService> {
@Resource

2
yshop-module-pay/yshop-module-pay-api/src/main/java/co/yixiang/yshop/module/pay/config/handlers/WxPayMessageHandler.java
View File

@ -7,6 +7,7 @@ import com.egzosn.pay.common.bean.PayOutMessage;
import com.egzosn.pay.common.exception.PayErrorException;
import com.egzosn.pay.wx.bean.WxPayMessage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Map;
@ -16,6 +17,7 @@ import java.util.Map;
* @author hupeng
* @date 2023/7/15
*/
@Component
@Slf4j
public class WxPayMessageHandler implements PayMessageHandler<WxPayMessage, PayService> {

9
yshop-module-pay/yshop-module-pay-biz/src/main/java/co/yixiang/yshop/module/pay/controller/admin/merchantdetails/vo/MerchantDetailsBaseVO.java
View File

@ -12,8 +12,12 @@ import javax.validation.constraints.*;
@Data
public class MerchantDetailsBaseVO {
private String detailsId;
private String title;
@Schema(description = "支付类型(支付渠道) 详情查看com.egzosn.pay.spring.boot.core.merchant.PaymentPlatform对应子类，aliPay 支付宝， wxPay微信..等等", required = true, example = "2")
@NotNull(message = "支付类型(支付渠道) 详情查看com.egzosn.pay.spring.boot.core.merchant.PaymentPlatform对应子类，aliPay 支付宝， wxPay微信..等等不能为空")
@NotNull(message = "支付类型(支付渠道)不能为空")
private String payType;
@Schema(description = "应用id", example = "1718")
@ -44,7 +48,7 @@ public class MerchantDetailsBaseVO {
private String returnUrl;
@Schema(description = "签名方式,目前已实现多种签名方式详情查看com.egzosn.pay.common.util.sign.encrypt。MD5,RSA等等", required = true, example = "1")
@NotNull(message = "签名方式,目前已实现多种签名方式详情查看com.egzosn.pay.common.util.sign.encrypt。MD5,RSA等等不能为空")
@NotNull(message = "签名方式不能为空")
private String signType;
@Schema(description = "收款账号，暂时只有支付宝部分使用，可根据开发者自行使用")
@ -57,7 +61,6 @@ public class MerchantDetailsBaseVO {
private String subMchId;
@Schema(description = "编码类型，大部分为utf-8", required = true)
@NotNull(message = "编码类型，大部分为utf-8不能为空")
private String inputCharset;
@Schema(description = "是否为测试环境: 0 否，1 测试环境", required = true)

4
yshop-module-pay/yshop-module-pay-biz/src/main/java/co/yixiang/yshop/module/pay/controller/admin/merchantdetails/vo/MerchantDetailsRespVO.java
View File

@ -3,6 +3,8 @@ package co.yixiang.yshop.module.pay.controller.admin.merchantdetails.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 支付服务商配置 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ -12,4 +14,6 @@ public class MerchantDetailsRespVO extends MerchantDetailsBaseVO {
@Schema(description = "列表id", required = true, example = "17552")
private String detailsId;
private LocalDateTime createTime;
}

2
yshop-module-pay/yshop-module-pay-biz/src/main/java/co/yixiang/yshop/module/pay/dal/dataobject/merchantdetails/MerchantDetailsDO.java
View File

@ -24,6 +24,8 @@ public class MerchantDetailsDO extends BaseDO {
*/
@TableId(type = IdType.INPUT)
private String detailsId;
private String title;
/**
* 支付类型(支付渠道) 详情查看com.egzosn.pay.spring.boot.core.merchant.PaymentPlatform对应子类，aliPay 支付宝， wxPay微信..等等
*/