|
|
@@ -96,7 +96,8 @@ public class OrderPayController {
|
|
|
public String payOrderWeixinPC(@RequestParam Long id, @RequestParam String code, Model model) throws WxPayException, EncoderException, WxErrorException {
|
|
|
WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
|
|
|
WxMpUser user = wxMpService.oauth2getUserInfo(accessToken, null);
|
|
|
- WxPayMpOrderResult payParams = (WxPayMpOrderResult) orderService.payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
|
|
|
+ WxPayMpOrderResult payParams = (WxPayMpOrderResult) orderService
|
|
|
+ .payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
|
|
|
model.addAttribute("payParams", JSON.toJSONString(payParams));
|
|
|
return "PayOrderPC";
|
|
|
}
|
|
|
@@ -117,6 +118,14 @@ public class OrderPayController {
|
|
|
return orderPayService.payOrderQuick(id);
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation("衫德h5快捷")
|
|
|
+ @RequestMapping(value = "/payAuctionOrder", method = RequestMethod.GET, produces = "text/html")
|
|
|
+ @ResponseBody
|
|
|
+ public String payAuctionOrder(@RequestParam Long id, Model model) throws BaseAdaPayException {
|
|
|
+// return (String) orderService.payAdapay(id, "alipay_wap", null);
|
|
|
+ return sandPayService.payAuctionOrder(id);
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping(value = "/gift/alipay_h5", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public String payGiftOrderAlipayH5(Long id, Model model) throws BaseAdaPayException {
|
|
|
@@ -162,7 +171,8 @@ public class OrderPayController {
|
|
|
public String payGiftOrderWeixinPC(@RequestParam Long id, @RequestParam String code, Model model) throws WxPayException, EncoderException, WxErrorException {
|
|
|
WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
|
|
|
WxMpUser user = wxMpService.oauth2getUserInfo(accessToken, null);
|
|
|
- WxPayMpOrderResult payParams = (WxPayMpOrderResult) giftOrderService.payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
|
|
|
+ WxPayMpOrderResult payParams = (WxPayMpOrderResult) giftOrderService
|
|
|
+ .payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
|
|
|
model.addAttribute("payParams", JSON.toJSONString(payParams));
|
|
|
return "PayOrderPC";
|
|
|
}
|
|
|
@@ -213,7 +223,8 @@ public class OrderPayController {
|
|
|
public String payMintOrderWeixinPC(@RequestParam Long id, @RequestParam String code, Model model) throws WxPayException, EncoderException, WxErrorException {
|
|
|
WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
|
|
|
WxMpUser user = wxMpService.oauth2getUserInfo(accessToken, null);
|
|
|
- WxPayMpOrderResult payParams = (WxPayMpOrderResult) mintOrderService.payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
|
|
|
+ WxPayMpOrderResult payParams = (WxPayMpOrderResult) mintOrderService
|
|
|
+ .payOrderWeixin(id, WxPayConstants.TradeType.JSAPI, user.getOpenId());
|
|
|
model.addAttribute("payParams", JSON.toJSONString(payParams));
|
|
|
return "PayOrderPC";
|
|
|
}
|