diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index 908bdfcf1..1e86b608a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -301,7 +301,7 @@ public interface OrderBasicInfoService{ * @param dto * @return */ - Map generateOrderForLianLian(QueryStartChargeDTO dto); + Map generateOrderForThirdParty(QueryStartChargeDTO dto); List queryOrderAmountDetail(List orderCodes); 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 86f677269..c3d2f9d88 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 @@ -25,6 +25,7 @@ import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.adapay.MerchantDelayModeEnum; +import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; @@ -2479,8 +2480,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { * @return */ @Override - public Map generateOrderForLianLian(QueryStartChargeDTO dto) { - // 联联平台生成订单 + public Map generateOrderForThirdParty(QueryStartChargeDTO dto) { + // 获取到第三方平台类型 + String operatorId = dto.getOperatorId(); + String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(operatorId); + // 生成订单 String orderCode = dto.getStartChargeSeq(); String pileConnectorCode = dto.getConnectorID(); String pileSn = StringUtils.substring(pileConnectorCode, 0, 14); @@ -2514,6 +2518,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .pileConnectorCode(pileConnectorCode) // .logicCard(pileAuthCardInfo.getLogicCard()) // 卡号 .startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) // 启动方式 + .thirdPartyType(type) // 第三方平台类型 .payStatus(Constants.ONE) .payAmount(dto.getAccountBalance()) // 支付金额 .payTime(new Date()) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 0e3a59cf4..2620c5760 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -650,7 +650,7 @@ public class LianLianServiceImpl implements LianLianService { return null; } // 生成订单 - Map map = orderBasicInfoService.generateOrderForLianLian(dto); + Map map = orderBasicInfoService.generateOrderForThirdParty(dto); String orderCode = (String) map.get("orderCode"); String transactionCode = (String) map.get("transactionCode"); OrderBasicInfo orderBasicInfo = (OrderBasicInfo) map.get("orderBasicInfo");