diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 213e247d4..ef3abcd7f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -350,8 +350,8 @@ public class PayController extends BaseController { public void adapayCallback(HttpServletRequest request) { try { orderService.adapayCallback(request); - // String type = request.getParameter("type"); - // logger.info("汇付回调type:{}", type); + String type = request.getParameter("type"); + logger.info("汇付回调type:{}", type); } catch (Exception e) { logger.error("汇付支付回调失败 error", e); } 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 f541e2f77..ed66fea6f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -26,6 +26,7 @@ import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.InvoiceRecordEnum; import com.jsowell.common.enums.MemberWalletEnum; +import com.jsowell.common.enums.adapay.AdapayEventEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.AdapayUtil; @@ -1325,10 +1326,17 @@ public class OrderService { return; } - if (StringUtils.equals("payment.succeeded", type)) { + if (StringUtils.equals(AdapayEventEnum.payment_succeeded.getValue(), type)) { paymentSucceeded(data); } + // switch (type) { + // case AdapayEventEnum.payment_succeeded.getValue(): + // + // } + + + } private void paymentSucceeded(String data) throws JsonProcessingException { 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 38bf1bb15..330147733 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 @@ -2145,22 +2145,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 微信支付 dto.setOrderBasicInfo(orderInfo); - Map weixinMap = null; + Map weixinMap = adapayPayOrder(dto); // 从字典中获取使用汇付支付的站点 - List adapay_station = DictUtils.getDictCache("adapay_station"); - List stationIdList = Lists.newArrayList(); - if (CollectionUtils.isNotEmpty(adapay_station)) { - for (SysDictData sysDictData : adapay_station) { - stationIdList.add(sysDictData.getDictValue()); - } - } - if (stationIdList.contains(orderInfo.getStationId())) { - logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); - weixinMap = adapayPayOrder(dto); - } else { - logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); - weixinMap = wechatPayOrder(dto); - } + // List adapay_station = DictUtils.getDictCache("adapay_station"); + // List stationIdList = Lists.newArrayList(); + // if (CollectionUtils.isNotEmpty(adapay_station)) { + // for (SysDictData sysDictData : adapay_station) { + // stationIdList.add(sysDictData.getDictValue()); + // } + // } + // if (stationIdList.contains(orderInfo.getStationId())) { + // logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId()); + // weixinMap = adapayPayOrder(dto); + // } else { + // logger.info("该站点:{}使用微信支付", orderInfo.getStationId()); + // weixinMap = wechatPayOrder(dto); + // } // 返回微信支付参数 resultMap.put("weixinMap", weixinMap);