diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java index 153506bc..afc53d96 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java @@ -48,14 +48,6 @@ public class WxPayController extends BaseController { if (orderMaster == null) { return AjaxResult.error("订单不存在"); } -// JSONObject wxUser; -// try { -// wxUser = WxUtils.getOpenid(code, wxConfig.getAppId(), wxConfig.getSecret()); -// } catch (IOException e) { -// logger.error("获取微信用户信息失败", e); -// return AjaxResult.error(); -// } -// String openId = wxUser.getString("openid"); //调用adapay微信公众号支付. WxpayExpend expend = new WxpayExpend(); expend.setOpenId(openId); @@ -83,22 +75,20 @@ public class WxPayController extends BaseController { @GetMapping("/pub") @ResponseBody public AjaxResult pubPay(HttpServletRequest request) { - String code = request.getParameter("code"); - logger.info("code is " + code); - //测试时前端不带订单号. -// String orderId = request.getParameter("orderId"); - // TODO 查询回订单信息。如果订单不存在,则退出. + String openId = request.getParameter("openId"); + String orderMasterCode = request.getHeader("orderMasterCode"); + OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode); + if (orderMaster == null) { + return AjaxResult.error("订单不存在"); + } try { - JSONObject wxUser = WxUtils.getOpenid(code, wxConfig.getAppId(), wxConfig.getSecret()); - String openId = wxUser.getString("openid"); logger.info("open id is " + openId); //调用adapay微信公众号支付. WxpayExpend expend = new WxpayExpend(); expend.setOpenId(openId); Map map; - // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description - PayParam payParam = new PayParam("订单号", "支付金额", "商品标题", "商品描述信息"); - map = adapayService.wxPubPay(123456789L, payParam, payCallback, expend, null, null); + PayParam payParam = new PayParam(orderMaster.getCode(), "0.01", "工圈子测试", "工圈子测试描述"); + map = adapayService.wxPubPay(orderMaster.getDeptId(), payParam, payCallback, expend, null, null); return AjaxResult.success(map); } catch (Exception e) { e.printStackTrace();