提交 1a677e73 authored 作者: 艾庆国's avatar 艾庆国

承运与无车承运对接

上级 548761b7
...@@ -155,6 +155,10 @@ public class OrderGoodsVO { ...@@ -155,6 +155,10 @@ public class OrderGoodsVO {
@ApiModelProperty("接单保证金(分/车)") @ApiModelProperty("接单保证金(分/车)")
private BigDecimal deposit; private BigDecimal deposit;
@ApiModelProperty("是否支持借款:0:否 1:是")
private Integer supportLoan;
@ApiModelProperty("结算方式 1装车净重 2卸车净重") @ApiModelProperty("结算方式 1装车净重 2卸车净重")
private Integer settlementWay; private Integer settlementWay;
......
...@@ -201,6 +201,9 @@ public class OrderGoods implements HasKey<Integer> { ...@@ -201,6 +201,9 @@ public class OrderGoods implements HasKey<Integer> {
@ApiModelProperty("接单保证金(分/车)") @ApiModelProperty("接单保证金(分/车)")
private BigDecimal deposit; private BigDecimal deposit;
@ApiModelProperty("是否支持借款:0:否 1:是")
private Integer supportLoan;
@TableField("create_time") @TableField("create_time")
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
......
...@@ -182,6 +182,7 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial ...@@ -182,6 +182,7 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate()); orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate()); orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
orderGoods.setDeposit(orderInfoFeign.getDeposit()); orderGoods.setDeposit(orderInfoFeign.getDeposit());
orderGoods.setSupportLoan(orderInfoFeign.getSupportLoan());
List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo); List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo);
if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) { if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) {
......
...@@ -185,6 +185,7 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia ...@@ -185,6 +185,7 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate()); orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate()); orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
orderGoods.setDeposit(orderInfoFeign.getDeposit()); orderGoods.setDeposit(orderInfoFeign.getDeposit());
orderGoods.setSupportLoan(orderInfoFeign.getSupportLoan());
if (CollectionUtil.isNotEmpty(child.getTruckList())) { if (CollectionUtil.isNotEmpty(child.getTruckList())) {
orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now); orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
......
...@@ -179,6 +179,7 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In ...@@ -179,6 +179,7 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate()); orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate()); orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
orderGoods.setDeposit(orderInfoFeign.getDeposit()); orderGoods.setDeposit(orderInfoFeign.getDeposit());
orderGoods.setSupportLoan(orderInfoFeign.getSupportLoan());
if (CollectionUtil.isNotEmpty(child.getTruckList())) { if (CollectionUtil.isNotEmpty(child.getTruckList())) {
orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now); orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论