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 0b81b6aa7..54e203752 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 @@ -14,6 +14,7 @@ import com.jsowell.adapay.response.*; import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.vo.OrderSettleResult; import com.jsowell.adapay.vo.PaymentInfo; +import com.jsowell.common.UserAgentUtils; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; @@ -23,6 +24,7 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.AcquirerEnum; import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.MemberWalletEnum; +import com.jsowell.common.enums.adapay.AdapayPayChannelEnum; import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.adapay.MerchantDelayModeEnum; import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum; @@ -3487,7 +3489,14 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (StringUtils.isNotBlank(dto.getAppId())) { // 校验启动桩使用的小程序,和充电桩所属一级运营商是否一致 - String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(dto.getAppId()); + String merchantIdByAppId = ""; + if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.ALIPAY_LITE.getValue())) { + // 支付宝小程序 + merchantIdByAppId = pileMerchantInfoService.getDelayModeByAlipayAppId(dto.getAppId()); + }else { + // 微信小程序 + merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(dto.getAppId()); + } String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index ae87098e5..8de649ec7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -123,10 +123,10 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { dto.setGoodsTitle(goodsTitle); dto.setGoodsDesc(goodsDesc); dto.setType(ScenarioEnum.ORDER.getValue()); - Map weixinMap = onlinePaymentOrderForWechat(dto); + Map aliMap = onlinePaymentOrderForAlipay(dto); - // 返回微信支付参数 - resultMap.put("alipayMap", weixinMap); + // 返回支付宝支付参数 + resultMap.put("alipayMap", aliMap); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付 // 白名单支付可以直接调支付回调方法 dto.setPayAmount(Constants.WHITELIST_DEFAULT_AMOUNT);