升级sdk版本为2.9.6.BETA

Author: binarywang

pom.xml

@@ -12,13 +12,13 @@
  <!-- base setting -->
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <project.build.locales>zh_CN</project.build.locales>
- <project.build.jdk>1.7</project.build.jdk>
+ <project.build.jdk>1.8</project.build.jdk>
 
  <!-- plugin versions -->
  <plugin.maven-compiler>3.1</plugin.maven-compiler>
 
  <!-- lib versions -->
- <weixin-java-tools.version>2.9.0</weixin-java-tools.version>
+ <weixin-java-tools.version>2.9.6.BETA</weixin-java-tools.version>
  <junit.version>4.12</junit.version>
  <slf4j.version>1.7.21</slf4j.version>
  <spring.version>4.2.6.RELEASE</spring.version>

src/main/java/com/github/weixin/demo/controller/PaymentController.java

@@ -1,8 +1,16 @@
 package com.github.weixin.demo.controller;
 
-import com.github.binarywang.wxpay.bean.request.WxEntPayRequest;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.github.binarywang.wxpay.bean.entpay.EntPayRequest;
+import com.github.binarywang.wxpay.bean.entpay.EntPayResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.bean.result.WxEntPayResult;
 import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -13,13 +21,6 @@
 import com.github.weixin.demo.util.XMLUtil;
 import com.google.gson.Gson;
 import me.chanjar.weixin.common.exception.WxErrorException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 /**
  * 微信支付Controller
@@ -53,7 +54,7 @@ public void getPrepayId(HttpServletResponse response,
  .body(request.getParameter("body"))
  .tradeType(request.getParameter("trade_type"))
  .spbillCreateIp(request.getParameter("spbill_create_ip"))
- .notifyURL("")
+ .notifyUrl("")
  .build();
  this.logger
  .info("PartnerKey is :" + this.payConfig.getMchKey());
@@ -79,7 +80,7 @@ public void getJSSDKPayInfo(HttpServletResponse response,
  .body(request.getParameter("body"))
  .tradeType(request.getParameter("trade_type"))
  .spbillCreateIp(request.getParameter("spbill_create_ip"))
- .notifyURL("")//TODO(user) 填写通知回调地址
+ .notifyUrl("// TODO 填写通知回调地址")
  .build();
 
  try {
@@ -133,7 +134,7 @@ public void getJSSDKCallbackData(HttpServletRequest request,
  @RequestMapping(value = "entPay")
  public void payToIndividual(HttpServletResponse response,
  HttpServletRequest request) {
- WxEntPayRequest wxEntPayRequest = new WxEntPayRequest();
+ EntPayRequest wxEntPayRequest = new EntPayRequest();
  wxEntPayRequest.setAppid(payConfig.getAppId());
  wxEntPayRequest.setMchId(payConfig.getMchId());
  wxEntPayRequest.setNonceStr(Sha1Util.getNonceStr());
@@ -145,7 +146,7 @@ public void payToIndividual(HttpServletResponse response,
  wxEntPayRequest.setSpbillCreateIp(request.getParameter("spbill_create_ip"));
 
  try {
- WxEntPayResult wxEntPayResult = payService.entPay(wxEntPayRequest);
+ EntPayResult wxEntPayResult = payService.getEntPayService().entPay(wxEntPayRequest);
  if ("SUCCESS".equals(wxEntPayResult.getResultCode().toUpperCase())
  && "SUCCESS".equals(wxEntPayResult.getReturnCode().toUpperCase())) {
  this.logger.info("企业对个人付款成功！\n付款信息：\n" + wxEntPayResult.toString());