From eaa59ba9a115e71626404ccdbc6abbf1277e887a Mon Sep 17 00:00:00 2001 From: HH Date: Sun, 24 Apr 2022 18:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E8=B4=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pay/WxPayController.java | 12 ++++++------ .../com/ghy/common/adapay/AdapayService.java | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) 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 0d43ce6c..f233998e 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 @@ -31,10 +31,10 @@ public class WxPayController extends BaseController { * &redirect_uri=http%3A%2F%2Fwww.opsoul.com%2Fpay%2Fwx%2Fpub * &response_type=code * &scope=snsapi_userinfo&state=STATE&connect_redirect=1#wechat_redirect - * */ + */ @GetMapping("/pub") @ResponseBody - public AjaxResult pubPay(HttpServletRequest request){ + public AjaxResult pubPay(HttpServletRequest request) { String code = request.getParameter("code"); logger.info("code is " + code); //测试时前端不带订单号. @@ -47,14 +47,14 @@ public class WxPayController extends BaseController { //调用adapay微信公众号支付. WxLiteExpend expend = new WxLiteExpend(); expend.setOpen_id(openId); - Map map = adapayService.wxPubPay(new WxPubPayCallBack(), expend, "wxPay123456" + Math.ceil(Math.random()*100), "1.00", - "测试商品", "测试商品detail", "description"); + Map map = adapayService.wxPubPay(new WxPubPayCallBack(), expend, "wxPay123456" + Math.ceil(Math.random() * 100), "1.00", + "测试商品", "测试商品detail", null, "description"); //拼接消息给前端.前端通过JSAPI调用微信支付 - map.forEach((key,value)->{ + map.forEach((key, value) -> { logger.info("key is " + key + ", value is " + value); }); return AjaxResult.success(map); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); logger.error(ExceptionUtil.getExceptionMessage(e)); } diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java index 20bae8d8..fa82492d 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java @@ -68,24 +68,24 @@ public class AdapayService { * 支付宝正扫支付 */ public Map alipayQrPay(PayCallback callback, WxLiteExpend expend, String orderNo, String payAmt, - String goodsTittle, String goodsDesc, String description) throws BaseAdaPayException { - return pay(callback, PayChannelEnum.ALIPAY_QR.getCode(), expend, orderNo, payAmt, goodsTittle, goodsDesc, description); + String goodsTittle, String goodsDesc, String divMembers, String description) throws BaseAdaPayException { + return pay(callback, PayChannelEnum.ALIPAY_QR.getCode(), expend, orderNo, payAmt, goodsTittle, goodsDesc, divMembers, description); } /** * 微信小程序支付 */ public Map wxPubPay(PayCallback callback, WxLiteExpend expend, String orderNo, String payAmt, - String goodsTittle, String goodsDesc, String description) throws BaseAdaPayException { - return pay(callback, PayChannelEnum.WX_PUB.getCode(), expend, orderNo, payAmt, goodsTittle, goodsDesc, description); + String goodsTittle, String goodsDesc, String divMembers, String description) throws BaseAdaPayException { + return pay(callback, PayChannelEnum.WX_PUB.getCode(), expend, orderNo, payAmt, goodsTittle, goodsDesc, divMembers, description); } /** * 微信小程序支付 */ public Map wxLitePay(PayCallback callback, WxLiteExpend expend, String orderNo, String payAmt, - String goodsTittle, String goodsDesc, String description) throws BaseAdaPayException { - return pay(callback, PayChannelEnum.WX_LITE.getCode(), expend, orderNo, payAmt, goodsTittle, goodsDesc, description); + String goodsTittle, String goodsDesc, String divMembers, String description) throws BaseAdaPayException { + return pay(callback, PayChannelEnum.WX_LITE.getCode(), expend, orderNo, payAmt, goodsTittle, goodsDesc, divMembers, description); } /** @@ -96,11 +96,12 @@ public class AdapayService { * @param goodsDesc [必填项]商品描述信息，微信小程序和微信公众号该字段最大长度42个字符 * @param payChannel [必填项]支付渠道，详见 https://docs.adapay.tech/api/appendix.html#id2 * @param expend 支付渠道额外参数，条件可输入，详见 https://docs.adapay.tech/api/appendix.html#expend + * @param divMembers 分账对象信息列表，最多仅支持7个分账方，json 数组形式，详见 https://docs.adapay.tech/api/appendix.html#divmembers * @param description 订单附加说明 * @return 同步返回一个 支付对象，详见 https://docs.adapay.tech/api/trade.html#id2 */ public Map pay(PayCallback callback, String payChannel, Expend expend, String orderNo, String payAmt, - String goodsTittle, String goodsDesc, String description) throws BaseAdaPayException { + String goodsTittle, String goodsDesc, String divMembers, String description) throws BaseAdaPayException { Map paymentParams = new HashMap<>(16); paymentParams.put("app_id", adapayProperties.getAppId()); paymentParams.put("notify_url", adapayProperties.getNotifyUrl()); @@ -109,11 +110,12 @@ public class AdapayService { paymentParams.put("pay_amt", payAmt); paymentParams.put("goods_title", goodsTittle); paymentParams.put("goods_desc", goodsDesc); + paymentParams.put("div_members", divMembers); paymentParams.put("description", description); paymentParams.put("expend", expend); PayReplyMapping.putCallback(orderNo, callback); - paymentParams.forEach((key,value)->{ + paymentParams.forEach((key, value) -> { logger.info("key is " + key + ", value is " + value); }); return Payment.create(paymentParams);