From 929ee835e5d92cc53078bedf98bc50d49019ce62 Mon Sep 17 00:00:00 2001 From: egan Date: Thu, 22 Feb 2018 16:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=A0=81=E4=BB=98=E7=AE=80=E5=8D=95?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/demo/controller/PayController.java | 46 ++++++------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java index 9fa0df2..e330472 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java @@ -16,10 +16,14 @@ import com.egzosn.pay.demo.service.ApyAccountService; import com.egzosn.pay.demo.service.PayResponse; import com.egzosn.pay.payoneer.api.PayoneerPayService; import com.egzosn.pay.wx.bean.WxTransactionType; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.view.RedirectView; +import org.springframework.web.servlet.view.json.MappingJackson2JsonView; import javax.annotation.Resource; import javax.imageio.ImageIO; @@ -237,48 +241,26 @@ public class PayController { * @return 支付宝与微信平台的判断 */ @RequestMapping(value = "toWxAliPay.html", produces = "text/html;charset=UTF-8") - public String toWxAliPay(Integer wxPayId,Integer aliPayId, BigDecimal price, HttpServletRequest request) throws IOException { + public ModelAndView toWxAliPay(Integer wxPayId,Integer aliPayId, BigDecimal price, HttpServletRequest request) throws IOException { StringBuilder html = new StringBuilder(); //订单 PayOrder payOrder = new PayOrder("订单title", "摘要", null == price ? new BigDecimal(0.01) : price, System.currentTimeMillis() + ""); - - html.append(" "); - return html.toString(); + + return new ModelAndView(""); + + }