提交 92d83ed0 authored 作者: 胡宁宁's avatar 胡宁宁

增加结算单字段

上级 1a2012b1
...@@ -28,8 +28,9 @@ public class SettlementPlatformServiceFee implements HasKey<Integer> { ...@@ -28,8 +28,9 @@ public class SettlementPlatformServiceFee implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; //id private Integer id; //id
private String childNo; //运单编号 private String childNo; //运单编号
private Long driverUserNo; //车主用户编号 private Long driverUserNo; //司机用户编号
private String driverName; //车主名称 private String driverName; //司机名称
private String driverMobile; //司机手机号
private Integer sendAddressId; //发货地址id private Integer sendAddressId; //发货地址id
private String sendAddress; //发货地址 private String sendAddress; //发货地址
private Integer receiveAddressId; //收货地址id private Integer receiveAddressId; //收货地址id
......
...@@ -1996,7 +1996,13 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1996,7 +1996,13 @@ public class OrderChildServiceImpl implements OrderChildService {
if (result != null && Objects.equals(result.getCode(), 0) && result.getData() != null) { if (result != null && Objects.equals(result.getCode(), 0) && result.getData() != null) {
WalletResidueCardDTO data = result.getData(); WalletResidueCardDTO data = result.getData();
//钱包不能为负 //钱包不能为负
if (Objects.isNull(data.getResidue()) || data.getResidue() < 0L) { if(Objects.isNull(data.getResidue())){
String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足";
throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark);
}
//目前支付返回的是元 所以乘以100
data.setResidue(data.getResidue()*100);
if (data.getResidue() < 0L) {
String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足"; String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足";
throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark); throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark);
} }
......
...@@ -206,6 +206,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic ...@@ -206,6 +206,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
settlementPlatformServiceFee.setChildNo(settlementDriverDetail.getChildNo()); settlementPlatformServiceFee.setChildNo(settlementDriverDetail.getChildNo());
settlementPlatformServiceFee.setDriverUserNo(settlementDriverDetail.getDriverUserNo()); settlementPlatformServiceFee.setDriverUserNo(settlementDriverDetail.getDriverUserNo());
settlementPlatformServiceFee.setDriverName(settlementDriverDetail.getDriverName()); settlementPlatformServiceFee.setDriverName(settlementDriverDetail.getDriverName());
settlementPlatformServiceFee.setDriverMobile(orderChild.getDriverMobile());
settlementPlatformServiceFee.setSendAddressId(orderChild.getSendAddressId()); settlementPlatformServiceFee.setSendAddressId(orderChild.getSendAddressId());
settlementPlatformServiceFee.setSendAddress(orderChild.getSendAddress()); settlementPlatformServiceFee.setSendAddress(orderChild.getSendAddress());
settlementPlatformServiceFee.setReceiveAddressId(orderChild.getReceiveAddressId()); settlementPlatformServiceFee.setReceiveAddressId(orderChild.getReceiveAddressId());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论