mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-11 18:59:51 +08:00
订单列表页新增 第三方平台类型字段
This commit is contained in:
@@ -25,6 +25,7 @@ import com.jsowell.common.enums.MemberWalletEnum;
|
|||||||
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
|
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
|
||||||
import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
|
import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
|
||||||
import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum;
|
import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum;
|
||||||
|
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
|
||||||
import com.jsowell.common.enums.ykc.*;
|
import com.jsowell.common.enums.ykc.*;
|
||||||
import com.jsowell.common.exception.BusinessException;
|
import com.jsowell.common.exception.BusinessException;
|
||||||
import com.jsowell.common.util.DateUtils;
|
import com.jsowell.common.util.DateUtils;
|
||||||
@@ -246,7 +247,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
if (StringUtils.isNotBlank(chargeStartTime) && StringUtils.isNotBlank(chargeEndTime)) {
|
if (StringUtils.isNotBlank(chargeStartTime) && StringUtils.isNotBlank(chargeEndTime)) {
|
||||||
orderListVO.setChargingTime(DateUtils.getDatePoor(DateUtils.parseDate(chargeEndTime), DateUtils.parseDate(chargeStartTime)));
|
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);
|
batchQueryFeeAmt(orderListVOS);
|
||||||
|
|||||||
@@ -112,11 +112,17 @@ public class OrderListVO {
|
|||||||
private String vinCode;
|
private String vinCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 启动方式(0-后管启动;1-用户app启动)
|
* 启动方式(0-后管启动;1-用户app启动;2-卡启动;3-离线卡启动; 4-第三方平台启动; 5-车辆vin码启动)
|
||||||
*/
|
*/
|
||||||
@Excel(name = "启动方式", dictType = "start_mode")
|
@Excel(name = "启动方式", dictType = "start_mode")
|
||||||
private String startMode;
|
private String startMode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 第三方平台类型
|
||||||
|
*/
|
||||||
|
@Excel(name = "第三方平台类型", dictType = "third_party_type")
|
||||||
|
private String thirdPartyType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付方式(1-余额支付;3-白名单支付;4-微信支付;5-支付宝支付)
|
* 支付方式(1-余额支付;3-白名单支付;4-微信支付;5-支付宝支付)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1629,6 +1629,7 @@
|
|||||||
t1.vin_code as vinCode,
|
t1.vin_code as vinCode,
|
||||||
t1.plate_number as plateNumber,
|
t1.plate_number as plateNumber,
|
||||||
t1.start_mode as startMode,
|
t1.start_mode as startMode,
|
||||||
|
t1.third_party_type as thirdPartyType,
|
||||||
t1.pay_mode as payMode,
|
t1.pay_mode as payMode,
|
||||||
t1.pay_status as payStatus,
|
t1.pay_status as payStatus,
|
||||||
t1.pay_amount as payAmount,
|
t1.pay_amount as payAmount,
|
||||||
|
|||||||
Reference in New Issue
Block a user