diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 22fcf34d4..370f69258 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1,7 +1,6 @@ package com.jsowell.service; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -41,8 +40,8 @@ import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; -import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.uniapp.InvoiceRecordVO; +import com.jsowell.pile.vo.uniapp.*; import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.dto.WeChatRefundDTO; import com.jsowell.wxpay.response.WechatPayNotifyParameter; @@ -293,18 +292,21 @@ public class OrderService { 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); + // 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()); + // } - // 分账对象信息列表,最多仅支持7个分账方,json 数组形式 - JSONArray jsonArray = new JSONArray(); - jsonArray.add(jsonObject); - createAdaPaymentParam.setDiv_members(jsonArray.toString()); - } + // 延迟分账 + createAdaPaymentParam.setPay_mode("delay"); try { log.info("创建汇付支付参数:{}", JSONObject.toJSONString(createAdaPaymentParam)); Map response = Payment.create(BeanMap.create(createAdaPaymentParam)); diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index f668b4f7e..b7ca74dd3 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -176,7 +176,7 @@ public class SpringBootTestController { // String filePath = JsowellConfig.getUploadPath(); // System.out.println(filePath); - String s = "ACM88202036"; + String s = "ACM88033859"; try { AdapayMemberInfoVO adapayMemberInfoVO = adapayMemberService.queryCorpAdapayMemberInfo(s); System.out.println(adapayMemberInfoVO);