Skip to content

C
clx-performance
提交 9d86c241 authored 作者: aiqingguo's avatar aiqingguo
浏览文件
操作

Merge branch 'master' into v5.5_driver_report_20231015

上级 b471e910 8ad9468c
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 3464 行增加 和 61 行删除
performance-api/src/main/java/com/clx/performance/common/MqDelay.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.common;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* @Author: aiqingguo
* @Description:
* @Date: 2023-10-12 14:00:14
* @Version: 1.0
*/
@Setter
@Getter
@NoArgsConstructor
public class MqDelay<T> {
private String exchange;
private String routerKey;
private T data;
public MqDelay(String exchange, String routerKey, T data) {
this.exchange = exchange;
this.routerKey = routerKey;
this.data = data;
}
}
performance-api/src/main/java/com/clx/performance/common/MqWrapper.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.common;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* @Author: aiqingguo
* @Description:
* @Date: 2023-10-12 11:59:33
* @Version: 1.0
*/
@Getter
@Setter
@NoArgsConstructor
public class MqWrapper<T> {
private T data;
private String exchange; //交换机
private String routeKey; //路由键
private String createTime; //创建时间
public MqWrapper(T data) {
this.data = data;
this.createTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now());
}
public MqWrapper(T data, String exchange, String routeKey) {
this.data = data;
this.exchange = exchange;
this.routeKey = routeKey;
this.createTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now());
}
}
performance-api/src/main/java/com/clx/performance/data/OrderChildData.java deleted 100644 → 0
浏览文件 @ b471e910
package com.clx.performance.data;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OrderChildData {
@ApiModelProperty(value = "运单编号", example = "100000000")
private String childNo;
@ApiModelProperty(value = "运费单价(分)", example = "1.23")
private BigDecimal freightPrice;
@ApiModelProperty(value = "车牌号", example = "京A12345")
private String truckNo;
@ApiModelProperty(value="司机姓名",example = "张安")
private String driverName;
@ApiModelProperty(value="司机手机号",example = "12222222222")
private String driverMobile;
@ApiModelProperty("运单状态：10：已接单 30：前往货源地 40：到达货源地 50：装货成功 60：前往目的地 70：到达目的地 80：收货待确认")
private Integer status;
@ApiModelProperty(value="接单时间",example = "2020-01-01 10:10:10")
private String payTime;
@ApiModelProperty(value="装车时间",example = "2020-01-01 10:10:10")
private String loadTime;
@ApiModelProperty(value="装货净重",example = "10")
private BigDecimal loadNet;
@ApiModelProperty(value="卸车时间",example = "2020-01-01 10:10:10")
private String unloadTime;
@ApiModelProperty(value="卸货净重",example = "41")
private BigDecimal unloadNet;
}
performance-api/src/main/java/com/clx/performance/enums/DriverTruckEnum.java
浏览文件 @ 9d86c241
...@@ -6,9 +6,7 @@ import lombok.Getter; ...@@ -6,9 +6,7 @@ import lombok.Getter;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
@Getter
@AllArgsConstructor
@SuppressWarnings("all")
public enum DriverTruckEnum { public enum DriverTruckEnum {
; ;
@Getter @Getter
......
performance-api/src/main/java/com/clx/performance/enums/IdTypeEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
@SuppressWarnings("all")
public enum IdTypeEnum {
;
@Getter
@AllArgsConstructor
public enum Type {
TOP_UP(1L, "充值"),
CASE_OUT(2L, "提现"),
CASE_OUT_FROZEN(3L, "提现冻结"),
CASE_OUT_SUCCESS(4L, "提现成功"),
TOP_UP_SUCCESS(5L, "充值成功"),
FROZEN(6L, "冻结"),
THAW(7L, "解冻")
;
private final Long code;
private final String msg;
}
}
performance-api/src/main/java/com/clx/performance/enums/OwnerAccountEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Optional;
@Getter
@AllArgsConstructor
@SuppressWarnings("all")
public enum OwnerAccountEnum {
;
@Getter
@AllArgsConstructor
public enum AccountTypeStatus {
MARGIN_ACCOUNT(1, "保证金账户"),
PREPAID_FREIGHT_ACCOUNT(2, "预付运费账户")
;
private final Integer code;
private final String msg;
public static Optional<OwnerAccountEnum.AccountTypeStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
}
public Integer getCode() {
return this.code;
}
public String getMsg() {
return this.msg;
}
}
@Getter
@AllArgsConstructor
public enum TopUpStatus {
PENDING(10, "待审批"),
APPROVAL_REJECTION(20, "审批拒绝"),
APPROVAL_APPROVE(30, "审批通过"),
;
private final Integer code;
private final String msg;
}
@Getter
@AllArgsConstructor
public enum CaseOutStatus {
PENDING_PAYMENT(10, "待付款"),
TO_BE_CONFIRMED(20, "待货主确认"),
PAID(30, "已付款"),
;
private final Integer code;
private final String msg;
}
@Getter
@AllArgsConstructor
public enum RunningWaterStatus {
TOP_UP(10, "充值"),
FROZEN(20, "冻结"),
THAW(30, "解冻"),
CASE_OUT_FROZEN(40, "提现冻结"),
CASE_OUT_SUCCESS(50, "提现成功"),
TAKE_OUT(60, "扣除"),
CASE_OUT_FAIL(70, "提现失败"),
;
private final Integer code;
private final String msg;
public static Optional<OwnerAccountEnum.RunningWaterStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
}
public Integer getCode() {
return this.code;
}
public String getMsg() {
return this.msg;
}
}
}
performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
浏览文件 @ 9d86c241
...@@ -68,6 +68,14 @@ public enum PerformanceResultEnum implements ResultEnum { ...@@ -68,6 +68,14 @@ public enum PerformanceResultEnum implements ResultEnum {
ORDER_GOODS_ID_GENERATE_LOCK(1384, "货单编号ID获取锁出问题"), ORDER_GOODS_ID_GENERATE_LOCK(1384, "货单编号ID获取锁出问题"),
INTEGRAL_TRUCK_DRIVER_EXIST(1400, "车辆已添加"),
INTEGRAL_ORDER_EXIST(1401, "货单已添加"),
INTEGRAL_ORDER_NO_EXIST(1402, "货单不存在"),
INTEGRAL_TRUCK_NO_EXIST(1403, "车辆不存在"),
SETTLEMENT_ORDER_STATUS_CHANGED(1401, "结算单状态已变更，请重新刷新页面"),
SETTLEMENT_NO_FOUND(1401, "结算单不存在"),
MONEY_NO_SAME(1501, "货主提现金额和平台支付金额不一致"),
; ;
private final int code; private final int code;
......
performance-api/src/main/java/com/clx/performance/enums/RunningWaterTypeEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
@SuppressWarnings("all")
public enum RunningWaterTypeEnum {
;
@Getter
@AllArgsConstructor
public enum Status {
TOP_UP(10, "充值"),
FROZEN(20, "冻结"),
THAW(30, "解冻"),
TAKE_OUT(40, "扣除"),
CASE_OUT_FROZEN(50, "提现冻结"),
CASE_OUT_SUCCESS(60, "提现成功"),
CASE_OUT_FAIL(70, "提现失败")
;
private final Integer code;
private final String msg;
}
}
performance-api/src/main/java/com/clx/performance/enums/TruckDemandEnum.java
浏览文件 @ 9d86c241
...@@ -6,9 +6,6 @@ import lombok.Getter; ...@@ -6,9 +6,6 @@ import lombok.Getter;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
@Getter
@AllArgsConstructor
@SuppressWarnings("all")
public enum TruckDemandEnum { public enum TruckDemandEnum {
; ;
@Getter @Getter
......
performance-api/src/main/java/com/clx/performance/enums/settle/SettlementDriverEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums.settle;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
public enum SettlementDriverEnum {
;
@Getter
@AllArgsConstructor
public enum InvoiceType {
ONLINE(1, "网运单"),
ORDINARY(2, "普通单");
private final Integer code;
private final String msg;
public static Optional<InvoiceType> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(InvoiceType::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum Status {
WAIT_SETTLEMENT(1, "待结算"),
SETTLED(2, "已结算"),
;
private final Integer code;
private final String msg;
public static Optional<Status> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(Status::getMsg).orElse(null);
}
}
}
performance-api/src/main/java/com/clx/performance/enums/settle/SettlementLogEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums.settle;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
public enum SettlementLogEnum {
;
@Getter
@AllArgsConstructor
public enum Type {
CREATE_SETTLEMENT(1, "创建结算单"),
UPLOAD_SETTLEMENT (2, "上传结算凭证"),
OWNER_TO_BE_CONFIRMED(3, "货主确认结算单"),
SHIPPER_TO_PAYMENT(4, "货主付款"),
PLATFORM_CONFIRMED_OWNER_PAYMENT(5, "平台确认付款"),
PLATFORM_TO_PAYMENT(6, "平台付款"),
OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "货主确认付款"),
INVOICE_TO_BE_MAILED(8, "邮寄发票"),
COMPLETED(9, "已完结"),
;
private final Integer code;
private final String msg;
public static Optional<Type> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(Type::getMsg).orElse(null);
}
}
}
performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerDetailEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums.settle;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
public enum SettlementOwnerDetailEnum {
;
@Getter
@AllArgsConstructor
public enum InvoiceStatus {
NO(0, "否"),
YES(1, "是"),
NO_INVOICE(2,"无需开票"),
;
private final Integer code;
private final String msg;
public static Optional<InvoiceStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(InvoiceStatus::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum FinalPaymentStatus {
NO(0, "否"),
YES(1, "是"),
NO_REQUIRE(2,"无需支付")
;
private final Integer code;
private final String msg;
public static Optional<FinalPaymentStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(FinalPaymentStatus::getMsg).orElse(null);
}
}
}
performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums.settle;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
public enum SettlementOwnerEnum {
;
@Getter
@AllArgsConstructor
public enum InvoiceType {
ONLINE(1, "网运单"),
ORDINARY(2, "普通单");
private final Integer code;
private final String msg;
public static Optional<InvoiceType> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(InvoiceType::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum InvoiceStatus {
All_INVOICED(1, "已开票"),
PARTIAL_INVOICED(2, "部分开票"),
NO_NEED_INVOICE(3, "无需开票");
private final Integer code;
private final String msg;
public static Optional<InvoiceStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(InvoiceStatus::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum Status {
TO_BE_LOCKED(10, "待锁定"),
TO_BE_ACCOUNT(20, "待对账"),
OWNER_TO_BE_CONFIRMED(30, "待货主确认"),
SHIPPER_TO_PAYMENT (40, "待货主付款"),
PLATFORM_CONFIRMED_OWNER_PAYMENT(50, "待平台确认付款"),
PLATFORM_TO_PAYMENT(60, "待平台付款"),
OWNER_CONFIRMED_PLATFORM_PAYMENT(70, "待货主确认付款"),
INVOICE_TO_BE_MAILED(80, "待邮寄发票"),
COMPLETED(90, "已完结"),
;
private final Integer code;
private final String msg;
public static Optional<Status> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(Status::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum MergeStatus {
NO(0, "否"),
YES(1, "是"),
;
private final Integer code;
private final String msg;
public static Optional<MergeStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(MergeStatus::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum SettlementPeriodType {
IMMEDIATE(1, "拉运完成结算"),
MONTH(2, "月结"),
;
private final int code;
private final String name;
public static Optional<SettlementPeriodType> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
}
}
performance-api/src/main/java/com/clx/performance/enums/settle/SettlementPlatformEnum.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.enums.settle;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
public enum SettlementPlatformEnum {
;
@Getter
@AllArgsConstructor
public enum Platform {
MSL(1, "马上来"),
WY(2, "网运平台");
private final Integer code;
private final String msg;
public static Optional<Platform> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(Platform::getMsg).orElse(null);
}
}
}
performance-api/src/main/java/com/clx/performance/feign/IntegralTruckFeign.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.feign;
import com.clx.performance.param.pc.IntegralTruckAddParam;
import com.msl.common.result.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = "clx-performance")
public interface IntegralTruckFeign {
@ApiOperation(value = "新增车辆")
@PostMapping("clx-performance/feign/integral/saveTruck")
Result<Void> saveTruck(@RequestBody @Validated IntegralTruckAddParam param);
}
performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
浏览文件 @ 9d86c241
package com.clx.performance.feign; package com.clx.performance.feign;
import com.clx.performance.param.pc.owner.FrozenAccountParam;
import com.clx.performance.param.pc.owner.ThawAccountParam;
import com.clx.performance.param.pc.owner.UpdateStatusParam;
import com.clx.performance.vo.feign.OrderGoodsFeignVO; import com.clx.performance.vo.feign.OrderGoodsFeignVO;
import com.msl.common.result.Result; import com.msl.common.result.Result;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import java.util.Set;
@FeignClient(name = "clx-performance") @FeignClient(name = "clx-performance")
public interface PerformanceFeign { public interface PerformanceFeign {
...@@ -18,6 +25,7 @@ public interface PerformanceFeign { ...@@ -18,6 +25,7 @@ public interface PerformanceFeign {
* @param orderGoodsNo * @param orderGoodsNo
* @return * @return
*/ */
@Deprecated
@GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getTrucksByOrderGoodsNo"}) @GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getTrucksByOrderGoodsNo"})
Result<List<Integer>> getTrucksByOrderGoodsNo(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo); Result<List<Integer>> getTrucksByOrderGoodsNo(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo);
...@@ -27,4 +35,31 @@ public interface PerformanceFeign { ...@@ -27,4 +35,31 @@ public interface PerformanceFeign {
@GetMapping(value = {"clx-performance/feign/orderGoods/getOrderGoodsListByOrderNo"}) @GetMapping(value = {"clx-performance/feign/orderGoods/getOrderGoodsListByOrderNo"})
List<OrderGoodsFeignVO> getOrderGoodsListByOrderNo(@RequestParam String orderNo); List<OrderGoodsFeignVO> getOrderGoodsListByOrderNo(@RequestParam String orderNo);
/**
* 公开货源调用
*
* @return
*/
@GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getPublicTruckList"})
Result<Set<String>> getPublicTruckList();
/**
* 定向货源调用
*
* @param orderGoodsNo、
* @param userNo
* @return
*/
@GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getPrivateTruckList"})
Result<List<String>> getPrivateTruckList(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo,
@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo);
@PostMapping(value = {"clx-performance/feign/owner/ownerAccountFrozen"})
Result<Object> ownerAccountFrozen(@RequestBody FrozenAccountParam param);
@PostMapping(value = {"clx-performance/feign/owner/ownerAccountThaw"})
Result<Object> ownerAccountThaw(@RequestBody ThawAccountParam param);
@PostMapping(value = {"clx-performance/pc/carrier/settlementOwner/updateStatusByOrderNo"})
Result<Object> updateStatusByOrderNo(@RequestBody UpdateStatusParam param);
} }
performance-api/src/main/java/com/clx/performance/param/mq/IntegralNextWeekTruckInitMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 下周车辆初始化
* @Date: 2023-7-26 14:39:49
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralNextWeekTruckInitMqParam {
private String statisticsDate; //统计时间
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralOrderAddMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 积分货单新增
* @Date: 2023-10-13 11:02:01
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralOrderAddMqParam {
@ApiModelProperty(value = "货单编号", example = "1000000000000")
private String orderGoodsNo;
@ApiModelProperty(value = "发货地址id", example = "1")
private Integer sendAddressId;
@ApiModelProperty(value = "发货地址", example = "北京")
private String sendAddress;
@ApiModelProperty(value = "收货地址id", example = "2")
private Integer receiveAddressId;
@ApiModelProperty(value = "收货地址", example = "上海")
private String receiveAddress;
@ApiModelProperty(value = "货单类型：1优质单 2普通单 3流水单 4支援单", example = "上海")
private Integer orderType;
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralOrderChildFinishMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 运单结束
* @Date: 2023-10-11 17:30:05
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralOrderChildFinishMqParam {
private String childNo; //运单编号
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralRealTimeStatisticsMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 积分实时统计
* @Date: 2023-10-11 17:30:45
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralRealTimeStatisticsMqParam {
private String truckNo; //车辆
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralRecordAddMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 积分车辆新增
* @Date: 2023-10-11 17:30:57
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralRecordAddMqParam {
private Integer statisticsId; //统计id
private Integer type; //积分类型
private String truckNo; //车辆
private Integer integral; //积分
private String remark; //备注
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralTruckProtectionCancelMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 车辆保护取消
* @Date: 2023-10-11 17:27:45
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralTruckProtectionCancelMqParam {
private String statisticsDate; //统计时间
private String truckNo; //车辆
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralTuckAddMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 积分车辆新增
* @Date: 2023-10-11 17:27:32
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralTuckAddMqParam {
private String truckNo; //车牌号
private String driverName; //司机姓名
private String driverMobile; //司机手机号
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralWeekStatisticsMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 积分周统计
* @Date: 2023-10-11 17:32:41
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralWeekStatisticsMqParam {
private String statisticsDate; //统计时间
}
performance-api/src/main/java/com/clx/performance/param/mq/IntegralWeekTruckStatisticsMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 车辆周统计
* @Date: 2023-10-11 17:27:20
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralWeekTruckStatisticsMqParam {
private String statisticsDate; //统计时间
private String truckNo; //车辆
}
performance-api/src/main/java/com/clx/performance/param/open/OpenOwnerBindCardParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.open;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@ApiModel(description = "货主绑卡")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OpenOwnerBindCardParam {
@ApiModelProperty(value = "货主编号")
private Long userNo;
@ApiModelProperty(value = "货主姓名")
private String name;
@ApiModelProperty(value = "所属银行")
private String ownerAccountBank;
@ApiModelProperty(value = "开户行")
private String ownerOpenBank;
@ApiModelProperty(value = "户名")
private String ownerAccountName;
@ApiModelProperty(value = "银行账户")
private String ownerBankAccount;
}
performance-api/src/main/java/com/clx/performance/param/open/OpenOwnerCaseOutParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.open;
import com.msl.common.convertor.type.MoneyInConvert;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@ApiModel(description = "货主提现")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OpenOwnerCaseOutParam {
@ApiModelProperty(value = "货主用户编号", example = "123")
private Long ownerUserNo;
@ApiModelProperty(value = "提现金额（元）", example = "1.23")
@MoneyInConvert
private BigDecimal caseOutBalance;
@ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
private Integer accountType;
@ApiModelProperty(value = "提现银行", example = "浙江银行")
private String caseOutBank;
@ApiModelProperty(value = "提现银行卡号", example = "62213545878787")
private String caseOutBankNumber;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/param/open/OpenOwnerTopUpParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.open;
import com.msl.common.convertor.type.MoneyInConvert;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@ApiModel(description = "货主充值")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OpenOwnerTopUpParam {
@ApiModelProperty(value = "货主用户编号", example = "123")
private Long ownerUserNo;
@ApiModelProperty(value = "充值金额（元）", example = "1.23")
@MoneyInConvert
private BigDecimal topUpBalance;
@ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
private Integer accountType;
@ApiModelProperty(value = "打款银行", example = "浙江银行")
private String drawingBank;
@ApiModelProperty(value = "打款银行卡号", example = "62213545878787")
private String drawingBankNumber;
@ApiModelProperty(value = "打款凭证", example = "/a.png")
private String drawingProof;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/param/pc/GoodsOrderMapParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
/**
* @ClassName GoodsOrderMapParam
* @Description
* @Author kavin
* @Date 2023/10/10 10:00
* @Version 1.0
*/
@Getter
@Setter
@Builder
public class GoodsOrderMapParam {
@NotBlank(message = "创建开始时间不能为空")
@ApiModelProperty(value = "创建开始时间", example = "2023-09-30 09:56:29", dataType = "String")
private String beginCreateTime;
@NotBlank(message = "创建结束时间不能为空")
@ApiModelProperty(value = "创建结束时间", example = "2023-10-10 09:56:29", dataType = "String")
private String endCreateTime;
@NotBlank(message = "收货地址不能为空")
@ApiModelProperty(value = "收货地址", example = "黄羊城", dataType = "String")
private String receiveAddress;
@NotBlank(message = "货单状态不能为空")
@ApiModelProperty(value = "货单状态", example = "10：已挂单 20：挂单中 30：运输中 40：已完成 50：已取消 60：已完结 ", dataType = "String")
private String status;
}
performance-api/src/main/java/com/clx/performance/param/pc/IntegralOrderAddParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
public class IntegralOrderAddParam {
@ApiModelProperty(value = "货单编号", example = "100000000000")
@NotBlank(message = "车牌号不能为空")
private String orderGoodsNo;
@ApiModelProperty(value = "货单类型：1优质单 2普通单 3流水单 4支援单", example = "1")
@NotNull(message = "货单类型不能为空")
private Integer orderType;
@ApiModelProperty(value = "车辆梯队", example = "1")
@NotNull(message = "车辆梯队不能为空")
private Integer truckEchelon;
}
performance-api/src/main/java/com/clx/performance/param/pc/IntegralRecordAddParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Author: aiqingguo
* @Description: 新增积分
* @Date: 2023-10-11 17:30:57
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class IntegralRecordAddParam {
@ApiModelProperty(value = "车牌", example = "京A12345")
@NotBlank(message = "车牌号不能为空")
private String truckNo;
@ApiModelProperty(value = "积分", example = "1")
@NotNull(message = "积分不能为空")
private Integer integral;
@ApiModelProperty(value = "原因", example = "平台补偿")
@NotBlank(message = "原因不能为空")
private String remark;
}
performance-api/src/main/java/com/clx/performance/param/pc/IntegralTruckAddParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
public class IntegralTruckAddParam {
@ApiModelProperty(value = "车牌号", example = "京A12345")
@NotBlank(message = "车牌号不能为空")
private String truckNo;
@ApiModelProperty(value = "司机姓名", example = "张三")
@NotBlank(message = "司机姓名不能为空")
private String driverName;
@ApiModelProperty(value = "司机手机号", example = "13000000000")
@NotBlank(message = "司机手机号不能为空")
private String driverMobile;
}
performance-api/src/main/java/com/clx/order/params/OrderGoodsChildParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsChildParams.java
浏览文件 @ 9d86c241
package com.clx.order.params; package com.clx.performance.param.pc;
import com.msl.common.convertor.type.MoneyInConvert; import com.msl.common.convertor.type.MoneyInConvert;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/order/params/OrderGoodsParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsParams.java
浏览文件 @ 9d86c241
package com.clx.order.params; package com.clx.performance.param.pc;
import com.msl.common.convertor.field.Converted; import com.msl.common.convertor.field.Converted;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/performance/param/pc/OwnerBindCardParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@ApiModel(description = "货主绑卡")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OwnerBindCardParam {
@ApiModelProperty(value = "所属银行")
private String ownerAccountBank;
@ApiModelProperty(value = "开户行")
private String ownerOpenBank;
@ApiModelProperty(value = "户名")
private String ownerAccountName;
@ApiModelProperty(value = "银行账户")
private String ownerBankAccount;
}
performance-api/src/main/java/com/clx/performance/param/pc/OwnerCaseOutApproveParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.convertor.type.MoneyInConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@ApiModel(description = "提现审批")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OwnerCaseOutApproveParam {
@ApiModelProperty(value = "id", example = "1")
private Integer id;
@ApiModelProperty(value = "平台付款银行")
private String platformPaymentBank;
@ApiModelProperty(value = "平台付款银行账号")
private String platformPaymentBankNumber;
@ApiModelProperty(value = "付款凭证", example = "a.png")
private String paymentProof;
@ApiModelProperty(value = "平台付款金额", example = "11.21")
@MoneyInConvert
private BigDecimal platformPayBalance;
}
performance-api/src/main/java/com/clx/performance/param/pc/OwnerCaseOutParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.convertor.type.MoneyInConvert;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@ApiModel(description = "货主提现")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OwnerCaseOutParam {
@ApiModelProperty(value = "货主用户编号", example = "123")
private Long ownerUserNo;
@ApiModelProperty(value = "提现金额（元）", example = "1.23")
@MoneyInConvert
private BigDecimal caseOutBalance;
@ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
private Integer accountType;
@ApiModelProperty(value = "提现银行", example = "浙江银行")
private String ownerOpenBank;
@ApiModelProperty(value = "提现银行卡号", example = "62213545878787")
private String ownerBankAccount;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/param/pc/OwnerTopUpParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.convertor.type.MoneyInConvert;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@ApiModel(description = "货主充值")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OwnerTopUpParam {
@ApiModelProperty(value = "货主用户编号", example = "123")
private Long ownerUserNo;
@ApiModelProperty(value = "充值金额（元）", example = "1.23")
@MoneyInConvert
private BigDecimal topUpBalance;
@ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
private Integer accountType;
@ApiModelProperty(value = "打款银行", example = "浙江银行")
private String drawingBank;
@ApiModelProperty(value = "打款银行卡号", example = "62213545878787")
private String drawingBankNumber;
@ApiModelProperty(value = "打款凭证", example = "/a.png")
private String drawingProof;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/order/params/PageCarrierOrderListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderListParam.java
浏览文件 @ 9d86c241
package com.clx.order.params; package com.clx.performance.param.pc;
import com.msl.common.base.PageParam; import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/performance/param/pc/PageIntegralStatisticsParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class PageIntegralStatisticsParam extends PageParam {
@ApiModelProperty(value = "开始时间")
private String beginTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
}
performance-api/src/main/java/com/clx/performance/param/pc/PageIntegralTruckParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class PageIntegralTruckParam extends PageParam {
@ApiModelProperty(value = "车牌号", example = "京A12345")
private String truckNo;
@ApiModelProperty(value = "司机手机号码", example = "13000000000")
private String driverMobile;
@ApiModelProperty(value = "梯队：1第一梯队，2第二梯队", example = "1")
private Integer echelon;
@ApiModelProperty(value = "开始时间")
private String beginTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
}
performance-api/src/main/java/com/clx/performance/param/pc/PageIntegralTruckRankParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class PageIntegralTruckRankParam extends PageParam {
}
performance-api/src/main/java/com/clx/performance/param/pc/PageMonitorOrderChildQCParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class PageMonitorOrderChildQCParam extends PageParam {
@ApiModelProperty(value = "发货地址")
private String sendAddress;
@ApiModelProperty(value = "车牌号")
private String truckNo;
@NotNull(message = "运单状态不能为空")
@ApiModelProperty(value = "运单状态 10：已接单 20:支付 30：前往货源地 40：到达货源地 50：装货成功 60：前往目的地 70：到达目的地 80：收货待确认 90：待结算 100：完成 110:司机取消 111:承运取消 112:货主取消 ")
private List<Integer> status;
}
performance-api/src/main/java/com/clx/order/params/PageOrderGoodsListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageOrderGoodsListParam.java
浏览文件 @ 9d86c241
package com.clx.order.params; package com.clx.performance.param.pc;
import com.msl.common.base.PageParam; import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerAccountListParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class PageOwnerAccountListParam extends PageParam {
@ApiModelProperty(value = "货主编码")
private String ownerUserNo;
@ApiModelProperty(value = "联系电话")
private String mobile;
@ApiModelProperty(value = "账户类型 1：保证金 2：预付运费")
private Integer accountType;
}
performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerAccountRunningWaterParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author huyufan
* @create 2023-09-19 13:33
*/
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PageOwnerAccountRunningWaterParam extends PageParam {
@ApiModelProperty(value="账户类型",example = "1：保证金账户 2：预付金账户")
private String accountType;
@ApiModelProperty(value="流水类型 10:充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
private String runningWaterType;
@ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
private String beginTime;
@ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
private String endTime;
@ApiModelProperty(value="货主编码",example = "20145787812312312")
private Long ownerUserNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerBindCardRecordListParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class PageOwnerBindCardRecordListParam extends PageParam {
@ApiModelProperty(value = "货主用户编码")
private Long ownerUserNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerCaseOutListParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class PageOwnerCaseOutListParam extends PageParam {
@ApiModelProperty(value = "开始时间", example = "2020-01-01 10:10:10")
private String beginTime;
@ApiModelProperty(value = "结束时间", example = "2020-01-01 10:10:10")
private String endTime;
@ApiModelProperty(value = "充值账户类型 1：保证金 2：预付运费", example = "1")
private Integer accountType;
@ApiModelProperty(value = "货主用户编码")
private Long userNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/PageOwnerTopUpListParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class PageOwnerTopUpListParam extends PageParam {
@ApiModelProperty(value = "开始时间", example = "2020-01-01 10:10:10")
private String beginTime;
@ApiModelProperty(value = "结束时间", example = "2020-01-01 10:10:10")
private String endTime;
@ApiModelProperty(value = "充值账户类型 1：保证金 2：预付运费", example = "1")
private Integer accountType;
@ApiModelProperty(value = "货主用户编码")
private Long ownerUserNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/PagePlatformMarginAccountParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author huyufan
* @create 2023-09-19 13:33
*/
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PagePlatformMarginAccountParam extends PageParam {
@ApiModelProperty(value="货主编码",example = "123")
private Long ownerUserNo;
@ApiModelProperty(value="流水编号",example = "201457878")
private String runningWaterNo;
@ApiModelProperty(value="流水类型10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
private Integer runningWaterType;
@ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
private String beginTime;
@ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
private String endTime;
}
performance-api/src/main/java/com/clx/performance/param/pc/PagePlatformPrepaidFreightAccountParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author huyufan
* @create 2023-09-19 13:33
*/
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PagePlatformPrepaidFreightAccountParam extends PageParam {
@ApiModelProperty(value="货主编码",example = "20145787812312312")
private Long ownerUserNo;
@ApiModelProperty(value="订单编号",example = "201457878")
private String orderNo;
@ApiModelProperty(value="运单编号",example = "201457878")
private String orderChildNo;
@ApiModelProperty(value="流水类型10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败",example = "10")
private Integer runningWaterType;
@ApiModelProperty(value="操作开始时间",example = "2020-01-01 10:10:10")
private String beginTime;
@ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
private String endTime;
}
performance-api/src/main/java/com/clx/performance/param/pc/PlatformAccountTopUpParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author huyufan
* @create 2023-09-19 13:33
*/
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PlatformAccountTopUpParam{
@ApiModelProperty(value="id",example = "1")
private Integer id;
@ApiModelProperty(value="账户类型",example = "1：保证金 2：预付运费")
private Integer accountType;
@ApiModelProperty(value="审批拒绝原因")
private String turnDownContent;
@ApiModelProperty(value="是否通过 1:通过 0:拒绝",example = "true")
private Boolean passType;
}
performance-api/src/main/java/com/clx/performance/param/pc/SettlementInvoiceExpressParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.clx.performance.param.app.PositionParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
public class SettlementInvoiceExpressParam extends PositionParam {
@ApiModelProperty(value = "结算id", example = "1")
@NotNull(message = "结算id不能为空")
private Integer settlementId;
@ApiModelProperty(value = "快递公司", example = "顺丰")
@NotBlank(message = "快递公司不能为空")
private String expressCompany;
@ApiModelProperty(value = "快递编号", example = "1000000")
@NotBlank(message = "快递编号不能为空")
private String expressNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/SettlementInvoiceImageUpdateParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.clx.performance.param.app.PositionParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
public class SettlementInvoiceImageUpdateParam extends PositionParam {
@ApiModelProperty(value = "结算id", example = "1")
@NotNull(message = "结算id不能为空")
private Integer settlementId;
@ApiModelProperty(value = "结算凭证", example = "url")
@NotBlank(message = "结算凭证不能为空")
private String invoiceImg;
}
performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverDetailParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.driver;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
public class PageCarrierSettlementDriverDetailParam extends PageParam {
@ApiModelProperty(value = "运单编号", example = "JS415")
private String childNo;
@ApiModelProperty(value="车主编码",example = "201457878")
private Long driverUserNo;
@ApiModelProperty(value="订单编号",example = "201457878")
private String orderNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/driver/PageCarrierSettlementDriverParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.driver;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PageCarrierSettlementDriverParam extends PageParam {
@ApiModelProperty(value="货单编号",example = "201457878")
private String orderGoodsNo;
@ApiModelProperty(value = "运单编号", example = "JS415")
private String childNo;
@ApiModelProperty(value="车主编码",example = "201457878")
private Long driverUserNo;
@ApiModelProperty(value="状态 1:待结算 2:已结算",example = "10")
private String status;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/CreteAccountParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class CreteAccountParam {
private Long userNo;
private String name;
private String mobile;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/FrozenAccountParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class FrozenAccountParam {
private Long userNo;
//预付运费
private BigDecimal frozenBalance;
//保证金
private BigDecimal ensureBalance;
private Integer orderId;
private String orderNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/OwnerConfirmSettlementParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import javax.validation.constraints.NotNull;
/**
* @Author liruixin
* @create 2023-09-19 13:33
*/
@Getter
@Setter
@NoArgsConstructor
@ToString
public class OwnerConfirmSettlementParam {
@NotNull(message = "id不能为空")
@ApiModelProperty(value="列表id",example = "10")
private Integer id;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/OwnerPaymentSettlementParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Author liruixin
* @create 2023-09-19 13:33
*/
@Getter
@Setter
@NoArgsConstructor
@ToString
public class OwnerPaymentSettlementParam {
@NotNull(message = "id不能为空")
@ApiModelProperty(value="列表id",example = "10")
private Integer id;
@NotBlank(message = "收款人不能为空")
@ApiModelProperty(value = "收款人", example = "收款人")
private String payee;
@NotBlank(message = "收款银行不能为空")
@ApiModelProperty(value = "收款银行", example = "浙江银行")
private String payeeBankName;
@NotBlank(message = "收款银行卡卡号不能为空")
@ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
private String payeeBankCardNo;
@NotBlank(message = "付款银行不能为空")
@ApiModelProperty(value = "付款银行", example = "浙江银行")
private String paymentBankName;
@NotBlank(message = "付款银行卡卡号不能为空")
@ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
private String paymentBankCardNo;
@NotBlank(message = "付款凭证不能为空")
@ApiModelProperty(value = "付款凭证", example = "/a.png")
private String paymentImg;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementOwnerDetailParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PageCarrierSettlementOwnerDetailParam extends PageParam {
@ApiModelProperty(value = "运单编号", example = "JS415")
private String childNo;
@ApiModelProperty(value="货主编码",example = "201457878")
private Long ownerUserNo;
@ApiModelProperty(value="订单编号",example = "201457878")
private String orderNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementOwnerParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* @ClassName PageCarrierSettlementOwnerParam
* @Description
* @Author kavin
* @Date 2023/10/17 13:25
* @Version 1.0
*/
@Getter
@Setter
public class PageCarrierSettlementOwnerParam extends PageParam {
@ApiModelProperty(value = "结算编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value="货主编码",example = "201457878")
private Long ownerUserNo;
@ApiModelProperty(value="状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结",example = "10")
private String status;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/PageOwnerSettlementOwnerDetailParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class PageOwnerSettlementOwnerDetailParam extends PageParam {
@NotBlank(message = "结算单编号不能为空")
@ApiModelProperty(value = "结算单编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value="运单编号",example = "201457878")
private String childNo;
@ApiModelProperty(value="订单编号",example = "201457878")
private String orderNo;
@ApiModelProperty(value = "结算子单编号", example = "JS415")
private String settlementSubNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/PageOwnerSettlementParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* @ClassName PageOwnerSettlementParam
* @Description
* @Author kavin
* @Date 2023/10/17 15:46
* @Version 1.0
*/
@Getter
@Setter
public class PageOwnerSettlementParam extends PageParam {
@ApiModelProperty(value = "结算单编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value="订单编号",example = "201457878")
private String orderNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/SaveExpressParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class SaveExpressParam {
@ApiModelProperty(value = "结算编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value = "快递公司", example = "顺风")
private String expressCompany;
@ApiModelProperty(value = "快递编号", example = "SF145787")
private String expressNo;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/SavePayeeParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class SavePayeeParam {
@ApiModelProperty(value = "结算编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value = "收款人", example = "收款人")
private String payee;
@ApiModelProperty(value = "收款银行", example = "浙江银行")
private String payeeBankName;
@ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
private String payeeBankCardNo;
@ApiModelProperty(value = "付款凭证", example = "/a.png")
private String paymentImg;
@ApiModelProperty(value = "付款银行", example = "浙江银行")
private String paymentBankName;
@ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
private String paymentBankCardNo;
@ApiModelProperty(value = "付款金额", example = "123")
private String paymentAmount;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/ThawAccountParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
@ToString
public class ThawAccountParam {
private String orderNo;
// 1: 普通单 2：网运单
private String orderType;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/UpdateStatusParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class UpdateStatusParam {
@ApiModelProperty(value = "订单编号", example = "PT2023102400420")
private String orderNo;
@ApiModelProperty(value = "结算类型：1拉运完成结 2月结", example = "1")
private Integer settlementPeriodType;
@ApiModelProperty(value = "当前状态 10 待锁定,20 待对账,30 待货主确认,40 待货主付款,50 待平台确认付款,60 待平台付款,70 待货主确认付款,80 待邮寄发票,90 已完结", example = "10")
private Integer fromStatus;
@ApiModelProperty(value = "目标状态 10 待锁定,20 待对账,30 待货主确认,40 待货主付款,50 待平台确认付款,60 待平台付款,70 待货主确认付款,80 待邮寄发票,90 已完结", example = "20")
private Integer toStatus;
}
performance-api/src/main/java/com/clx/performance/param/pc/owner/UploadInvoiceImgParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc.owner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class UploadInvoiceImgParam{
@ApiModelProperty(value = "结算编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value="结算凭证",example = "/123.img")
private String invoiceImg;
}
performance-api/src/main/java/com/clx/performance/param/pc/pageIntegralOrderParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class pageIntegralOrderParam extends PageParam {
@ApiModelProperty(value = "货单编号", example = "10000000000000")
private String orderGoodsNo;
@ApiModelProperty(value = "开始时间")
private String beginTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
}
performance-api/src/main/java/com/clx/performance/param/pc/pageIntegralStatisticsDetailParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.param.pc;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
public class pageIntegralStatisticsDetailParam extends PageParam {
@ApiModelProperty(value = "统计id", example = "1")
@NotNull(message = "统计id不为空")
private Integer statisticsId;
}
performance-api/src/main/java/com/clx/performance/vo/app/OrderChildFreightInfoVO.java
浏览文件 @ 9d86c241
...@@ -49,7 +49,15 @@ public class OrderChildFreightInfoVO { ...@@ -49,7 +49,15 @@ public class OrderChildFreightInfoVO {
@ApiModelProperty(value = "总运费（元）", example = "1.23") @ApiModelProperty(value = "总运费（元）", example = "1.23")
private BigDecimal totalFreight; private BigDecimal totalFreight;
public BigDecimal getTotalFreight() { public BigDecimal getTotalFreight() {
return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP); BigDecimal totalFreight = freightPrice.multiply(weight);
if (unloadNet != null){
totalFreight = freightPrice.multiply(unloadNet.compareTo(loadNet) < 0? unloadNet : loadNet);
BigDecimal dif = unloadNet.subtract(weight);
if (dif.compareTo(BigDecimal.ZERO) < 0){
totalFreight = totalFreight.add(lossPrice.multiply(dif));
}
}
return totalFreight.setScale(2, RoundingMode.HALF_UP);
} }
@ApiModelProperty(value = "亏吨扣款（元）", example = "1.23") @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
......
performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java
浏览文件 @ 9d86c241
...@@ -11,6 +11,7 @@ import lombok.ToString; ...@@ -11,6 +11,7 @@ import lombok.ToString;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
...@@ -62,6 +63,8 @@ public class OrderChildVO { ...@@ -62,6 +63,8 @@ public class OrderChildVO {
@ApiModelProperty(value = "车主id", example = "1") @ApiModelProperty(value = "车主id", example = "1")
private Long truckOwnUserNo; private Long truckOwnUserNo;
@ApiModelProperty(value = "车主姓名", example = "李四")
private String truckOwnName;
@ApiModelProperty(value = "车辆ID", example = "1") @ApiModelProperty(value = "车辆ID", example = "1")
private Integer truckId; private Integer truckId;
@ApiModelProperty(value = "车牌号", example = "京A12345") @ApiModelProperty(value = "车牌号", example = "京A12345")
...@@ -127,6 +130,8 @@ public class OrderChildVO { ...@@ -127,6 +130,8 @@ public class OrderChildVO {
private String loadTime; private String loadTime;
@ApiModelProperty(value = "卸车时间", example = "") @ApiModelProperty(value = "卸车时间", example = "")
private String unloadTime; private String unloadTime;
@ApiModelProperty(value = "司机确认交货时间", example = "")
private LocalDateTime confirmTime;
@ApiModelProperty(value = "结算时间", example = "") @ApiModelProperty(value = "结算时间", example = "")
private String settleTime; private String settleTime;
@ApiModelProperty(value = "取消时间", example = "") @ApiModelProperty(value = "取消时间", example = "")
......
performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildAddMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 新增
* @Date: 2023-10-19 15:45:25
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class OrderChildAddMqParam {
private String childNo; //运单编号
}
performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildDriverConfirmMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 司机确认收货
* @Date: 2023-10-19 15:45:25
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class OrderChildDriverConfirmMqParam {
private String childNo; //运单编号
}
performance-api/src/main/java/com/clx/performance/vo/mq/SettlementDetailAddMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 新增计费明细
* @Date: 2023-10-19 15:45:25
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class SettlementDetailAddMqParam {
private Integer settlementOwnerDetailId; //货主计费明细id
private Integer settlementDriverDetailId; //司机计费明细id
}
performance-api/src/main/java/com/clx/performance/vo/mq/SettlementDetailInvoiceTypeSyncMqParam.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.mq;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqingguo
* @Description: 开票标识同步
* @Date: 2023-10-19 15:45:25
* @Version: 1.0
*/
@Setter
@Getter
@ToString
@NoArgsConstructor
public class SettlementDetailInvoiceTypeSyncMqParam {
private String childNo; //运单编号
private Integer InvoiceType; //司机计费明细id
}
performance-api/src/main/java/com/clx/performance/vo/pc/Freight.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class Freight{
@ApiModelProperty("货单编号")
private String orderGoodsNo;
@MoneyOutConvert
@ApiModelProperty("挂单运费")
private BigDecimal pendingOrderFreight;
}
performance-api/src/main/java/com/clx/performance/vo/pc/GoodsOrderSendAddressSelect.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.msl.common.convertor.field.Converted;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.List;
/**
* @ClassName GoodsOrderSendAddressSelect
* @Description
* @Author kavin
* @Date 2023/10/10 10:44
* @Version 1.0
*/
@ApiModel(description = "货单地图货源地下拉选")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class GoodsOrderSendAddressSelect {
@ApiModelProperty("订单编号")
private String orderNo;
@ApiModelProperty("发货地址ID")
private Integer sendAddressId;
@ApiModelProperty("发货地址简称")
private String sendAddressShorter;
@ApiModelProperty("发货地址经度")
private BigDecimal sendLongitude;
@ApiModelProperty("发货地址纬度")
private BigDecimal sendLatitude;
@Converted(isDynamic = true)
@ApiModelProperty("挂单运费")
private List<Freight> freightList;
}
performance-api/src/main/java/com/clx/performance/vo/pc/IntegralOrderVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqinguo
* @Description: 积分货单
* @Date: 2023-10-10 09:47:04
* @Version: 1.0
*/
@ApiModel(description = "积分货单")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class IntegralOrderVO {
@ApiModelProperty(value = "id", example = "1")
private Integer id;
@ApiModelProperty(value = "货单编号", example = "1000000000000")
private String orderGoodsNo;
@ApiModelProperty(value = "发货地址id", example = "1")
private Integer sendAddressId;
@ApiModelProperty(value = "发货地址", example = "北京")
private String sendAddress;
@ApiModelProperty(value = "收货地址id", example = "2")
private Integer receiveAddressId;
@ApiModelProperty(value = "收货地址", example = "上海")
private String receiveAddress;
@ApiModelProperty(value = "货单类型：1优质单 2普通单 3流水单 4支援单", example = "1")
private Integer orderType;
@ApiModelProperty(value = "车辆梯队", example = "1")
private Integer truckEchelon;
@ApiModelProperty(value = "创建时间", example = "")
private String createTime;
@ApiModelProperty(value = "修改时间", example = "")
private String modifiedTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/IntegralRecordVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqinguo
* @Description: 积分记录
* @Date: 2023-10-10 10:50:10
* @Version: 1.0
*/
@ApiModel(description = "积分记录")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class IntegralRecordVO {
@ApiModelProperty(value = "id", example = "")
private Integer id;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "获得积分", example = "")
private Integer integral;
@ApiModelProperty(value = "类型", example = "")
private Integer type;
@ApiModelProperty(value = "原因", example = "")
private String remark;
@ApiModelProperty(value = "创建时间", example = "")
private String createTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/IntegralStatisticsVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.msl.common.utils.LocalDateTimeUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqinguo
* @Description: 积分排名统计
* @Date: 2023-10-10 20:33:01
* @Version: 1.0
*/
@ApiModel(description = "积分排名统计")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class IntegralStatisticsVO {
@ApiModelProperty(value = "统计id", example = "")
private Integer id;
@ApiModelProperty(value = "车牌号", example = "")
private String truckNo;
@ApiModelProperty(value = "统计时间（周一）", example = "")
private String statisticsDate;
@ApiModelProperty(value = "统计时间", example = "")
private String statisticsDateStr;
public String getStatisticsDateStr() {
return statisticsDate.substring(0,10)+"到"+ LocalDateTimeUtils.convertLocalDateTimeToDefaultString(LocalDateTimeUtils.covertStringToDefaultLocalDateTime(statisticsDate).plusDays(6)).substring(0, 10);
}
@ApiModelProperty(value = "积分", example = "")
private Integer integral;
public Integer getIntegral() {
return integral+integralBase;
}
@ApiModelProperty(value = "排名", example = "")
private Integer rank;
@ApiModelProperty(value = "梯队", example = "1")
private Integer echelon;
@ApiModelProperty(value = "创建时间", example = "")
private String createTime;
@JsonIgnore
@ApiModelProperty(value = "本周基础分", example = "", hidden = true)
private Integer integralBase;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/IntegralTruckVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
/**
* @Author: aiqinguo
* @Description: 积分车辆
* @Date: 2023-10-9 13:36:29
* @Version: 1.0
*/
@ApiModel(description = "积分车辆")
@Getter
@Setter
@ToString
@NoArgsConstructor
public class IntegralTruckVO {
@ApiModelProperty(value = "id", example = "")
private Integer id;
@ApiModelProperty(value = "车牌号", example = "京A12345")
private String truckNo;
@ApiModelProperty(value = "司机姓名", example = "张三")
private String driverName;
@ApiModelProperty(value = "司机手机号", example = "13000000000")
private String driverMobile;
@ApiModelProperty(value = "梯队", example = "1")
private Integer echelon;
@ApiModelProperty(value = "积分", example = "1")
private Integer integral;
@ApiModelProperty(value = "排名", example = "1")
private Integer rank;
@ApiModelProperty(value = "创建时间", example = "")
private String createTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
浏览文件 @ 9d86c241
...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; ...@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
@Getter @Getter
...@@ -105,5 +106,8 @@ public class OrderGoodsVO { ...@@ -105,5 +106,8 @@ public class OrderGoodsVO {
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private String createTime; private String createTime;
@ApiModelProperty("车辆列表")
private List<String> truckList;
} }
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OutputMonitorOrderChildVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class OutputMonitorOrderChildVO {
@ApiModelProperty(value = "发货地址")
private String sendAddress;
@ApiModelProperty(value = "发货地址Id")
private Integer sendAddressId;
@ApiModelProperty(value = "状态 运单状态 10：已接单 20:支付 30：前往货源地 40：到达货源地 50：装货成功 60：前往目的地 70：到达目的地 80：收货待确认 90：待结算 100：完成 110:司机取消 111:承运取消 112:货主取消 ")
private Integer status;
@ApiModelProperty(value = "预计到货源地时间")
private String expectArriveTime;
@ApiModelProperty(value = "预计到货源地时间-实时")
private String expectArriveTimeRealTime;
@ApiModelProperty(value = "预计到货源地趋势 0 前进 1 后退")
private Integer arriveTrend;
@ApiModelProperty(value = "预计到收货地时间")
private String expectReceiveTime;
@ApiModelProperty(value = "预计到收货地时间-实时")
private String expectReceiveTimeRealTime;
@ApiModelProperty(value = "预计到收货地趋势 0 前进 1 后退")
private Integer receiveTrend;
@ApiModelProperty(value = "预计运输时间")
private String expectTransportTime;
@ApiModelProperty(value = "装车预警 0 不预警 1 预警")
private Integer loadWarning;
@ApiModelProperty(value = "货源地预警 0 不预警 1 预警")
private Integer arriveWarning;
@ApiModelProperty(value = "收货地预警 0 不预警 1 预警")
private Integer receiveWarning;
@ApiModelProperty(value = "车牌号")
private String truckNo;
@ApiModelProperty(value = "司机姓名")
private String driverName;
@ApiModelProperty(value = "司机手机号")
private String driverMobile;
@ApiModelProperty(value = "装车吨数")
private BigDecimal loadNet;
@ApiModelProperty(value = "接单时间")
private String payTime;
@ApiModelProperty(value = "装车时间")
private String loadTime;
@ApiModelProperty(value = "运单号")
private String childNo;
}
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountRunningWaterRecordVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Getter
@Setter
@NoArgsConstructor
public class OwnerAccountRunningWaterRecordVO {
/**
* id
*/
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("流水号")
private Long runningWaterNo;
/**
* 货主编码
*/
@ApiModelProperty("货主编码")
private Long ownerUserNo;
/**
* 货主名称
*/
@ApiModelProperty("货主名称")
private String ownerUserName;
/**
* 联系电话
*/
@ApiModelProperty("联系电话")
private String mobile;
/**
* 账户类型
*/
@ApiModelProperty("账户类型")
private Integer accountType;
/**
* 关联数据主键ID
*/
@ApiModelProperty("关联数据主键ID")
private Integer relationId;
/**
* 流水类型
*/
@ApiModelProperty("流水类型 10：充值 20：冻结 30：解冻 40：提现冻结 50：提现成功 60：扣除 70：提现失败")
private Integer runningWaterType;
/**
* 订单ID
*/
@ApiModelProperty("订单ID")
private Integer orderId;
/**
* 订单编号
*/
@ApiModelProperty("订单编号")
private String orderNo;
/**
* 运单ID
*/
@ApiModelProperty("运单ID")
private Integer orderChildId;
/**
* 运单编号
*/
@ApiModelProperty("运单编号")
private String orderChildNo;
/**
* 变动金额
*/
@ApiModelProperty("变动金额")
@MoneyOutConvert
private BigDecimal alterationBalance;
/**
* 冻结金额
*/
@ApiModelProperty("冻结金额")
@MoneyOutConvert
private BigDecimal frozenBalance;
/**
* 可用余额
*/
@ApiModelProperty("可用余额")
@MoneyOutConvert
private BigDecimal usableBalance;
/**
* 账户余额
*/
@ApiModelProperty("账户余额")
@MoneyOutConvert
private BigDecimal accountBalance;
@ApiModelProperty("扣除金额")
@MoneyOutConvert
private BigDecimal takeOutBalance;
/**
* 操作人
*/
@ApiModelProperty("操作人")
private String createBy;
/**
* 操作时间
*/
@ApiModelProperty("操作时间")
private String createTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.apache.poi.hpsf.Decimal;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Getter
@Setter
@NoArgsConstructor
public class OwnerAccountVO {
@ApiModelProperty(value = "id")
private Integer id;
/**
* 货主编码
*/
@ApiModelProperty(value = "货主编码")
private String ownerUserNo;
/**
* 货主名称
*/
@ApiModelProperty(value = "货主名称")
private String ownerUserName;
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
private String mobile;
/**
* 账户类型;1:保证金 2：预付运费
*/
@ApiModelProperty(value = "账户类型;1:保证金 2：预付运费")
private Integer accountType;
/**
* 账户余额
*/
@ApiModelProperty(value = "账户余额")
@MoneyOutConvert
private BigDecimal accountBalance;
/**
* 可用余额
*/
@ApiModelProperty(value = "可用余额")
@MoneyOutConvert
private BigDecimal usableBalance;
/**
* 冻结金额
*/
@ApiModelProperty(value = "冻结金额")
@MoneyOutConvert
private BigDecimal frozenBalance;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private String createTime;
@ApiModelProperty(value = "修改时间")
private String modifiedTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerBindCardRecordVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.time.LocalDateTime;
/**
* 货主绑卡记录;
*
* @date : 2023-10-12
*/
@Getter
@Setter
@NoArgsConstructor
public class OwnerBindCardRecordVO{
/**
* id
*/
@ApiModelProperty(value = "id")
private Integer id;
/**
* 货主编码
*/
@ApiModelProperty(value = "货主编码")
private Long ownerUserNo;
// /**
// * 货主名称
// */
// @ApiModelProperty(value = "货主名称")
// private String ownerUserName;
// /**
// * 货主类型;1:企业 2：个人
// */
// @ApiModelProperty(value = "货主类型;1:企业 2：个人")
// private Integer ownerType;
// /**
// * 货主银行
// */
// @ApiModelProperty(value = "货主银行")
// private String ownerBank;
// /**
// * 银行卡号
// */
// @ApiModelProperty(value = "银行卡号")
// private String bankCardNumber;
// /**
// * 开户行
// */
// @ApiModelProperty(value = "开户行")
// private String openAccountBank;
// /**
// * 户名
// */
// @ApiModelProperty(value = "户名")
// private String accountBankName;
/**
* 操作人
*/
@ApiModelProperty(value = "操作人")
private String createBy;
/**
* 操作项目
*/
@ApiModelProperty(value = "操作项目")
private String createItem;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private String createTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerCaseOutVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 货主提现;
*
* @date : 2023-10-12
*/
@Getter
@Setter
@NoArgsConstructor
public class OwnerCaseOutVO {
/**
* id
*/
@ApiModelProperty(value = "id")
private Integer id;
/**
* 货主编号
*/
@ApiModelProperty(value = "货主编号")
private Long ownerUserNo;
/**
* 提现编号
*/
@ApiModelProperty(value = "提现编号")
private Long caseOutNo;
/**
* 提现账户类型
*/
@ApiModelProperty(value = "提现账户类型 1 ：保证金 2：预付运费")
private Integer accountType;
/**
* 提现金额
*/
@ApiModelProperty(value = "提现金额")
@MoneyOutConvert
private BigDecimal caseOutBalance;
/**
* 状态
*/
@ApiModelProperty(value = "状态 10：代付款 20：待货主确认 30：已付款")
private Integer status;
/**
* 提现银行
*/
@ApiModelProperty(value = "提现银行")
private String caseOutBank;
/**
* 提现银行卡号
*/
@ApiModelProperty(value = "提现银行卡号")
private String caseOutBankNumber;
/**
* 操作人
*/
@ApiModelProperty(value = "操作人")
private String createBy;
/**
* 付款时间
*/
@ApiModelProperty(value = "付款时间")
private String paymentTime;
/**
* 平台付款银行
*/
@ApiModelProperty(value = "平台付款银行")
private String platformPaymentBank;
/**
* 平台付款银行账号
*/
@ApiModelProperty(value = "平台付款银行账号")
private String platformPaymentBankNumber;
/**
* 付款人
*/
@ApiModelProperty(value = "付款人")
private String paymentBy;
/**
* 付款凭证
*/
@ApiModelProperty(value = "付款凭证")
private String paymentProof;
/**
* 创建时间
*/
@ApiModelProperty(value = "操作时间")
private String createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private String modifiedTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerTopUpVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 货主充值
*
* @date : 2023-10-12
*/
@Getter
@Setter
@NoArgsConstructor
public class OwnerTopUpVO {
/**
* id
*/
@ApiModelProperty(value = "id")
private Integer id;
/**
* 充值编号
*/
@ApiModelProperty(value = "充值编号")
private Long topUpNo;
/**
* 货主编码
*/
@ApiModelProperty(value = "货主编码")
private Long ownerUserNo;
/**
* 充值类型
*/
@ApiModelProperty(value = "充值类型 1:保证金 2：预付运费")
private Integer accountType;
/**
* 充值金额
*/
@ApiModelProperty(value = "充值金额")
@MoneyOutConvert
private BigDecimal topUpBalance;
/**
* 状态
*/
@ApiModelProperty(value = "状态 10：待审批 20：审批拒绝 30：审批通过")
private Integer status;
/**
* 打款银行
*/
@ApiModelProperty(value = "打款银行")
private String drawingBank;
/**
* 打款银行卡号
*/
@ApiModelProperty(value = "打款银行卡号")
private String drawingBankNumber;
/**
* 打款凭证
*/
@ApiModelProperty(value = "打款凭证")
private String drawingProof;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private String createTime;
/**
* 操作人
*/
@ApiModelProperty(value = "操作人")
private String createBy;
/**
* 审批时间
*/
@ApiModelProperty(value = "审批时间")
private String approvalTime;
/**
* 审批人
*/
@ApiModelProperty(value = "审批人")
private String approvalBy;
/**
* 审批拒绝
*/
@ApiModelProperty(value = "审批拒绝")
private String approvalTurnDown;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/TruckCoordinateVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
/**
* @ClassName TruckCoordinate
* @Description
* @Author kavin
* @Date 2023/10/10 11:36
* @Version 1.0
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class TruckCoordinateVO {
@ApiModelProperty(value = "车牌号")
private String truckNo;
@ApiModelProperty(value = "精度")
private BigDecimal longitudeX;
@ApiModelProperty(value = "维度")
private BigDecimal latitudeY;
@ApiModelProperty(value = "车主姓名")
private String name;
@ApiModelProperty(value = "车主手机号")
private String mobile;
@ApiModelProperty(value = "空重车状态 1:空车 2:运单-空车 3:运单-重车")
private Integer truckUseStatus;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
/**
* @ClassName CarrierPageSettlementOwnerDetailVO
* @Description
* @Author kavin
* @Date 2023/10/16 15:01
* @Version 1.0
*/
@Getter
@Setter
public class CarrierPageSettlementDriverDetailVO {
@ApiModelProperty(value = "计费明细ID")
private Integer id;
@ApiModelProperty(value = "运单编号")
private String childNo;
@ApiModelProperty(value = "货单编号")
private String orderGoodsNo;
@ApiModelProperty(value = "订单编号")
private String orderNo;
@ApiModelProperty(value = "车主编码")
private Long driverUserNo;
@ApiModelProperty(value = "司机名称")
private String driverName;
@ApiModelProperty(value = "货物id")
private Integer goodsId;
@ApiModelProperty(value = "货物名称")
private String goodsName;
@ApiModelProperty(value = "车牌号")
private String truckNo;
@ApiModelProperty(value = "结算单号")
private String settlementNo;
@ApiModelProperty(value = "开票标识：1网运单 2普通单")
private Integer invoiceType;
@ApiModelProperty(value = "实际净重（吨）")
private BigDecimal weight;
@MoneyOutConvert
@ApiModelProperty(value = "运费单价")
private BigDecimal freightPrice;
@MoneyOutConvert
@ApiModelProperty(value = "实际运费金额")
private BigDecimal freight;
@ApiModelProperty(value = "货损吨数（吨）")
private BigDecimal lossWeight;
@MoneyOutConvert
@ApiModelProperty(value = "货损单价")
private BigDecimal lossPrice;
@MoneyOutConvert
@ApiModelProperty(value = "货损金额")
private BigDecimal lossFreight;
@MoneyOutConvert
@ApiModelProperty(value = "预付运费金额")
private BigDecimal prepayFreight;
@MoneyOutConvert
@ApiModelProperty(value = "结算金额")
private BigDecimal settlementFreight;
@MoneyOutConvert
@ApiModelProperty(value = "开票金额")
private BigDecimal invoiceFreight;
@ApiModelProperty(value = "创建时间")
private String createTime;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
/**
* @ClassName CarrierPageSettlementOwnerDetailVO
* @Description
* @Author kavin
* @Date 2023/10/16 15:01
* @Version 1.0
*/
@Getter
@Setter
public class CarrierPageSettlementDriverVO {
@ApiModelProperty(value = "结算单Id")
private Integer id;
@ApiModelProperty(value = "运单编号")
private String childNo;
@ApiModelProperty(value = "货单编号")
private String orderGoodsNo;
@ApiModelProperty(value = "订单编号")
private String orderNo;
@ApiModelProperty(value = "车主编码")
private Long driverUserNo;
@ApiModelProperty(value = "司机名称")
private String driverName;
@ApiModelProperty(value = "货物id")
private Integer goodsId;
@ApiModelProperty(value = "货物名称")
private String goodsName;
@ApiModelProperty(value = "车牌号")
private String truckNo;
@ApiModelProperty(value = "开票标识：1网运单 2普通单")
private Integer invoiceType;
@ApiModelProperty(value = "结算单号")
private String settlementNo;
@ApiModelProperty(value = "实际净重（吨）")
private BigDecimal weight;
@MoneyOutConvert
@ApiModelProperty(value = "运费单价")
private BigDecimal freightPrice;
@MoneyOutConvert
@ApiModelProperty(value = "实际运费金额")
private BigDecimal freight;
@ApiModelProperty(value = "货损吨数（吨）")
private BigDecimal lossWeight;
@MoneyOutConvert
@ApiModelProperty(value = "货损单价")
private BigDecimal lossPrice;
@MoneyOutConvert
@ApiModelProperty(value = "货损金额")
private BigDecimal lossFreight;
@MoneyOutConvert
@ApiModelProperty(value = "预付运费金额")
private BigDecimal prepayFreight;
@MoneyOutConvert
@ApiModelProperty(value = "结算金额")
private BigDecimal settlementFreight;
@ApiModelProperty(value = "状态")
private Integer status;
@ApiModelProperty(value = "创建时间")
private String createTime;
@ApiModelProperty(value = "结算平台 1：马上来 2：网运平台")
private String settlementPlatform;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
/**
* @ClassName CarrierPageSettlementOwnerDetailVO
* @Description
* @Author kavin
* @Date 2023/10/16 15:01
* @Version 1.0
*/
@Getter
@Setter
public class CarrierPageSettlementOwnerDetailVO {
@ApiModelProperty(value = "计费明细ID")
private Integer id;
@ApiModelProperty(value = "货主编码")
private Long ownerUserNo;
@ApiModelProperty(value = "货主姓名")
private String ownerName;
@ApiModelProperty(value = "订单编号")
private String orderNo;
@ApiModelProperty(value = "运单编号")
private String childNo;
@ApiModelProperty(value = "结算单号")
private String settlementNo;
@ApiModelProperty(value = "发货地址id", example = "")
private Integer sendAddressId;
@ApiModelProperty(value = "发货地址", example = "")
private String sendAddress;
@ApiModelProperty(value = "收货地址id", example = "")
private Integer receiveAddressId;
@ApiModelProperty(value = "收货地址", example = "")
private String receiveAddress;
@ApiModelProperty(value = "货物id")
private Integer goodsId;
@ApiModelProperty(value = "货物名称")
private String goodsName;
@ApiModelProperty(value = "实际净重（吨）")
private BigDecimal weight;
@MoneyOutConvert
@ApiModelProperty(value = "平台运费报价")
private BigDecimal freightPrice;
@MoneyOutConvert
@ApiModelProperty(value = "实际运费金额")
private BigDecimal freight;
@ApiModelProperty(value = "货损吨数（吨）")
private BigDecimal lossWeight;
@MoneyOutConvert
@ApiModelProperty(value = "货损单价")
private BigDecimal lossPrice;
@MoneyOutConvert
@ApiModelProperty(value = "货损金额")
private BigDecimal lossFreight;
@MoneyOutConvert
@ApiModelProperty(value = "预付运费金额")
private BigDecimal prepayFreight;
@MoneyOutConvert
@ApiModelProperty(value = "结算金额")
private BigDecimal settlementFreight;
@MoneyOutConvert
@ApiModelProperty(value = "开票金额")
private BigDecimal invoiceFreight;
@ApiModelProperty(value = "开票标识：1网运单 2普通单")
private Integer invoiceType;
@ApiModelProperty(value = "创建时间")
private String createTime;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
/**
* @ClassName CarrierPageSettlementOwnerDetailVO
* @Description
* @Author kavin
* @Date 2023/10/16 15:01
* @Version 1.0
*/
@Getter
@Setter
public class CarrierPageSettlementOwnerVO {
@ApiModelProperty(value = "结算单Id")
private Integer id;
@ApiModelProperty(value = "结算单号")
private String settlementNo;
@ApiModelProperty(value = "开票标识：1网运单 2普通单")
private Integer invoiceType;
@ApiModelProperty(value = "货主编码")
private Long ownerUserNo;
@ApiModelProperty(value = "货主姓名")
private String ownerName;
@ApiModelProperty(value = "订单编号")
private String orderNo;
@ApiModelProperty(value = "实际净重（吨）")
private BigDecimal weight;
@MoneyOutConvert
@ApiModelProperty(value = "实际运费金额")
private BigDecimal freight;
@MoneyOutConvert
@ApiModelProperty(value = "预付运费金额")
private BigDecimal prepayFreight;
@ApiModelProperty(value = "货损吨数（吨）")
private BigDecimal lossWeight;
@MoneyOutConvert
@ApiModelProperty(value = "货损金额")
private BigDecimal lossFreight;
@MoneyOutConvert
@ApiModelProperty(value = "结算金额")
private BigDecimal settlementFreight;
@MoneyOutConvert
@ApiModelProperty(value = "开票金额")
private BigDecimal invoiceFreight;
@ApiModelProperty(value = "创建时间")
private String createTime;
@ApiModelProperty(value = "状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")
private Integer status;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerCompanyContactVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class CarrierSettlementOwnerCompanyContactVO {
@ApiModelProperty(value = "公司联系人", example = "1.23")
private String companyContact;
@ApiModelProperty(value = "公司联系电话", example = "公司联系人")
private String companyContactMobile;
@ApiModelProperty(value = "公司联系地址", example = "公司联系地址")
private String companyContactAddress;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerCompanyVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class CarrierSettlementOwnerCompanyVO {
@ApiModelProperty(value = "公司名称", example = "公司名称")
private String companyName;
@ApiModelProperty(value = "企业税号", example = "企业税号")
private String companyTaxCode;
@ApiModelProperty(value = "公司地址", example = "公司地址")
private String companyAddress;
@ApiModelProperty(value = "公司电话", example = "1222222222")
private String companyMobile;
@ApiModelProperty(value = "公司开户行", example = "中国银行")
private String companyBankName;
@ApiModelProperty(value = "公司银行账号", example = "6215454545")
private String companyBankNo;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerDetailVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
import java.util.List;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class CarrierSettlementOwnerDetailVO {
@ApiModelProperty(value = "id", example = "1.23")
private Integer id;
@ApiModelProperty(value = "货主用户编号", example = "123")
private Long ownerUserNo;
@ApiModelProperty(value = "货主名称", example = "货主")
private String ownerName;
@ApiModelProperty(value = "结算单编号", example = "JS415")
private String settlementNo;
@ApiModelProperty(value = "结算子单号", example = "JS012")
private String settlementSubNo;
@ApiModelProperty(value = "结算周期类型：1拉运完成结 2月结", example = "")
private Integer settlementPeriodType;
@ApiModelProperty(value = "结算周期时间（月结）", example = "")
private String settlementPeriodTime;
@ApiModelProperty(value = "订单编号", example = "123")
private String orderNo;
@ApiModelProperty(value = "实际净重（吨）", example = "1.23")
private BigDecimal weight;
@ApiModelProperty(value = "实际运费（元）", example = "1.23")
@MoneyOutConvert
private BigDecimal freight;
@ApiModelProperty(value = "货损吨数（吨）", example = "1.23")
private BigDecimal lossWeight;
@ApiModelProperty(value = "货损金额（元）", example = "1.23")
@MoneyOutConvert
private BigDecimal lossFreight;
@ApiModelProperty(value = "预付运费金额（元）", example = "1.23")
@MoneyOutConvert
private BigDecimal prepayFreight;
@ApiModelProperty(value = "结算金额（元）", example = "1.23")
@MoneyOutConvert
private BigDecimal settlementFreight;
@ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
private Integer invoiceTypeCode;
@ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "网运单")
private String invoiceTypeMsg;
@ApiModelProperty(value = "开票金额（元）", example = "1.23")
@MoneyOutConvert
private BigDecimal invoiceFreight;
@ApiModelProperty(value = "结算凭证", example = "/a.png")
private String invoiceImg;
@ApiModelProperty(value = "收款人", example = "收款人")
private String payee;
@ApiModelProperty(value = "收款银行", example = "浙江银行")
private String payeeBankName;
@ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
private String payeeBankCardNo;
@ApiModelProperty(value = "付款凭证", example = "/a.png")
private String paymentImg;
@ApiModelProperty(value = "付款银行", example = "浙江银行")
private String paymentBankName;
@ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
private String paymentBankCardNo;
@ApiModelProperty(value = "公司名称", example = "公司名称")
private String companyName;
@ApiModelProperty(value = "企业税号", example = "企业税号")
private String companyTaxCode;
@ApiModelProperty(value = "公司地址", example = "公司地址")
private String companyAddress;
@ApiModelProperty(value = "公司电话", example = "1222222222")
private String companyMobile;
@ApiModelProperty(value = "公司开户行", example = "中国银行")
private String companyBankName;
@ApiModelProperty(value = "公司银行账号", example = "6215454545")
private String companyBankNo;
@ApiModelProperty(value = "公司联系人", example = "1.23")
private String companyContact;
@ApiModelProperty(value = "公司联系电话", example = "公司联系人")
private String companyContactMobile;
@ApiModelProperty(value = "公司联系地址", example = "公司联系地址")
private String companyContactAddress;
@ApiModelProperty(value = "快递公司", example = "顺风")
private String expressCompany;
@ApiModelProperty(value = "快递编号", example = "SF145787")
private String expressNo;
@ApiModelProperty(value = "开票状态code 1-已开票 2-部分开票 3-无需开票", example = "1")
private Integer invoiceStatusCode;
@ApiModelProperty(value = "开票状态Msg 1-已开票 2-部分开票 3-无需开票", example = "无需开票")
private String invoiceStatusMsg;
@ApiModelProperty(value = "状态code 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结", example = "10")
private Integer statusCode;
@ApiModelProperty(value = "状态Msg", example = "待锁定")
private String statusMsg;
@ApiModelProperty(value = "驳回原因", example = "驳回原因")
private String remark;
@ApiModelProperty(value = "创建时间", example = "2023-01-01 00:00:00")
private String createTime;
@ApiModelProperty(value = "结算单合并明细")
private List<SettlementMergeVO> mergers;
@ApiModelProperty(value = "结算单操作日志")
private List<SettlementLogVO> settlementLogs;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerExpressVO.java 0 → 100644
浏览文件 @ 9d86c241
package com.clx.performance.vo.pc.carrier.settle;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class CarrierSettlementOwnerExpressVO {
@ApiModelProperty(value = "快递公司", example = "顺风")
private String expressCompany;
@ApiModelProperty(value = "快递编号", example = "SF145787")
private String expressNo;
}
performance-web/pom.xml
浏览文件 @ 9d86c241
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论