From 82de8f7cdea3bb5e0aee59fe2f2b2298e252f3f9 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 10 Jul 2023 15:08:36 +0800 Subject: [PATCH] update --- .../jsowell/common/constant/Constants.java | 3 +++ .../impl/OrderBasicInfoServiceImpl.java | 23 +++++-------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index 53e4c80c4..ac8df4293 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -231,4 +231,7 @@ public class Constants { // 汇付企业用户前缀 public static final String ADAPAY_CORP_MEMBER_PREFIX = "ACM"; + + // 汇付延时分账支付模式 + public static final String ADAPAY_PAY_MODE_DELAY = "delay"; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index faf0ccaef..99ec6b2ad 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2296,6 +2296,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 封装对象 String amount = AdapayUtil.formatAmount(dto.getPayAmount()); // 用户支付金额 + String payMode = Constants.ADAPAY_PAY_MODE_DELAY; // 汇付延时分账 CreateAdaPaymentParam createAdaPaymentParam = new CreateAdaPaymentParam(); createAdaPaymentParam.setOrder_no(orderInfo.getOrderCode()); createAdaPaymentParam.setPay_amt(amount); @@ -2306,38 +2307,26 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { Map map = Maps.newHashMap(); map.put("type", ScenarioEnum.ORDER.getValue()); map.put("orderCode", dto.getOrderCode()); + map.put("payMode", payMode); createAdaPaymentParam.setDescription(JSON.toJSONString(map)); // 异步通知地址，url为http/https路径，服务器POST回调，URL 上请勿附带参数 createAdaPaymentParam.setNotify_url(ADAPAY_CALLBACK_URL); createAdaPaymentParam.setExpend(JSONObject.toJSONString(ImmutableMap.of("open_id", openId))); - // 分账对象信息 - // String adapayMemberId = adapayMemberAccountService.selectAdapayMemberIdByStationId(orderInfo.getStationId()); - // if (StringUtils.isNotBlank(adapayMemberId)) { - // JSONObject jsonObject = new JSONObject(); - // jsonObject.put("member_id", adapayMemberId); - // jsonObject.put("amount", amount); - // jsonObject.put("fee_flag", Constants.Y); - // - // // 分账对象信息列表，最多仅支持7个分账方，json 数组形式 - // JSONArray jsonArray = new JSONArray(); - // jsonArray.add(jsonObject); - // createAdaPaymentParam.setDiv_members(jsonArray.toString()); - // } - // 延时分账 - createAdaPaymentParam.setPay_mode("delay"); + createAdaPaymentParam.setPay_mode(payMode); try { logger.info("创建汇付支付参数:{}", JSONObject.toJSONString(createAdaPaymentParam)); Map response = Payment.create(BeanMap.create(createAdaPaymentParam)); if (response != null && !response.isEmpty()) { JSONObject expend = JSONObject.parseObject(response.get("expend").toString()); JSONObject pay_info = expend.getJSONObject("pay_info"); - Map resultMap = JSONObject.parseObject(pay_info.toJSONString(), new TypeReference>() { - }); + Map resultMap = JSONObject.parseObject(pay_info.toJSONString(), new TypeReference>() {}); if (resultMap != null) { // 表示已经获取到支付参数了，后续再有支付请求就拒绝 redisCache.setCacheObject(redisKey, resultMap, 15, TimeUnit.MINUTES); + + // 设置订单号的 } return resultMap; }