支付宝配置 Bean
+ * + * @author cyc + */ +@Component +@Data +@ConfigurationProperties(prefix = "alipay") +public class AliPayBean { + private String appId; + private String privateKey; + private String publicKey; + private String appCertPath; + private String aliPayCertPath; + private String aliPayRootCertPath; + private String serverUrl; + private String domain; + private String testDomain; + +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/H5SceneInfo.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/H5SceneInfo.java new file mode 100644 index 0000000..4496902 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/H5SceneInfo.java @@ -0,0 +1,82 @@ +package org.wfc.payment.domain; + +import com.alibaba.fastjson.JSON; + +/** + * @author cyc + */ +public class H5SceneInfo { + private H5 h5_info; + + public H5 getH5Info() { + return h5_info; + } + + public void setH5Info(H5 h5_info) { + this.h5_info = h5_info; + } + + + @Override + public String toString() { + return JSON.toJSONString(this); + } + + + public static class H5 { + private String type; + private String app_name; + private String bundle_id; + private String package_name; + private String wap_url; + private String wap_name; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getApp_name() { + return app_name; + } + + public void setApp_name(String app_name) { + this.app_name = app_name; + } + + public String getBundle_id() { + return bundle_id; + } + + public void setBundle_id(String bundle_id) { + this.bundle_id = bundle_id; + } + + public String getPackage_name() { + return package_name; + } + + public void setPackage_name(String package_name) { + this.package_name = package_name; + } + + public String getWap_url() { + return wap_url; + } + + public void setWap_url(String wap_url) { + this.wap_url = wap_url; + } + + public String getWap_name() { + return wap_name; + } + + public void setWap_name(String wap_name) { + this.wap_name = wap_name; + } + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/JdPayBean.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/JdPayBean.java new file mode 100644 index 0000000..8a430e8 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/JdPayBean.java @@ -0,0 +1,71 @@ +package org.wfc.payment.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * + *JD配置 Bean
+ * + * @author cyc + */ +@Component +@ConfigurationProperties(prefix = "jdpay") +public class JdPayBean { + private String mchId; + private String rsaPrivateKey; + private String desKey; + private String rsaPublicKey; + private String certPath; + + public String getMchId() { + return mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getRsaPrivateKey() { + return rsaPrivateKey; + } + + public void setRsaPrivateKey(String rsaPrivateKey) { + this.rsaPrivateKey = rsaPrivateKey; + } + + public String getDesKey() { + return desKey; + } + + public void setDesKey(String desKey) { + this.desKey = desKey; + } + + public String getRsaPublicKey() { + return rsaPublicKey; + } + + public void setRsaPublicKey(String rsaPublicKey) { + this.rsaPublicKey = rsaPublicKey; + } + + public String getCertPath() { + return certPath; + } + + public void setCertPath(String certPath) { + this.certPath = certPath; + } + + @Override + public String toString() { + return "JdPayBean{" + + "mchId='" + mchId + '\'' + + ", rsaPrivateKey='" + rsaPrivateKey + '\'' + + ", desKey='" + desKey + '\'' + + ", rsaPublicKey='" + rsaPublicKey + '\'' + + ", certPath='" + certPath + '\'' + + '}'; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/PayPalBean.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/PayPalBean.java new file mode 100644 index 0000000..4857cea --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/PayPalBean.java @@ -0,0 +1,61 @@ +package org.wfc.payment.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * + *PayPal配置 Bean
+ * + * @author cyc + */ +@Component +@ConfigurationProperties(prefix = "paypal") +public class PayPalBean { + private String clientId; + private String secret; + private Boolean sandBox; + private String domain; + + public String getClientId() { + return clientId; + } + + public void setClientId(String clientId) { + this.clientId = clientId; + } + + public String getSecret() { + return secret; + } + + public void setSecret(String secret) { + this.secret = secret; + } + + public Boolean getSandBox() { + return sandBox; + } + + public void setSandBox(Boolean sandBox) { + this.sandBox = sandBox; + } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + + @Override + public String toString() { + return "PayPalBean{" + + "clientId='" + clientId + '\'' + + ", secret='" + secret + '\'' + + ", sandBox=" + sandBox + + ", domain='" + domain + '\'' + + '}'; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/UnionPayBean.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/UnionPayBean.java new file mode 100644 index 0000000..60501d1 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/UnionPayBean.java @@ -0,0 +1,61 @@ +package org.wfc.payment.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * + *云闪付配置 Bean
+ * + * @author cyc + */ +@Component +@ConfigurationProperties(prefix = "union") +public class UnionPayBean { + private String machId; + private String key; + private String serverUrl; + private String domain; + + public String getMachId() { + return machId; + } + + public void setMachId(String machId) { + this.machId = machId; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getServerUrl() { + return serverUrl; + } + + public void setServerUrl(String serverUrl) { + this.serverUrl = serverUrl; + } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + + @Override + public String toString() { + return "UnionPayBean{" + + "machId='" + machId + '\'' + + ", key='" + key + '\'' + + ", serverUrl='" + serverUrl + '\'' + + ", domain='" + domain + '\'' + + '}'; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/WxPayBean.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/WxPayBean.java new file mode 100644 index 0000000..ab7d9e5 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/WxPayBean.java @@ -0,0 +1,75 @@ +package org.wfc.payment.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * + *微信配置 Bean
+ * + * @author cyc + */ +@Component +@ConfigurationProperties(prefix = "wxpay") +public class WxPayBean { + private String appId; + private String appSecret; + private String mchId; + private String partnerKey; + private String certPath; + private String domain; + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAppSecret() { + return appSecret; + } + + public void setAppSecret(String appSecret) { + this.appSecret = appSecret; + } + + public String getMchId() { + return mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getPartnerKey() { + return partnerKey; + } + + public void setPartnerKey(String partnerKey) { + this.partnerKey = partnerKey; + } + + public String getCertPath() { + return certPath; + } + + public void setCertPath(String certPath) { + this.certPath = certPath; + } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + + @Override + public String toString() { + return "WxPayBean [appId=" + appId + ", appSecret=" + appSecret + ", mchId=" + mchId + ", partnerKey=" + + partnerKey + ", certPath=" + certPath + ", domain=" + domain + "]"; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/WxPayV3Bean.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/WxPayV3Bean.java new file mode 100644 index 0000000..a1dc1cb --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/WxPayV3Bean.java @@ -0,0 +1,119 @@ +package org.wfc.payment.domain; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * + *微信配置 Bean
+ * + * @author cyc + */ +@Component +@ConfigurationProperties(prefix = "v3") +public class WxPayV3Bean { + private String appId; + private String keyPath; + private String publicKeyPath; + private String certPath; + private String certP12Path; + private String platformCertPath; + private String mchId; + private String apiKey; + private String apiKey3; + private String domain; + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getKeyPath() { + return keyPath; + } + + public void setKeyPath(String keyPath) { + this.keyPath = keyPath; + } + + public String getPublicKeyPath() { + return publicKeyPath; + } + + public void setPublicKeyPath(String publicKeyPath) { + this.publicKeyPath = publicKeyPath; + } + + public String getCertPath() { + return certPath; + } + + public void setCertPath(String certPath) { + this.certPath = certPath; + } + + public String getCertP12Path() { + return certP12Path; + } + + public void setCertP12Path(String certP12Path) { + this.certP12Path = certP12Path; + } + + public String getPlatformCertPath() { + return platformCertPath; + } + + public void setPlatformCertPath(String platformCertPath) { + this.platformCertPath = platformCertPath; + } + + public String getMchId() { + return mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public String getApiKey3() { + return apiKey3; + } + + public void setApiKey3(String apiKey3) { + this.apiKey3 = apiKey3; + } + + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + + @Override + public String toString() { + return "WxPayV3Bean{" + + "keyPath='" + keyPath + '\'' + + ", certPath='" + certPath + '\'' + + ", certP12Path='" + certP12Path + '\'' + + ", platformCertPath='" + platformCertPath + '\'' + + ", mchId='" + mchId + '\'' + + ", apiKey='" + apiKey + '\'' + + ", apiKey3='" + apiKey3 + '\'' + + ", domain='" + domain + '\'' + + '}'; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/vo/AjaxResult.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/vo/AjaxResult.java new file mode 100644 index 0000000..b322478 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/domain/vo/AjaxResult.java @@ -0,0 +1,85 @@ +package org.wfc.payment.domain.vo; + +import java.io.Serializable; + +/** + * @author cyc + */ +public class AjaxResult implements Serializable { + + private static final long serialVersionUID = 6439646269084700779L; + + private int code = 0; + + /** + * 返回的中文消息 + */ + private String message; + + /** + * 成功时携带的数据 + */ + private Object data; + + public int getCode() { + return code; + } + + public String getMessage() { + return message; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + /** + * 校验错误 + * + * @return + */ + public boolean hasError() { + return this.code != 0; + } + + /** + * 添加错误，用于alertError + * + * @param message + * @return + */ + public AjaxResult addError(String message) { + this.message = message; + this.code = 1; + return this; + } + + /** + * 用于Confirm的错误信息 + * + * @param message 描述消息 + * @return {AjaxResult} + */ + public AjaxResult addConfirmError(String message) { + this.message = message; + this.code = 2; + return this; + } + + /** + * 封装成功时的数据 + * + * @param data Object + * @return {AjaxResult} + */ + public AjaxResult success(Object data) { + this.data = data; + this.code = 0; + return this; + } + +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/interceptor/AliPayInterceptor.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/interceptor/AliPayInterceptor.java new file mode 100644 index 0000000..84b987b --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/interceptor/AliPayInterceptor.java @@ -0,0 +1,33 @@ +package org.wfc.payment.interceptor; + +import com.alipay.api.AlipayApiException; +import com.ijpay.alipay.AliPayApiConfigKit; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; +import org.wfc.payment.pay.alipay.controller.AbstractAliPayApiController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + *支付宝支付拦截器
+ * + * @author cyc + */ +public class AliPayInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) throws AlipayApiException { + if (HandlerMethod.class.equals(handler.getClass())) { + HandlerMethod method = (HandlerMethod) handler; + Object controller = method.getBean(); + if (!(controller instanceof AbstractAliPayApiController)) { + throw new RuntimeException("Controller need to inherit AbstractAliPayApiController"); + } + AliPayApiConfigKit.setThreadLocalAliPayApiConfig(((AbstractAliPayApiController) controller).getApiConfig()); + return true; + } + return false; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/interceptor/WxPayInterceptor.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/interceptor/WxPayInterceptor.java new file mode 100644 index 0000000..2151caf --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/interceptor/WxPayInterceptor.java @@ -0,0 +1,32 @@ +package org.wfc.payment.interceptor; + +import com.ijpay.wxpay.WxPayApiConfigKit; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; +import org.wfc.payment.pay.wxpay.controller.AbstractWxPayApiController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + *微信支付拦截器
+ * + * @author cyc + */ +public class WxPayInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) { + if (HandlerMethod.class.equals(handler.getClass())) { + HandlerMethod method = (HandlerMethod) handler; + Object controller = method.getBean(); + if (!(controller instanceof AbstractWxPayApiController)) { + throw new RuntimeException("Controller need to inherit AbstractWxPayApiController"); + } + WxPayApiConfigKit.setThreadLocalWxPayApiConfig(((AbstractWxPayApiController) controller).getApiConfig()); + return true; + } + return false; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AbstractAliPayApiController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AbstractAliPayApiController.java new file mode 100644 index 0000000..1043163 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AbstractAliPayApiController.java @@ -0,0 +1,17 @@ +package org.wfc.payment.pay.alipay.controller; + +import com.alipay.api.AlipayApiException; +import com.ijpay.alipay.AliPayApiConfig; + +/** + * @author cyc + */ +public abstract class AbstractAliPayApiController { + /** + * 获取支付宝配置 + * + * @return {@link AliPayApiConfig} 支付宝配置 + * @throws AlipayApiException 支付宝 Api 异常 + */ + public abstract AliPayApiConfig getApiConfig() throws AlipayApiException; +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java new file mode 100644 index 0000000..4bb426f --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java @@ -0,0 +1,823 @@ +package org.wfc.payment.pay.alipay.controller; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alipay.api.AlipayApiException; +import com.alipay.api.domain.AlipayCommerceCityfacilitatorVoucherGenerateModel; +import com.alipay.api.domain.AlipayDataDataserviceBillDownloadurlQueryModel; +import com.alipay.api.domain.AlipayFundAccountQueryModel; +import com.alipay.api.domain.AlipayFundAuthOrderFreezeModel; +import com.alipay.api.domain.AlipayFundCouponOrderAgreementPayModel; +import com.alipay.api.domain.AlipayFundTransCommonQueryModel; +import com.alipay.api.domain.AlipayFundTransOrderQueryModel; +import com.alipay.api.domain.AlipayFundTransToaccountTransferModel; +import com.alipay.api.domain.AlipayFundTransUniTransferModel; +import com.alipay.api.domain.AlipayOpenAuthTokenAppModel; +import com.alipay.api.domain.AlipayOpenAuthTokenAppQueryModel; +import com.alipay.api.domain.AlipayTradeAppPayModel; +import com.alipay.api.domain.AlipayTradeCancelModel; +import com.alipay.api.domain.AlipayTradeCloseModel; +import com.alipay.api.domain.AlipayTradeCreateModel; +import com.alipay.api.domain.AlipayTradeOrderSettleModel; +import com.alipay.api.domain.AlipayTradePagePayModel; +import com.alipay.api.domain.AlipayTradePayModel; +import com.alipay.api.domain.AlipayTradePrecreateModel; +import com.alipay.api.domain.AlipayTradeQueryModel; +import com.alipay.api.domain.AlipayTradeRefundModel; +import com.alipay.api.domain.AlipayTradeWapPayModel; +import com.alipay.api.domain.Participant; +import com.alipay.api.internal.util.AlipaySignature; +import com.alipay.api.response.AlipayFundAuthOrderFreezeResponse; +import com.alipay.api.response.AlipayFundCouponOrderAgreementPayResponse; +import com.alipay.api.response.AlipayTradeCreateResponse; +import com.ijpay.alipay.AliPayApi; +import com.ijpay.alipay.AliPayApiConfig; +import com.ijpay.alipay.AliPayApiConfigKit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.wfc.common.core.domain.R; +import org.wfc.payment.domain.AliPayBean; +import org.wfc.payment.utils.StringUtils; +import org.wfc.payment.domain.vo.AjaxResult; +import org.wfc.user.api.RemoteUUserService; +import org.wfc.user.api.domain.vo.UOrderVo; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.RoundingMode; +import java.util.HashMap; +import java.util.Map; + +/** + * + *支付宝支付 Demo
+ * + * @author cyc + */ +@Controller +@RequestMapping("/aliPay") +public class AliPayController extends AbstractAliPayApiController { + private static final Logger log = LoggerFactory.getLogger(AliPayController.class); + + @Resource + private AliPayBean aliPayBean; + + @Resource + private RemoteUUserService remoteUUserService; + + private final AjaxResult result = new AjaxResult(); + // 普通公钥模式 + private final static String NOTIFY_URL = "/payment/aliPay/callback"; + private final static String PRE_NOTIFY_URL = "/sys-api"; + private final static String TEST_PRE_NOTIFY_URL = "/proxy-default"; + /** + * 证书模式 + */ +// private final static String NOTIFY_URL = "/aliPay/cert_notify_url"; + private final static String RETURN_URL = "/u"; + /** + * 证书模式 + */ +// private final static String RETURN_URL = "/aliPay/cert_return_url"; + + @Override + public AliPayApiConfig getApiConfig() throws AlipayApiException { + AliPayApiConfig aliPayApiConfig; + try { + aliPayApiConfig = AliPayApiConfigKit.getApiConfig(aliPayBean.getAppId()); + } catch (Exception e) { + aliPayApiConfig = AliPayApiConfig.builder() + .setAppId(aliPayBean.getAppId()) + .setAliPayPublicKey(aliPayBean.getPublicKey()) + .setAppCertPath(aliPayBean.getAppCertPath()) + .setAliPayCertPath(aliPayBean.getAliPayCertPath()) + .setAliPayRootCertPath(aliPayBean.getAliPayRootCertPath()) + .setCharset("UTF-8") + .setPrivateKey(aliPayBean.getPrivateKey()) + .setServiceUrl(aliPayBean.getServerUrl()) + .setSignType("RSA2") + // 普通公钥方式 + .build(); + // 证书模式 +// .buildByCert(); + + } + return aliPayApiConfig; + } + + @RequestMapping("/test") + @ResponseBody + public AliPayApiConfig test() { + AliPayApiConfig aliPayApiConfig = AliPayApiConfigKit.getAliPayApiConfig(); + String charset = aliPayApiConfig.getCharset(); + log.info("charset>" + charset); + return aliPayApiConfig; + } + + + /** + * app支付 + */ + @RequestMapping(value = "/appPay") + @ResponseBody + public AjaxResult appPay() { + try { + AlipayTradeAppPayModel model = new AlipayTradeAppPayModel(); + model.setBody("我是测试数据-By Javen"); + model.setSubject("App支付测试-By Javen"); + model.setOutTradeNo(StringUtils.getOutTradeNo()); + model.setTimeoutExpress("30m"); + model.setTotalAmount("0.01"); + model.setPassbackParams("callback params"); + model.setProductCode("QUICK_MSECURITY_PAY"); + String orderInfo = AliPayApi.appPayToResponse(model, aliPayBean.getDomain() + NOTIFY_URL).getBody(); + result.success(orderInfo); + } catch (AlipayApiException e) { + e.printStackTrace(); + result.addError("system error:" + e.getMessage()); + } + return result; + } + + @RequestMapping(value = "/wapPay") + @ResponseBody + public void wapPay(HttpServletResponse response) { + String body = "我是测试数据-By Javen"; + String subject = "Javen Wap支付测试"; + String totalAmount = "1"; + String passBackParams = "1"; + String returnUrl = aliPayBean.getDomain() + RETURN_URL; + String notifyUrl = aliPayBean.getDomain() + NOTIFY_URL; + + AlipayTradeWapPayModel model = new AlipayTradeWapPayModel(); + model.setBody(body); + model.setSubject(subject); + model.setTotalAmount(totalAmount); + model.setPassbackParams(passBackParams); + String outTradeNo = StringUtils.getOutTradeNo(); + System.out.println("wap outTradeNo>" + outTradeNo); + model.setOutTradeNo(outTradeNo); + model.setProductCode("QUICK_WAP_PAY"); + + try { + AliPayApi.wapPay(response, model, returnUrl, notifyUrl); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * PC支付 + */ + @RequestMapping(value = "/pcPay") + @ResponseBody + public void pcPay(HttpServletResponse response, @RequestParam Long orderId) { + try { + R京东APP支付
+ * + * @author cyc + */ +package org.wfc.payment.pay.jdpay.controller; + +public class AppParams { + private String orderId; + private String merchant; + private String appId; + private String signData; + private String extraInfo; + + public AppParams() { + } + + public AppParams(String orderId, String merchant, String appId, String signData, String extraInfo) { + this.orderId = orderId; + this.merchant = merchant; + this.appId = appId; + this.signData = signData; + this.extraInfo = extraInfo; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getMerchant() { + return merchant; + } + + public void setMerchant(String merchant) { + this.merchant = merchant; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getSignData() { + return signData; + } + + public void setSignData(String signData) { + this.signData = signData; + } + + public String getExtraInfo() { + return extraInfo; + } + + public void setExtraInfo(String extraInfo) { + this.extraInfo = extraInfo; + } +} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/jdpay/controller/JdPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/jdpay/controller/JdPayController.java new file mode 100644 index 0000000..fe610f9 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/jdpay/controller/JdPayController.java @@ -0,0 +1,359 @@ +package org.wfc.payment.pay.jdpay.controller; + +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.XmlUtil; +import com.ijpay.jdpay.JdPayApi; +import com.ijpay.jdpay.kit.JdPayKit; +import com.ijpay.jdpay.model.CustomerPayModel; +import com.ijpay.jdpay.model.FkmModel; +import com.ijpay.jdpay.model.QueryBaiTiaoFqModel; +import com.ijpay.jdpay.model.QueryOrderModel; +import com.ijpay.jdpay.model.RefundModel; +import com.ijpay.jdpay.model.SaveOrderModel; +import com.ijpay.jdpay.model.UniOrderModel; +import com.ijpay.jdpay.model.UserRelationModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; +import org.wfc.payment.domain.JdPayBean; +import org.wfc.payment.domain.vo.AjaxResult; + +import java.util.Date; +import java.util.Map; + +/** + * + *微信支付 Demo
+ * + * @author cyc + */ +@Controller +@RequestMapping("/JDPay") +public class JdPayController { + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + JdPayBean jdPayBean; + + @GetMapping("/test") + @ResponseBody + public JdPayBean test() { + return jdPayBean; + } + + /** + * App 支付 + * + * @return + */ + @RequestMapping(value = "/appPay", method = {RequestMethod.POST, RequestMethod.GET}) + @ResponseBody + public AjaxResult appPay() { + String reqXml = UniOrderModel.builder() + .version("V2.0") + .merchant(jdPayBean.getMchId()) + .tradeNum(System.currentTimeMillis() + "") + .tradeName("IJPay 让支付触手可及") + .tradeDesc("https://gitee.com/javen205/IJPay") + .tradeTime(DateUtil.format(new Date(), "yyyyMMddHHmmss")) + .amount("1") + .orderType("1") + .currency("CNY") + .note("备注") + .notifyUrl("http://jdpaydemo.jd.com/asynNotify.htm") + .tradeType("GEN") + .build() + .genReqXml(jdPayBean.getRsaPrivateKey(), jdPayBean.getDesKey(), "V2.0", jdPayBean.getMchId()); + + // 执行请求 + String resultData = JdPayApi.uniOrder(reqXml); + + log.info("resultData:" + resultData); + + // 解析响应的 xml 数据 + MapPayPal 支付示例
+ * + * @author cyc + */ +package org.wfc.payment.pay.paypal.controller; + +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.ijpay.core.IJPayHttpResponse; +import com.ijpay.core.kit.HttpKit; +import com.ijpay.core.kit.PayKit; +import com.ijpay.paypal.PayPalApi; +import com.ijpay.paypal.PayPalApiConfig; +import com.ijpay.paypal.PayPalApiConfigKit; +import com.ijpay.paypal.accesstoken.AccessToken; +import com.ijpay.paypal.accesstoken.AccessTokenKit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.wfc.payment.domain.PayPalBean; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +@Controller +@RequestMapping("/payPal") +public class PayPalController { + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + PayPalBean payPalBean; + + private final static String RETURN_URL = "/payPal/return"; + private final static String CANCEL_URL = "/payPal/cancel"; + + @RequestMapping("test") + @ResponseBody + public PayPalBean test() { + return payPalBean; + } + + public PayPalApiConfig getConfig() { + PayPalApiConfig config = new PayPalApiConfig(); + config.setClientId(payPalBean.getClientId()); + config.setSecret(payPalBean.getSecret()); + config.setSandBox(payPalBean.getSandBox()); + config.setDomain(payPalBean.getDomain()); + PayPalApiConfigKit.setThreadLocalApiConfig(config); + return config; + } + + @RequestMapping(value = "/getAccessToken") + @ResponseBody + public AccessToken getAccessToken() { + try { + getConfig(); + return AccessTokenKit.get(); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @RequestMapping(value = "/createOrder") + @ResponseBody + public void createOrder(HttpServletResponse response) { + try { + PayPalApiConfig config = getConfig(); + + //参数请求参数文档 https://developer.paypal.com/docs/api/orders/v2/#orders_create + Map微信支付 Demo
+ * + * @author cyc + */ +@Controller +@RequestMapping("/wxPay") +public class WxPayController extends AbstractWxPayApiController { + private final Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxPayBean wxPayBean; + + private String notifyUrl; + private String refundNotifyUrl; + private static final String USER_PAYING = "USERPAYING"; + + + @Override + public WxPayApiConfig getApiConfig() { + WxPayApiConfig apiConfig; + + try { + apiConfig = WxPayApiConfigKit.getApiConfig(wxPayBean.getAppId()); + } catch (Exception e) { + apiConfig = WxPayApiConfig.builder() + .appId(wxPayBean.getAppId()) + .mchId(wxPayBean.getMchId()) + .partnerKey(wxPayBean.getPartnerKey()) + .certPath(wxPayBean.getCertPath()) + .domain(wxPayBean.getDomain()) + .build(); + } + notifyUrl = apiConfig.getDomain().concat("/wxPay/payNotify"); + refundNotifyUrl = apiConfig.getDomain().concat("/wxPay/refundNotify"); + return apiConfig; + } + + @GetMapping("/test") + @ResponseBody + public WxPayBean test() { + return wxPayBean; + } + + @GetMapping("/getKey") + @ResponseBody + public String getKey() { + return WxPayApi.getSignKey(wxPayBean.getMchId(), wxPayBean.getPartnerKey(), SignType.MD5); + } + + /** + * 微信H5 支付 + * 注意：必须再web页面中发起支付且域名已添加到开发配置中 + */ + @RequestMapping(value = "/wapPay", method = {RequestMethod.POST, RequestMethod.GET}) + public void wapPay(HttpServletRequest request, HttpServletResponse response) throws IOException { + String ip = IpKit.getRealIp(request); + if (StrUtil.isBlank(ip)) { + ip = "127.0.0.1"; + } + + H5SceneInfo sceneInfo = new H5SceneInfo(); + + H5SceneInfo.H5 h5_info = new H5SceneInfo.H5(); + h5_info.setType("Wap"); + //此域名必须在商户平台--"产品中心"--"开发配置"中添加 + h5_info.setWap_url("https://gitee.com/javen205/IJPay"); + h5_info.setWap_name("IJPay VIP 充值"); + sceneInfo.setH5Info(h5_info); + + WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig(); + + Map微信支付 v3 接口示例
+ * + * @author cyc + */ +@Controller +@RequestMapping("/v3") +public class WxPayV3Controller { + private final Logger log = LoggerFactory.getLogger(this.getClass()); + private final static int OK = 200; + + @Resource + WxPayV3Bean wxPayV3Bean; + + String serialNo; + String platSerialNo; + + + @RequestMapping("") + @ResponseBody + public String index() { + log.info(wxPayV3Bean.toString()); + try { + String classPath = "classpath:/dev/apiclient_key.pem"; + String v3 = "classpath:/dev/wxpay_v3.properties"; + String absolutePath = PayKit.getAbsolutePath(classPath); + log.info("absolutePath:{}", absolutePath); + String certFileContent = PayKit.getCertFileContent(classPath); + log.info("classPath content:{}", certFileContent); + InputStream inputStream = PayKit.getCertFileInputStream(v3); + if (null != inputStream) { + ByteArrayOutputStream result = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int length; + while ((length = inputStream.read(buffer)) != -1) { + result.write(buffer, 0, length); + } + String str = result.toString(); + log.info("file content:{}", str); + } + } catch (Exception e) { + log.error("文件不存在", e); + } + return ("欢迎使用 的微信支付 Api-v3"); + } + + @RequestMapping("/getSerialNumber") + @ResponseBody + public String serialNumber() { + return getSerialNumber(); + } + + @RequestMapping("/getPlatSerialNumber") + @ResponseBody + public String platSerialNumber() { + return getPlatSerialNumber(); + } + + private String getSerialNumber() { + if (StrUtil.isEmpty(serialNo)) { + // 获取证书序列号 + X509Certificate certificate = PayKit.getCertificate(wxPayV3Bean.getCertPath()); + if (null != certificate) { + serialNo = certificate.getSerialNumber().toString(16).toUpperCase(); + // 提前两天检查证书是否有效 + boolean isValid = PayKit.checkCertificateIsValid(certificate, wxPayV3Bean.getMchId(), -2); + log.info("证书是否可用 {} 证书有效期为 {}", isValid, DateUtil.format(certificate.getNotAfter(), DatePattern.NORM_DATETIME_PATTERN)); + } +// System.out.println("输出证书信息:\n" + certificate.toString()); +// // 输出关键信息，截取部分并进行标记 +// System.out.println("证书序列号:" + certificate.getSerialNumber().toString(16)); +// System.out.println("版本号:" + certificate.getVersion()); +// System.out.println("签发者：" + certificate.getIssuerDN()); +// System.out.println("有效起始日期：" + certificate.getNotBefore()); +// System.out.println("有效终止日期：" + certificate.getNotAfter()); +// System.out.println("主体名：" + certificate.getSubjectDN()); +// System.out.println("签名算法：" + certificate.getSigAlgName()); +// System.out.println("签名：" + certificate.getSignature().toString()); + } + System.out.println("serialNo:" + serialNo); + return serialNo; + } + + private String getPlatSerialNumber() { + if (StrUtil.isEmpty(platSerialNo)) { + // 获取平台证书序列号 + X509Certificate certificate = PayKit.getCertificate(FileUtil.getInputStream(wxPayV3Bean.getPlatformCertPath())); + platSerialNo = certificate.getSerialNumber().toString(16).toUpperCase(); + } + System.out.println("platSerialNo:" + platSerialNo); + return platSerialNo; + } + + private String savePlatformCert(String associatedData, String nonce, String cipherText, String algorithm, String certPath) { + try { + String key3 = wxPayV3Bean.getApiKey3(); + String publicKey; + if (StrUtil.equals(algorithm, AuthTypeEnum.SM2.getPlatformCertAlgorithm())) { + publicKey = PayKit.sm4DecryptToString(key3, cipherText, nonce, associatedData); + } else { + AesUtil aesUtil = new AesUtil(wxPayV3Bean.getApiKey3().getBytes(StandardCharsets.UTF_8)); + // 平台证书密文解密 + // encrypt_certificate 中的 associated_data nonce ciphertext + publicKey = aesUtil.decryptToString( + associatedData.getBytes(StandardCharsets.UTF_8), + nonce.getBytes(StandardCharsets.UTF_8), + cipherText + ); + } + if (StrUtil.isNotEmpty(publicKey)) { + // 保存证书 + FileWriter writer = new FileWriter(certPath); + writer.write(publicKey); + // 获取平台证书序列号 + X509Certificate certificate = PayKit.getCertificate(new ByteArrayInputStream(publicKey.getBytes())); + return certificate.getSerialNumber().toString(16).toUpperCase(); + } + return ""; + } catch (Exception e) { + log.error("保存平台证书异常", e); + return e.getMessage(); + } + } + + + @RequestMapping("/platformCert") + @ResponseBody + public String platformCert() { + try { + String associatedData = "certificate"; + String nonce = "80d28946a64a"; + String cipherText = "DwAqW4+4TeUaOEylfKEXhw+XqGh/YTRhUmLw/tBfQ5nM9DZ9d+9aGEghycwV1jwo52vXb/t6ueBvBRHRIW5JgDRcXmTHw9IMTrIK6HxTt2qiaGTWJU9whsF+GGeQdA7gBCHZm3AJUwrzerAGW1mclXBTvXqaCl6haE7AOHJ2g4RtQThi3nxOI63/yc3WaiAlSR22GuCpy6wJBfljBq5Bx2xXDZXlF2TNbDIeodiEnJEG2m9eBWKuvKPyUPyClRXG1fdOkKnCZZ6u+ipb4IJx28n3MmhEtuc2heqqlFUbeONaRpXv6KOZmH/IdEL6nqNDP2D7cXutNVCi0TtSfC7ojnO/+PKRu3MGO2Z9q3zyZXmkWHCSms/C3ACatPUKHIK+92MxjSQDc1E/8faghTc9bDgn8cqWpVKcL3GHK+RfuYKiMcdSkUDJyMJOwEXMYNUdseQMJ3gL4pfxuQu6QrVvJ17q3ZjzkexkPNU4PNSlIBJg+KX61cyBTBumaHy/EbHiP9V2GeM729a0h5UYYJVedSo1guIGjMZ4tA3WgwQrlpp3VAMKEBLRJMcnHd4pH5YQ/4hiUlHGEHttWtnxKFwnJ6jHr3OmFLV1FiUUOZEDAqR0U1KhtGjOffnmB9tymWF8FwRNiH2Tee/cCDBaHhNtfPI5129SrlSR7bZc+h7uzz9z+1OOkNrWHzAoWEe3XVGKAywpn5HGbcL+9nsEVZRJLvV7aOxAZBkxhg8H5Fjt1ioTJL+qXgRzse1BX1iiwfCR0fzEWT9ldDTDW0Y1b3tb419MhdmTQB5FsMXYOzqp5h+Tz1FwEGsa6TJsmdjJQSNz+7qPSg5D6C2gc9/6PkysSu/6XfsWXD7cQkuZ+TJ/Xb6Q1Uu7ZB90SauA8uPQUIchW5zQ6UfK5dwMkOuEcE/141/Aw2rlDqjtsE17u1dQ6TCax/ZQTDQ2MDUaBPEaDIMPcgL7fCeijoRgovkBY92m86leZvQ+HVbxlFx5CoPhz4a81kt9XJuEYOztSIKlm7QNfW0BvSUhLmxDNCjcxqwyydtKbLzA+EBb2gG4ORiH8IOTbV0+G4S6BqetU7RrO+/nKt21nXVqXUmdkhkBakLN8FUcHygyWnVxbA7OI2RGnJJUnxqHd3kTbzD5Wxco4JIQsTOV6KtO5c960oVYUARZIP1SdQhqwELm27AktEN7kzg/ew/blnTys/eauGyw78XCROb9F1wbZBToUZ7L+8/m/2tyyyqNid+sC9fYqJoIOGfFOe6COWzTI/XPytCHwgHeUxmgk7NYfU0ukR223RPUOym6kLzSMMBKCivnNg68tbLRJHEOpQTXFBaFFHt2qpceJpJgw5sKFqx3eQnIFuyvA1i8s2zKLhULZio9hpsDJQREOcNeHVjEZazdCGnbe3Vjg7uqOoVHdE/YbNzJNQEsB3/erYJB+eGzyFwFmdAHenG5RE6FhCutjszwRiSvW9F7wvRK36gm7NnVJZkvlbGwh0UHr0pbcrOmxT81xtNSvMzT0VZNLTUX2ur3AGLwi2ej8BIC0H41nw4ToxTnwtFR1Xy55+pUiwpB7JzraA08dCXdFdtZ72Tw/dNBy5h1P7EtQYiKzXp6rndfOEWgNOsan7e1XRpCnX7xoAkdPvy40OuQ5gNbDKry5gVDEZhmEk/WRuGGaX06CG9m7NfErUsnQYrDJVjXWKYuARd9R7W0aa5nUXqz/Pjul/LAatJgWhZgFBGXhNr9iAoade/0FPpBj0QWa8SWqKYKiOqXqhfhppUq35FIa0a1Vvxcn3E38XYpVZVTDEXcEcD0RLCu/ezdOa6vRcB7hjgXFIRZQAka0aXnQxwOZwE2Rt3yWXqc+Q1ah2oOrg8Lg3ETc644X9QP4FxOtDwz/A=="; + String algorithm = "AEAD_AES_256_GCM"; + return savePlatformCert(associatedData, nonce, cipherText, algorithm, wxPayV3Bean.getPlatformCertPath()); + } catch (Exception e) { + log.error("保存平台证书异常", e); + return e.getMessage(); + } + } + + @RequestMapping("/smPlatformCert") + @ResponseBody + public String smPlatformCert() { + try { + String associatedData = "certificate"; + String nonce = ""; + String cipherText = ""; + String algorithm = "AEAD_SM4_GCM"; + return savePlatformCert(associatedData, nonce, cipherText, algorithm, wxPayV3Bean.getPlatformCertPath()); + } catch (Exception e) { + log.error("保存国密平台证书异常", e); + return e.getMessage(); + } + } + + @RequestMapping("/get") + @ResponseBody + public String v3Get() { + // 获取平台证书列表 + try { + IJPayHttpResponse response = WxPayApi.v3( + RequestMethodEnum.GET, + WxDomainEnum.CHINA.toString(), + CertAlgorithmTypeEnum.getCertSuffixUrl(CertAlgorithmTypeEnum.SM2.getCode()), + wxPayV3Bean.getMchId(), + getSerialNumber(), + null, + wxPayV3Bean.getKeyPath(), + "", + AuthTypeEnum.RSA.getCode() + ); + Map- * 业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看{@link com.egzosn.pay.common.api.PayService#setPayMessageHandler(com.egzosn.pay.common.api.PayMessageHandler)} - *
- * 如果未设置 {@link com.egzosn.pay.common.api.PayMessageHandler} 那么会使用默认的 {@link com.egzosn.pay.common.api.DefaultPayMessageHandler}
- * @throws IOException IOException
- */
- @RequestMapping(value = "payBack.json")
- public String payBack(HttpServletRequest request) {
- //业务处理在对应的PayMessageHandler里面处理，在哪里设置PayMessageHandler，详情查看com.egzosn.pay.common.api.PayService.setPayMessageHandler()
- return unionPayService.payBack(new HttpRequestNoticeParams(request)).toMessage();
- }
-
-
- /**
- * 查询
- *
- * @param order 订单的请求体
- * @return 返回查询回来的结果集，支付方原值返回
- */
- @RequestMapping("query")
- public Map
+ * use: format("my name is {0}, and i like {1}!", "L.cm", "java")
+ *
+ * int long use {0,number,#}
+ *
+ * @param s
+ * @param args
+ * @return {String}转换后的字符串
+ */
+ public static String format(String s, Object... args) {
+ return MessageFormat.format(s, args);
+ }
+
+ /**
+ * 替换某个字符
+ *
+ * @param str
+ * @param regex
+ * @param args
+ * @return {String}
+ */
+ public static String replace(String str, String regex, String... args) {
+ int length = args.length;
+ for (int i = 0; i < length; i++) {
+ str = str.replaceFirst(regex, args[i]);
+ }
+ return str;
+ }
+
+ /**
+ * 清理字符串，清理出某些不可见字符
+ *
+ * @param txt
+ * @return {String}
+ */
+ public static String cleanChars(String txt) {
+ return txt.replaceAll("[ `·•�\\f\\t\\v]", "");
+ }
+
+ /**
+ * 随机字符串
+ */
+ private static final String INT_TEMP = "0123456789";
+ private static final String STR_TEMP = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+ private static final String ALL_TEMP = INT_TEMP + STR_TEMP;
+
+ private static final Random RANDOM = new Random();
+
+ /**
+ * 生成的随机数类型
+ */
+ public enum RandomType {
+ /**
+ * 整数
+ */
+ INT,
+ /**
+ * 字符串
+ */
+ STRING,
+ /**
+ * 所有类型
+ */
+ ALL
+ }
+
+ /**
+ * 随机数生成
+ *
+ * @param count
+ * @return {String}
+ */
+ public static String random(int count, RandomType randomType) {
+ if (count == 0) {
+ return "";
+ }
+ if (count < 0) {
+ throw new IllegalArgumentException("Requested random string length " + count + " is less than 0.");
+ }
+ char[] buffer = new char[count];
+ for (int i = 0; i < count; i++) {
+ if (randomType.equals(RandomType.INT)) {
+ buffer[i] = INT_TEMP.charAt(RANDOM.nextInt(INT_TEMP.length()));
+ } else if (randomType.equals(RandomType.STRING)) {
+ buffer[i] = STR_TEMP.charAt(RANDOM.nextInt(STR_TEMP.length()));
+ } else {
+ buffer[i] = ALL_TEMP.charAt(RANDOM.nextInt(ALL_TEMP.length()));
+ }
+ }
+ return new String(buffer);
+ }
+
+ public static void main(String[] args) {
+ System.out.println(random(32, RandomType.ALL));
+ }
+}
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java
deleted file mode 100644
index e1f74fd..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wfc.payment.wxpay.config;
-
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnClass(WxPayService.class)
-@EnableConfigurationProperties(WxPayProperties.class)
-@AllArgsConstructor
-public class WWxPayConfig {
- private WxPayProperties properties;
-
- @Bean
- @ConditionalOnMissingBean
- public WxPayService wxService() {
- WxPayConfig payConfig = new WxPayConfig();
- payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
- payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
- payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
- payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
- payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
- payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
-
- // 可以指定是否使用沙箱环境
- payConfig.setUseSandboxEnv(this.properties.getUseSandboxEnv());
-
- WxPayService wxPayService = new WxPayServiceImpl();
- wxPayService.setConfig(payConfig);
- return wxPayService;
- }
-}
\ No newline at end of file
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java
deleted file mode 100644
index 6a14190..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.wfc.payment.wxpay.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * wxpay pay properties.
- *
- */
-@Data
-@ConfigurationProperties(prefix = "wxpay")
-public class WxPayProperties {
- /**
- * 设置微信公众号或者小程序等的appid
- */
- private String appId;
-
- /**
- * 微信支付商户号
- */
- private String mchId;
-
- /**
- * 微信支付商户密钥
- */
- private String mchKey;
-
- /**
- * 服务商模式下的子商户公众账号ID，普通模式请不要配置，请在配置文件中将对应项删除
- */
- private String subAppId;
-
- /**
- * 服务商模式下的子商户号，普通模式请不要配置，最好是请在配置文件中将对应项删除
- */
- private String subMchId;
-
- /**
- * apiclient_cert.p12文件的绝对路径，或者如果放在项目中，请以classpath:开头指定
- */
- private String keyPath;
-
- /**
- * 可以指定是否使用沙箱环境
- */
- private Boolean useSandboxEnv;
-
-}
\ No newline at end of file
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java
deleted file mode 100644
index 502b6fe..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java
+++ /dev/null
@@ -1,431 +0,0 @@
-package org.wfc.payment.wxpay.controller;
-
-import com.alipay.api.AlipayApiException;
-import com.github.binarywang.wxpay.bean.coupon.*;
-import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
-import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
-import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult;
-import com.github.binarywang.wxpay.bean.request.*;
-import com.github.binarywang.wxpay.bean.result.*;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.wfc.payment.wxpay.service.IWxPayNotifyOrderService;
-import org.wfc.payment.wxpay.service.IWxPayNotifyRefundService;
-import org.wfc.payment.wxpay.service.IWxPayNotifyScanpayService;
-
-import java.io.File;
-import java.util.Date;
-import java.util.Map;
-
-@Tag(name = "WeChat Pay")
-@RestController
-@RequestMapping("/wxpay")
-@AllArgsConstructor
-public class WxPayController {
-
- private final WxPayService wxService;
-
- // @Autowired
- // public WxPayController(WxPayService wxService) {
- // this.wxService = wxService;
- // }
-
- /**
- *
- * 查询订单(详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2)
- * 该接口提供所有微信支付订单的查询，商户可以通过查询订单接口主动查询订单状态，完成下一步的业务逻辑。
- * 需要调用查询接口的情况：
- * ◆ 当商户后台、网络、服务器等出现异常，商户系统最终未接收到支付通知；
- * ◆ 调用支付接口后，返回系统错误或未知交易状态情况；
- * ◆ 调用被扫支付API，返回USERPAYING的状态；
- * ◆ 调用关单或撤销接口API之前，需确认支付状态；
- * 接口地址：https://api.mch.weixin.qq.com/pay/orderquery
- *
- *
- * @param transactionId 微信订单号
- * @param outTradeNo 商户系统内部的订单号，当没提供transactionId时需要传这个。
- */
- @Operation(summary = "Query order")
- @GetMapping("/queryOrder")
- public WxPayOrderQueryResult queryOrder(@RequestParam(required = false) String transactionId,
- @RequestParam(required = false) String outTradeNo)
- throws WxPayException {
- return this.wxService.queryOrder(transactionId, outTradeNo);
- }
-
- @Operation(summary = "Query order")
- @PostMapping("/queryOrder")
- public WxPayOrderQueryResult queryOrder(@RequestBody WxPayOrderQueryRequest wxPayOrderQueryRequest)
- throws WxPayException {
- return this.wxService.queryOrder(wxPayOrderQueryRequest);
- }
-
- /**
- *
- * 关闭订单
- * 应用场景
- * 以下情况需要调用关单接口：
- * 1. 商户订单支付失败需要生成新单号重新发起支付，要对原订单号调用关单，避免重复支付；
- * 2. 系统下单后，用户支付超时，系统退出不再受理，避免用户继续，请调用关单接口。
- * 注意：订单生成后不能马上调用关单接口，最短调用时间间隔为5分钟。
- * 接口地址：https://api.mch.weixin.qq.com/pay/closeorder
- * 是否需要证书： 不需要。
- *
- *
- * @param outTradeNo 商户系统内部的订单号
- */
- @Operation(summary = "Close order")
- @GetMapping("/closeOrder/{outTradeNo}")
- public WxPayOrderCloseResult closeOrder(@PathVariable String outTradeNo) throws WxPayException {
- return this.wxService.closeOrder(outTradeNo);
- }
-
- @Operation(summary = "Close order")
- @PostMapping("/closeOrder")
- public WxPayOrderCloseResult closeOrder(@RequestBody WxPayOrderCloseRequest wxPayOrderCloseRequest)
- throws WxPayException {
- return this.wxService.closeOrder(wxPayOrderCloseRequest);
- }
-
- /**
- * 调用统一下单接口，并组装生成支付所需参数对象.
- *
- * @param request 统一下单请求参数
- * @param
- * 微信支付-申请退款
- * 详见 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4
- * 接口链接：https://api.mch.weixin.qq.com/secapi/pay/refund
- *
- *
- * @param request 请求对象
- * @return 退款操作结果
- */
- @Operation(summary = "Refund")
- @PostMapping("/refund")
- public WxPayRefundResult refund(@RequestBody WxPayRefundRequest request) throws WxPayException {
- return this.wxService.refund(request);
- }
-
- /**
- *
- * 微信支付-查询退款
- * 应用场景：
- * 提交退款申请后，通过调用该接口查询退款状态。退款有一定延时，用零钱支付的退款20分钟内到账，
- * 银行卡支付的退款3个工作日后重新查询退款状态。
- * 详见 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_5
- * 接口链接：https://api.mch.weixin.qq.com/pay/refundquery
- *
- *
- * 以下四个参数四选一
- *
- * @param transactionId 微信订单号
- * @param outTradeNo 商户订单号
- * @param outRefundNo 商户退款单号
- * @param refundId 微信退款单号
- * @return 退款信息
- */
- @Operation(summary = "退款查询")
- @GetMapping("/refundQuery")
- public WxPayRefundQueryResult refundQuery(@RequestParam(required = false) String transactionId,
- @RequestParam(required = false) String outTradeNo,
- @RequestParam(required = false) String outRefundNo,
- @RequestParam(required = false) String refundId)
- throws WxPayException {
- return this.wxService.refundQuery(transactionId, outTradeNo, outRefundNo, refundId);
- }
-
- @Operation(summary = "退款查询")
- @PostMapping("/refundQuery")
- public WxPayRefundQueryResult refundQuery(@RequestBody WxPayRefundQueryRequest wxPayRefundQueryRequest)
- throws WxPayException {
- return this.wxService.refundQuery(wxPayRefundQueryRequest);
- }
-
- private final IWxPayNotifyOrderService wxPayNotifyOrderService;
- private static final String MSG_SUCCESS = "success";
- private static final String MSG_FAILURE = "failure";
-
- @Operation(summary = "支付回调通知处理")
- @PostMapping("/notify/order")
- public String parseOrderNotifyResult(@RequestBody String xmlData) throws WxPayException {
- final WxPayOrderNotifyResult notifyResult = this.wxService.parseOrderNotifyResult(xmlData);
- // 根据自己业务场景需要构造返回对象
- try {
- Map
- * 文档详见:
- * 发送普通红包 https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
- * 接口地址：https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack
- * 发送裂变红包 https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5&index=4
- * 接口地址：https://api.mch.weixin.qq.com/mmpaymkttransfers/sendgroupredpack
- *
- *
- * @param request 请求对象
- */
- @Operation(summary = "发送红包")
- @PostMapping("/sendRedpack")
- public WxPaySendRedpackResult sendRedpack(@RequestBody WxPaySendRedpackRequest request) throws WxPayException {
- return this.wxService.getRedpackService().sendRedpack(request);
- }
-
- /**
- *
- * 查询红包记录
- * 用于商户对已发放的红包进行查询红包的具体信息，可支持普通红包和裂变包。
- * 请求Url https://api.mch.weixin.qq.com/mmpaymkttransfers/gethbinfo
- * 是否需要证书 是（证书及使用说明详见商户证书）
- * 请求方式 POST
- *
- *
- * @param mchBillNo 商户发放红包的商户订单号，比如10000098201411111234567890
- */
- @Operation(summary = "查询红包")
- @GetMapping("/queryRedpack/{mchBillNo}")
- public WxPayRedpackQueryResult queryRedpack(@PathVariable String mchBillNo) throws WxPayException {
- return this.wxService.getRedpackService().queryRedpack(mchBillNo);
- }
-
- /**
- *
- * 扫码支付模式一生成二维码的方法
- * 二维码中的内容为链接，形式为：
- * weixin://wxpay/bizpayurl?sign=XXXXX&appid=XXXXX&mch_id=XXXXX&product_id=XXXXXX&time_stamp=XXXXXX&nonce_str=XXXXX
- * 其中XXXXX为商户需要填写的内容，商户将该链接生成二维码，如需要打印发布二维码，需要采用此格式。商户可调用第三方库生成二维码图片。
- * 文档详见: https://pay.weixin.qq.com/wiki/doc/api/native.php?chapter=6_4
- *
- *
- * @param productId 产品Id
- * @param logoFile 商户logo图片的文件对象，可以为空
- * @param sideLength 要生成的二维码的边长，如果为空，则取默认值400
- * @return 生成的二维码的字节数组
- */
- public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception {
- return this.wxService.createScanPayQrcodeMode1(productId, logoFile, sideLength);
- }
-
- /**
- *
- * 扫码支付模式一生成二维码的方法
- * 二维码中的内容为链接，形式为：
- * weixin://wxpay/bizpayurl?sign=XXXXX&appid=XXXXX&mch_id=XXXXX&product_id=XXXXXX&time_stamp=XXXXXX&nonce_str=XXXXX
- * 其中XXXXX为商户需要填写的内容，商户将该链接生成二维码，如需要打印发布二维码，需要采用此格式。商户可调用第三方库生成二维码图片。
- * 文档详见: https://pay.weixin.qq.com/wiki/doc/api/native.php?chapter=6_4
- *
- *
- * @param productId 产品Id
- * @return 生成的二维码URL连接
- */
- public String createScanPayQrcodeMode1(String productId) {
- return this.wxService.createScanPayQrcodeMode1(productId);
- }
-
- /**
- *
- * 扫码支付模式二生成二维码的方法
- * 对应链接格式：weixin：//wxpay/bizpayurl?sr=XXXXX。请商户调用第三方库将code_url生成二维码图片。
- * 该模式链接较短，生成的二维码打印到结账小票上的识别率较高。
- * 文档详见: https://pay.weixin.qq.com/wiki/doc/api/native.php?chapter=6_5
- *
- *
- * @param codeUrl 微信返回的交易会话的二维码链接
- * @param logoFile 商户logo图片的文件对象，可以为空
- * @param sideLength 要生成的二维码的边长，如果为空，则取默认值400
- * @return 生成的二维码的字节数组
- */
- public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception {
- return this.wxService.createScanPayQrcodeMode2(codeUrl, logoFile, sideLength);
- }
-
- /**
- *
- * 交易保障
- * 应用场景：
- * 商户在调用微信支付提供的相关接口时，会得到微信支付返回的相关信息以及获得整个接口的响应时间。
- * 为提高整体的服务水平，协助商户一起提高服务质量，微信支付提供了相关接口调用耗时和返回信息的主动上报接口，
- * 微信支付可以根据商户侧上报的数据进一步优化网络部署，完善服务监控，和商户更好的协作为用户提供更好的业务体验。
- * 接口地址： https://api.mch.weixin.qq.com/payitil/report
- * 是否需要证书：不需要
- *
- */
- @Operation(summary = "提交交易保障数据")
- @PostMapping("/report")
- public void report(@RequestBody WxPayReportRequest request) throws WxPayException {
- this.wxService.report(request);
- }
-
- /**
- *
- * 下载对账单
- * 商户可以通过该接口下载历史交易清单。比如掉单、系统错误等导致商户侧和微信侧数据不一致，通过对账单核对后可校正支付状态。
- * 注意：
- * 1、微信侧未成功下单的交易不会出现在对账单中。支付成功后撤销的交易会出现在对账单中，跟原支付单订单号一致，bill_type为REVOKED；
- * 2、微信在次日9点启动生成前一天的对账单，建议商户10点后再获取；
- * 3、对账单中涉及金额的字段单位为“元”。
- * 4、对账单接口只能下载三个月以内的账单。
- * 接口链接：https://api.mch.weixin.qq.com/pay/downloadbill
- * 详情请见: 下载对账单
- *
- *
- * @param billDate 对账单日期 bill_date 下载对账单的日期，格式：20140603
- * @param billType 账单类型 bill_type
- * ALL，返回当日所有订单信息，默认值，SUCCESS，返回当日成功支付的订单，REFUND，返回当日退款订单
- * @param tarType 压缩账单 tar_type 非必传参数，固定值：GZIP，返回格式为.gzip的压缩包账单。不传则默认为数据流形式。
- * @param deviceInfo 设备号 device_info 非必传参数，终端设备号
- * @return 保存到本地的临时文件
- */
- @Operation(summary = "下载对账单")
- @GetMapping("/downloadBill/{billDate}/{billType}/{tarType}/{deviceInfo}")
- public WxPayBillResult downloadBill(@PathVariable String billDate, @PathVariable String billType,
- @PathVariable String tarType, @PathVariable String deviceInfo) throws WxPayException {
- return this.wxService.downloadBill(billDate, billType, tarType, deviceInfo);
- }
-
- @Operation(summary = "下载对账单")
- @PostMapping("/downloadBill")
- public WxPayBillResult downloadBill(WxPayDownloadBillRequest wxPayDownloadBillRequest) throws WxPayException {
- return this.wxService.downloadBill(wxPayDownloadBillRequest);
- }
-
- /**
- *
- * 提交刷卡支付
- * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/micropay.php?chapter=9_10&index=1
- * 应用场景：
- * 收银员使用扫码设备读取微信用户刷卡授权码以后，二维码或条码信息传送至商户收银台，由商户收银台或者商户后台调用该接口发起支付。
- * 提醒1：提交支付请求后微信会同步返回支付结果。当返回结果为“系统错误”时，商户系统等待5秒后调用【查询订单API】，查询支付实际交易结果；当返回结果为“USERPAYING”时，商户系统可设置间隔时间(建议10秒)重新查询支付结果，直到支付成功或超时(建议30秒)；
- * 提醒2：在调用查询接口返回后，如果交易状况不明晰，请调用【撤销订单API】，此时如果交易失败则关闭订单，该单不能再支付成功；如果交易成功，则将扣款退回到用户账户。当撤销无返回或错误时，请再次调用。注意：请勿扣款后立即调用【撤销订单API】,建议至少15秒后再调用。撤销订单API需要双向证书。
- * 接口地址： https://api.mch.weixin.qq.com/pay/micropay
- * 是否需要证书：不需要。
- *
- */
- @Operation(summary = "提交刷卡支付")
- @PostMapping("/micropay")
- public WxPayMicropayResult micropay(@RequestBody WxPayMicropayRequest request) throws WxPayException {
- return this.wxService.micropay(request);
- }
-
- /**
- *
- * 撤销订单API
- * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/micropay.php?chapter=9_11&index=3
- * 应用场景：
- * 支付交易返回失败或支付系统超时，调用该接口撤销交易。如果此订单用户支付失败，微信支付系统会将此订单关闭；如果用户支付成功，微信支付系统会将此订单资金退还给用户。
- * 注意：7天以内的交易单可调用撤销，其他正常支付的单如需实现相同功能请调用申请退款API。提交支付交易后调用【查询订单API】，没有明确的支付结果再调用【撤销订单API】。
- * 调用支付接口后请勿立即调用撤销订单API，建议支付后至少15s后再调用撤销订单接口。
- * 接口链接 ：https://api.mch.weixin.qq.com/secapi/pay/reverse
- * 是否需要证书：请求需要双向证书。
- *
- */
- @Operation(summary = "撤销订单")
- @PostMapping("/reverseOrder")
- public WxPayOrderReverseResult reverseOrder(@RequestBody WxPayOrderReverseRequest request) throws WxPayException {
- return this.wxService.reverseOrder(request);
- }
-
- @Operation(summary = "获取沙箱环境签名key")
- @GetMapping("/getSandboxSignKey")
- public String getSandboxSignKey() throws WxPayException {
- return this.wxService.getSandboxSignKey();
- }
-
- @Operation(summary = "发放代金券")
- @PostMapping("/sendCoupon")
- public WxPayCouponSendResult sendCoupon(@RequestBody WxPayCouponSendRequest request) throws WxPayException {
- return this.wxService.sendCoupon(request);
- }
-
- @Operation(summary = "查询代金券批次")
- @PostMapping("/queryCouponStock")
- public WxPayCouponStockQueryResult queryCouponStock(@RequestBody WxPayCouponStockQueryRequest request)
- throws WxPayException {
- return this.wxService.queryCouponStock(request);
- }
-
- @Operation(summary = "查询代金券信息")
- @PostMapping("/queryCouponInfo")
- public WxPayCouponInfoQueryResult queryCouponInfo(@RequestBody WxPayCouponInfoQueryRequest request)
- throws WxPayException {
- return this.wxService.queryCouponInfo(request);
- }
-
- @Operation(summary = "拉取订单评价数据")
- @PostMapping("/queryComment")
- public String queryComment(Date beginDate, Date endDate, Integer offset, Integer limit) throws WxPayException {
- return this.wxService.queryComment(beginDate, endDate, offset, limit);
- }
-
-}
\ No newline at end of file
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java
deleted file mode 100644
index a26dcc5..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.wfc.payment.wxpay.error;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/error")
-public class ErrorController {
-
- @GetMapping(value = "/404")
- public String error404() {
- return "error";
- }
-
- @GetMapping(value = "/500")
- public String error500() {
- return "error";
- }
-
-}
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java
deleted file mode 100644
index a91306f..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.wfc.payment.wxpay.error;
-
-import org.springframework.boot.web.server.ErrorPage;
-import org.springframework.boot.web.server.ErrorPageRegistrar;
-import org.springframework.boot.web.server.ErrorPageRegistry;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ErrorPageConfiguration implements ErrorPageRegistrar {
- @Override
- public void registerErrorPages(ErrorPageRegistry errorPageRegistry) {
- errorPageRegistry.addErrorPages(
- new ErrorPage(HttpStatus.NOT_FOUND, "/error/404"),
- new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error/500")
- );
- }
-
-}
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/mapper/UWxPayOrderMapper.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/mapper/UWxPayOrderMapper.java
deleted file mode 100644
index a984d13..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/mapper/UWxPayOrderMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.wfc.payment.wxpay.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.wfc.payment.wxpay.model.UWxPayOrderModel;
-
-@Mapper
-public interface UWxPayOrderMapper {
-
- void insertOrder(UWxPayOrderModel uWxPayOrder);
-
- void updateOrder(UWxPayOrderModel uWxPayOrder);
-
- UWxPayOrderModel selectOrderByOutTradeNo(@Param("outTradeNo") String outTradeNo);
-
- UWxPayOrderModel selectOrderById(@Param("id") Long id);
-}
\ No newline at end of file
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/model/UWxPayOrderModel.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/model/UWxPayOrderModel.java
deleted file mode 100644
index 6cdb1d4..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/model/UWxPayOrderModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.wfc.payment.wxpay.model;
-
-import javax.persistence.*;
-import java.util.Date;
-import lombok.Data;
-
-@Data
-@Entity
-public class UWxPayOrderModel {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Long id;
- private Long userId;
- private String outTradeNo;
- private String trancationId;
- private String tradeStatus;
- private Long totalAmount;
- private String subject;
- private String body;
- private String createBy;
- private Date createTime;
- private String updateBy;
- private Date updateTime;
-
- // Getters and Setters
-}
\ No newline at end of file
diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/service/IWxPayNotifyOrderService.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/service/IWxPayNotifyOrderService.java
deleted file mode 100644
index 0ac17f9..0000000
--- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/service/IWxPayNotifyOrderService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.wfc.payment.wxpay.service;
-
-import java.util.Map;
-
-public interface IWxPayNotifyOrderService {
- boolean handleWxPayNotifyOrder(Map