diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java index f1a1b0112..586e0dcab 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java @@ -350,9 +350,8 @@ public class PayController extends BaseController { @PostMapping("/adapayCallback") public RestApiResponse adapayCallback(HttpServletRequest request) { try { - orderService.adapayCallback(request); - // String type = request.getParameter("type"); logger.info("1汇付回调type:{}", request.getParameter("type")); + orderService.adapayCallback(request); } catch (Exception e) { logger.error("1汇付支付回调失败 error", e); } 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 10e972929..1c49f00f0 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 @@ -3880,7 +3880,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { orderRefundInfoList.add(refundInfo); } } - } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) { + } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode()) + || OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue().equals(orderBasicInfo.getPayMode())) { // 新逻辑 String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId()); AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index cd9a003b8..7aa994ef7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -780,7 +780,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { // 获取充电站枪口列表 List connectorList = getUniAppConnectorList(stationId); Map pileTypeNum = getPileTypeNum(connectorList); - log.info("根据站点id:{}, 查询快、慢充设备数量:{}", stationId, pileTypeNum); + // log.info("根据站点id:{}, 查询快、慢充设备数量:{}", stationId, pileTypeNum); return pileTypeNum; }