From ee53817fc68201f44a6bf2bcd0e494ef0e66f3ee Mon Sep 17 00:00:00 2001 From: zhangsz Date: Tue, 24 Dec 2024 20:54:26 +0800 Subject: [PATCH] feat: wxpay update --- wfc-modules/wfc-payment/pom.xml | 12 + .../org/wfc/payment/config/WWxPayConfig.java | 78 ---- ...ntroller.java => WxPayController.java.bak} | 5 +- ...PayService.java => IWxPayService.java.bak} | 3 +- .../service/impl/WWxPayServiceImpl.java.bak | 95 +++++ .../service/impl/WxPayServiceImpl.java | 43 -- .../payment/wxpay/config/SwaggerConfig.java | 79 ++++ .../payment/wxpay/config/WWxPayConfig.java | 43 ++ .../payment/wxpay/config/WxPayProperties.java | 44 ++ .../wxpay/controller/WxPayController.java | 386 ++++++++++++++++++ .../payment/wxpay/error/ErrorController.java | 29 ++ .../wxpay/error/ErrorPageConfiguration.java | 27 ++ .../src/main/resources/application.yml | 37 +- 13 files changed, 749 insertions(+), 132 deletions(-) delete mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/config/WWxPayConfig.java rename wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/{WxPayController.java => WxPayController.java.bak} (90%) rename wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/{IWxPayService.java => IWxPayService.java.bak} (75%) create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WWxPayServiceImpl.java.bak delete mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WxPayServiceImpl.java create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java create mode 100644 wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java diff --git a/wfc-modules/wfc-payment/pom.xml b/wfc-modules/wfc-payment/pom.xml index abc8860..04b5b4f 100644 --- a/wfc-modules/wfc-payment/pom.xml +++ b/wfc-modules/wfc-payment/pom.xml @@ -89,6 +89,18 @@ 4.6.0 + + + io.springfox + springfox-swagger2 + 2.9.2 + + + io.springfox + springfox-swagger-ui + 2.9.2 + + diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/config/WWxPayConfig.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/config/WWxPayConfig.java deleted file mode 100644 index eb2ed0a..0000000 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/config/WWxPayConfig.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.wfc.payment.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; -import com.github.binarywang.wxpay.service.WxPayService; -import com.github.binarywang.wxpay.config.WxPayConfig; -// import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; -import org.wfc.payment.service.impl.WxPayServiceImpl; -import org.wfc.payment.service.IWxPayService; - -@Configuration -public class WWxPayConfig extends WxPayConfig { - private boolean useSandboxEnv; - public void setUseSandboxEnv(boolean useSandboxEnv) { - this.useSandboxEnv = useSandboxEnv; - } - - public boolean isUseSandboxEnv() { - return useSandboxEnv; - } - - @Value("${wx.pay.appId}") - private String appId; - @Value("${wx.pay.mchId}") - private String mchId; - @Value("${wx.pay.mchKey}") - private String mchKey; - @Value("${wx.pay.keyPath}") - private String keyPath; - - public void setAppId(String appId) { - this.appId = appId; - } - - public void setMchId(String mchId) { - this.mchId = mchId; - } - - public void setMchKey(String mchKey) { - this.mchKey = mchKey; - } - - public void setKeyPath(String keyPath) { - this.keyPath = keyPath; - } - - // private String getSandboxSignKey() { - // try { - // WXPayConfigImpl config = new WXPayConfigImpl(); - // Map params = new HashMap<>(); - // params.put("mch_id", config.getMchID()); - // params.put("nonce_str", WXPayUtil.generateNonceStr()); - // params.put("sign", WXPayUtil.generateSignature(params, config.getKey())); - // String strXML = wxPay.requestWithoutCert("/sandboxnew/pay/getsignkey", params, this.getHttpConnectTimeoutMs(), this.getHttpReadTimeoutMs()); - // Map result = WXPayUtil.xmlToMap(strXML); - // if ("SUCCESS".equals(result.get("return_code"))) { - // return result.get("sandbox_signkey"); - // } else { - // // 处理错误情况 - // } - // } catch (Exception e) { - // // 处理异常 - // } - // return null; - // } - - @Bean - public IWxPayService wxPayService() throws Exception { - WWxPayConfig config = new WWxPayConfig(); - config.setAppId(appId); - config.setMchId(mchId); - config.setMchKey(mchKey); - config.setKeyPath(keyPath); - config.setUseSandboxEnv(true); // 启用沙箱环境 - return new WxPayServiceImpl(config); - } -} \ No newline at end of file diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/WxPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/WxPayController.java.bak similarity index 90% rename from wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/WxPayController.java rename to wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/WxPayController.java.bak index 6fc7dce..fea0fb2 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/WxPayController.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/controller/WxPayController.java.bak @@ -15,9 +15,10 @@ import org.wfc.common.log.enums.BusinessType; import org.wfc.common.security.annotation.RequiresPermissions; import org.wfc.payment.domain.WxPay; import org.wfc.payment.service.IWxPayService; +import org.wfc.payment.service.impl.WWxPayServiceImpl; import org.springframework.web.bind.annotation.RequestBody; import com.github.binarywang.wxpay.exception.WxPayException; -import com.github.binarywang.wxpay.service.WxPayService; +// import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; @@ -25,7 +26,7 @@ import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; @RequestMapping("/wxpay") public class WxPayController extends BaseController { @Autowired - private WxPayService wxPayService; + private IWxPayService wxPayService; @PostMapping("/notify") public String payNotify(@RequestBody String xmlData) throws WxPayException { diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/IWxPayService.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/IWxPayService.java.bak similarity index 75% rename from wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/IWxPayService.java rename to wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/IWxPayService.java.bak index 317714c..6bcd9e1 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/IWxPayService.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/IWxPayService.java.bak @@ -4,7 +4,8 @@ import java.math.BigDecimal; import org.wfc.payment.domain.WxPay; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult; +import com.github.binarywang.wxpay.service.WxPayService; -public interface IWxPayService { +public interface IWxPayService extends WxPayService { public WxPayUnifiedOrderResult createOrder(String orderId, BigDecimal amount) throws WxPayException; } \ No newline at end of file diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WWxPayServiceImpl.java.bak b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WWxPayServiceImpl.java.bak new file mode 100644 index 0000000..45aac4a --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WWxPayServiceImpl.java.bak @@ -0,0 +1,95 @@ +package org.wfc.payment.service.impl; + +import java.math.BigDecimal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.wfc.payment.config.WWxPayConfig; +import org.wfc.payment.service.IWxPayService; +import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; +import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; +import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; +import com.github.binarywang.wxpay.bean.notify.ComplaintNotifyResult; +import com.github.binarywang.wxpay.bean.notify.SignatureHeader; +import com.github.binarywang.wxpay.bean.result.WxPayQueryExchangeRateResult; +import com.github.binarywang.wxpay.exception.WxPayException; +import com.github.binarywang.wxpay.service.PartnerPayScoreSignPlanService; +import com.github.binarywang.wxpay.service.PartnerPayScoreService; +import com.github.binarywang.wxpay.service.TransferService; +import com.github.binarywang.wxpay.service.WxPayService; +import com.github.binarywang.wxpay.service.BankService; +import com.github.binarywang.wxpay.service.ComplaintService; + +@Service +public class WWxPayServiceImpl implements WxPayService { + + @Autowired + private WWxPayConfig config; + + private WxPayService wxPayService; + + @Autowired + public WWxPayServiceImpl(WWxPayConfig config, WxPayService wxPayService) { + this.config = config; + this.wxPayService = wxPayService; + } + + public WxPayUnifiedOrderResult createOrder(String orderId, BigDecimal amount) throws WxPayException { + WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); + request.setOutTradeNo(orderId); + request.setTotalFee(BaseWxPayRequest.yuanToFen(amount.toString())); + request.setBody("Order Payment"); + request.setTradeType("JSAPI"); + request.setNotifyUrl("https://wfc-modules-payment:/wxpay/notify"); + return wxPayService.unifiedOrder(request); + } + + @Override + public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) throws WxPayException { + // Implement the method logic here + return null; + } + + @Override + public PartnerPayScoreSignPlanService getPartnerPayScoreSignPlanService() { + // Implement the method logic here + return null; + } + + @Override + public PartnerPayScoreService getPartnerPayScoreService() { + // Implement the method logic here + return null; + } + + @Override + public TransferService getTransferService() { + // Implement the method logic here + return null; + } + + @Override + public BankService getBankService() { + // Implement the method logic here + return null; + } + + @Override + public ComplaintService getComplaintsService() { + // Implement the method logic here + return null; + } + + @Override + public ComplaintNotifyResult parseComplaintNotifyResult(String xmlData, SignatureHeader header) throws WxPayException { + // Implement the method logic here + return null; + } + + @Override + public WxPayQueryExchangeRateResult queryExchangeRate(String fromCurrency, String toCurrency) throws WxPayException { + // Implement the method logic here + return null; + } + // Implement other methods from WxPayService interface as needed +} \ No newline at end of file diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WxPayServiceImpl.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WxPayServiceImpl.java deleted file mode 100644 index e6d8e0c..0000000 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/service/impl/WxPayServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.wfc.payment.service.impl; - -import java.math.BigDecimal; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.wfc.payment.mapper.WxPayMapper; -import org.wfc.payment.service.IWxPayService; -import org.wfc.payment.domain.WxPay; -import org.wfc.payment.config.WWxPayConfig; -import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; -import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; -import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult; -import com.github.binarywang.wxpay.exception.WxPayException; -import com.github.binarywang.wxpay.service.WxPayService; - -/** - * WxPay service implementation - * - * @author wfc - */ -@Service -public class WxPayServiceImpl implements IWxPayService -{ - @Autowired - private WxPayService wxPayService; - - @Autowired - private WWxPayConfig config; - - public WxPayServiceImpl(WWxPayConfig config) { - this.config = config; - } - - public WxPayUnifiedOrderResult createOrder(String orderId, BigDecimal amount) throws WxPayException { - WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); - request.setOutTradeNo(orderId); - request.setTotalFee(BaseWxPayRequest.yuanToFen(amount.toString())); - request.setBody("Order Payment"); - request.setTradeType("JSAPI"); - request.setNotifyUrl("https://wfc-modules-payment:/wxpay/notify"); - return wxPayService.unifiedOrder(request); - } -} diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java new file mode 100644 index 0000000..4cffef8 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java @@ -0,0 +1,79 @@ +package org.wfc.payment.wxpay.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.EnvironmentAware; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.util.StopWatch; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import static springfox.documentation.builders.PathSelectors.regex; + +/** + * 
+ * Swagger配置类
+ * Created by Binary Wang on 2018/9/27.
+ *
+ * + * @author Binary Wang + */ +@Configuration +@EnableSwagger2 +@Slf4j +public class SwaggerConfig extends WebMvcConfigurationSupport implements EnvironmentAware { + private Environment environment; + + @Override + public void setEnvironment(Environment environment) { + this.environment = environment; + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + super.addResourceHandlers(registry); + } + + @Bean + public Docket docket() { + //最重要的就是这里，定义了/test/.*开头的rest接口都分在了test分组里，可以通过/v2/api-docs?group=test得到定义的json + log.info("Starting Swagger"); + StopWatch watch = new StopWatch(); + watch.start(); + Docket docket = new Docket(DocumentationType.SWAGGER_2) + .groupName("pay") + .apiInfo(this.apiInfo()) + .select() + .apis(RequestHandlerSelectors.any()) + .paths(regex("/payment/wxpay/.*")) + .build(); + watch.stop(); + log.info("Started Swagger in {} ms", watch.getTotalTimeMillis()); + return docket; + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("WeChat Pay API") + .description("WeChat Pay API for Java") + .contact(new Contact("Binary Wang", null, null)) + .license("Apache 2.0") + .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html") + .version("1.0.0") + .build(); + } + +} \ No newline at end of file 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 new file mode 100644 index 0000000..0a9d3fa --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WWxPayConfig.java @@ -0,0 +1,43 @@ +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.beans.factory.annotation.Autowired; +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; + +/** + * @author Binary Wang + */ +@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(false); + + 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 new file mode 100644 index 0000000..4250d5a --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/WxPayProperties.java @@ -0,0 +1,44 @@ +package org.wfc.payment.wxpay.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * wxpay pay properties. + * + * @author Binary Wang + */ +@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; + +} \ 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 new file mode 100644 index 0000000..88d4c18 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/controller/WxPayController.java @@ -0,0 +1,386 @@ +package org.wfc.payment.wxpay.controller; + +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.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.io.File; +import java.util.Date; + + +/** + * @author Binary Wang + */ +@Api("微信支付") +@RestController +@RequestMapping("/payment/wxpay") +@AllArgsConstructor +public class WxPayController { + private WxPayService 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时需要传这个。 + */ + @ApiOperation(value = "查询订单") + @GetMapping("/queryOrder") + public WxPayOrderQueryResult queryOrder(@RequestParam(required = false) String transactionId, + @RequestParam(required = false) String outTradeNo) + throws WxPayException { + return this.wxService.queryOrder(transactionId, outTradeNo); + } + + @ApiOperation(value = "查询订单") + @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 商户系统内部的订单号 + */ + @ApiOperation(value = "关闭订单") + @GetMapping("/closeOrder/{outTradeNo}") + public WxPayOrderCloseResult closeOrder(@PathVariable String outTradeNo) throws WxPayException { + return this.wxService.closeOrder(outTradeNo); + } + + @ApiOperation(value = "关闭订单") + @PostMapping("/closeOrder") + public WxPayOrderCloseResult closeOrder(@RequestBody WxPayOrderCloseRequest wxPayOrderCloseRequest) throws WxPayException { + return this.wxService.closeOrder(wxPayOrderCloseRequest); + } + + /** + * 调用统一下单接口，并组装生成支付所需参数对象. + * + * @param request 统一下单请求参数 + * @param 请使用{@link com.github.binarywang.wxpay.bean.order}包下的类 + * @return 返回 {@link com.github.binarywang.wxpay.bean.order}包下的类对象 + */ + @ApiOperation(value = "统一下单，并组装所需支付参数") + @PostMapping("/createOrder") + public T createOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException { + return this.wxService.createOrder(request); + } + + /** + * 统一下单(详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) + * 在发起微信支付前，需要调用统一下单接口，获取"预支付交易会话标识" + * 接口地址：https://api.mch.weixin.qq.com/pay/unifiedorder + * + * @param request 请求对象，注意一些参数如appid、mchid等不用设置，方法内会自动从配置对象中获取到（前提是对应配置中已经设置） + */ + @ApiOperation(value = "原生的统一下单接口") + @PostMapping("/unifiedOrder") + public WxPayUnifiedOrderResult unifiedOrder(@RequestBody WxPayUnifiedOrderRequest request) throws WxPayException { + return this.wxService.unifiedOrder(request); + } + + /** + * 
+   * 微信支付-申请退款
+   * 详见 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 退款操作结果 + */ + @ApiOperation(value = "退款") + @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 退款信息 + */ + @ApiOperation(value = "退款查询") + @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); + } + + @ApiOperation(value = "退款查询") + @PostMapping("/refundQuery") + public WxPayRefundQueryResult refundQuery(@RequestBody WxPayRefundQueryRequest wxPayRefundQueryRequest) throws WxPayException { + return this.wxService.refundQuery(wxPayRefundQueryRequest); + } + + @ApiOperation(value = "支付回调通知处理") + @PostMapping("/notify/order") + public String parseOrderNotifyResult(@RequestBody String xmlData) throws WxPayException { + final WxPayOrderNotifyResult notifyResult = this.wxService.parseOrderNotifyResult(xmlData); + // TODO 根据自己业务场景需要构造返回对象 + return WxPayNotifyResponse.success("成功"); + } + + @ApiOperation(value = "退款回调通知处理") + @PostMapping("/notify/refund") + public String parseRefundNotifyResult(@RequestBody String xmlData) throws WxPayException { + final WxPayRefundNotifyResult result = this.wxService.parseRefundNotifyResult(xmlData); + // TODO 根据自己业务场景需要构造返回对象 + return WxPayNotifyResponse.success("成功"); + } + + @ApiOperation(value = "扫码支付回调通知处理") + @PostMapping("/notify/scanpay") + public String parseScanPayNotifyResult(String xmlData) throws WxPayException { + final WxScanPayNotifyResult result = this.wxService.parseScanPayNotifyResult(xmlData); + // TODO 根据自己业务场景需要构造返回对象 + return WxPayNotifyResponse.success("成功"); + } + + /** + * 发送微信红包给个人用户 + * 
+   * 文档详见:
+   * 发送普通红包 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 请求对象 + */ + @ApiOperation(value = "发送红包") + @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 + */ + @ApiOperation(value = "查询红包") + @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
+   * 是否需要证书：不需要
+   *
+ */ + @ApiOperation(value = "提交交易保障数据") + @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 保存到本地的临时文件 + */ + @ApiOperation(value = "下载对账单") + @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); + } + + @ApiOperation(value = "下载对账单") + @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
+   * 是否需要证书：不需要。
+   *
+ */ + @ApiOperation(value = "提交刷卡支付") + @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
+   *  是否需要证书：请求需要双向证书。
+   *
+ */ + @ApiOperation(value = "撤销订单") + @PostMapping("/reverseOrder") + public WxPayOrderReverseResult reverseOrder(@RequestBody WxPayOrderReverseRequest request) throws WxPayException { + return this.wxService.reverseOrder(request); + } + + @ApiOperation(value = "获取沙箱环境签名key") + @GetMapping("/getSandboxSignKey") + public String getSandboxSignKey() throws WxPayException { + return this.wxService.getSandboxSignKey(); + } + + @ApiOperation(value = "发放代金券") + @PostMapping("/sendCoupon") + public WxPayCouponSendResult sendCoupon(@RequestBody WxPayCouponSendRequest request) throws WxPayException { + return this.wxService.sendCoupon(request); + } + + @ApiOperation(value = "查询代金券批次") + @PostMapping("/queryCouponStock") + public WxPayCouponStockQueryResult queryCouponStock(@RequestBody WxPayCouponStockQueryRequest request) throws WxPayException { + return this.wxService.queryCouponStock(request); + } + + @ApiOperation(value = "查询代金券信息") + @PostMapping("/queryCouponInfo") + public WxPayCouponInfoQueryResult queryCouponInfo(@RequestBody WxPayCouponInfoQueryRequest request) throws WxPayException { + return this.wxService.queryCouponInfo(request); + } + + @ApiOperation(value = "拉取订单评价数据") + @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 new file mode 100644 index 0000000..f8c65c8 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorController.java @@ -0,0 +1,29 @@ +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; + +/** + * 
+ * 出错页面控制器
+ * Created by Binary Wang on 2018/8/25.
+ *
+ * + * @author Binary Wang + */ +@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 new file mode 100644 index 0000000..ab44186 --- /dev/null +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/error/ErrorPageConfiguration.java @@ -0,0 +1,27 @@ +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; + +/** + * 
+ * 配置错误状态与对应访问路径
+ * Created by Binary Wang on 2018/8/25.
+ *
+ * + * @author Binary Wang + */ +@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/resources/application.yml b/wfc-modules/wfc-payment/src/main/resources/application.yml index d7b8532..95cfb22 100644 --- a/wfc-modules/wfc-payment/src/main/resources/application.yml +++ b/wfc-modules/wfc-payment/src/main/resources/application.yml @@ -1,5 +1,8 @@ # spring配置 spring: + main: + allow-bean-definition-overriding: true + redis: host: wfc-redis port: 6379 @@ -42,13 +45,6 @@ spring: # url: # driver-class-name: -wx: - pay: - appId: app_id - mchId: merchant_id - mchKey: merchant_key - keyPath: /path/to/your/apiclient_key.pem - # mybatis-plus配置 mybatis-plus: # 搜索指定包别名 @@ -65,4 +61,29 @@ mybatis-plus: swagger: title: 系统模块接口文档 license: Powered By wfc - licenseUrl: https://wfc.vip \ No newline at end of file + licenseUrl: https://wfc.vip + +logging: + level: + root: debug + org: + springframework: + web: debug + mybatis: + mapper: debug + wfc: + system: debug + com: + github: + binarywang: debug + file: + name: /home/wfc/logs/wfc-payment.log + + +wxpay: + appId: 121412414112 + mchId: 1131412414 + mchKey: 1525342aa + subAppId: #服务商模式下的子商户公众账号ID + subMchId: #服务商模式下的子商户号 + keyPath: /home/wfc/config/payment/wxpay_key.pem