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 c7b4ca341..6ae0658a2 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.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.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; @@ -246,7 +247,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (StringUtils.isNotBlank(chargeStartTime) && StringUtils.isNotBlank(chargeEndTime)) { orderListVO.setChargingTime(DateUtils.getDatePoor(DateUtils.parseDate(chargeEndTime), DateUtils.parseDate(chargeStartTime))); } - + String thirdPartyType = orderListVO.getThirdPartyType(); + if(StringUtils.isNotBlank(thirdPartyType)) { + String label = ThirdPlatformTypeEnum.getLabelByCode(thirdPartyType); + orderListVO.setThirdPartyType(label + "启动"); + } } batchQueryFeeAmt(orderListVOS); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index c011d6a3b..a87d6a62e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -112,11 +112,17 @@ public class OrderListVO { private String vinCode; /** - * 启动方式(0-后管启动;1-用户app启动) + * 启动方式(0-后管启动;1-用户app启动;2-卡启动;3-离线卡启动; 4-第三方平台启动; 5-车辆vin码启动) */ @Excel(name = "启动方式", dictType = "start_mode") private String startMode; + /** + * 第三方平台类型 + */ + @Excel(name = "第三方平台类型", dictType = "third_party_type") + private String thirdPartyType; + /** * 支付方式(1-余额支付;3-白名单支付;4-微信支付;5-支付宝支付) */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 7fac0f361..f21a56d54 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1629,6 +1629,7 @@ t1.vin_code as vinCode, t1.plate_number as plateNumber, t1.start_mode as startMode, + t1.third_party_type as thirdPartyType, t1.pay_mode as payMode, t1.pay_status as payStatus, t1.pay_amount as payAmount,