diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java index e5011a6..c0b2cb3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java @@ -98,6 +98,47 @@ public class OrderExpenseItemsEntity extends BaseEntity { * },Wu-->无、ZhiDing-->指定、SuoYou-->所有 */ private String goodsScope; + + /** + * 支付状态,MianFei-->免费、WeiZhiFu-->未支付、YiZhiFu-->已支付、YiTuiKuan-->已退款 + */ + private String paymentStatus; + + /** + * 支付时间 + */ + private BigDecimal payTime; + + /** + * 退款时间 + */ + private BigDecimal refundTime; + + /** + * 总金额;单位:元 + */ + private BigDecimal totalMoney; + + /** + * 优惠金额;单位:元,有正负 + */ + private BigDecimal discountMoney; + + /** + * 手动修正金额;单位:元,有正负 + */ + private BigDecimal reviseMoney; + + /** + * 结算金额;单位:元 + */ + private BigDecimal settleMoney; + + /** + * 结算方式,YueJie-->月结、YuE-->余额、XianFu-->现付 + */ + private String settlementWay; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java index 4dd7ee2..6efd573 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java @@ -7,10 +7,12 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; +import java.math.BigDecimal; import java.time.LocalDateTime; /** * 运输信息 + * * @author ljw */ @Getter @@ -179,6 +181,47 @@ public class OrderTransEntity extends BaseEntity { * 出场时间 */ private LocalDateTime outTime; + + /** + * 支付状态,MianFei-->免费、WeiZhiFu-->未支付、YiZhiFu-->已支付、YiTuiKuan-->已退款 + */ + private String paymentStatus; + + /** + * 支付时间 + */ + private BigDecimal payTime; + + /** + * 退款时间 + */ + private BigDecimal refundTime; + + /** + * 总金额;单位:元 + */ + private BigDecimal totalMoney; + + /** + * 优惠金额;单位:元,有正负 + */ + private BigDecimal discountMoney; + + /** + * 手动修正金额;单位:元,有正负 + */ + private BigDecimal reviseMoney; + + /** + * 结算金额;单位:元 + */ + private BigDecimal settleMoney; + + /** + * 结算方式,YueJie-->月结、YuE-->余额、XianFu-->现付 + */ + private String settlementWay; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java index e5de6c5..eb6f6f6 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java @@ -2,6 +2,7 @@ package com.njzscloud.dispose.cst.truck.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.security.util.SecurityUtil; @@ -50,7 +51,7 @@ public class TruckServiceImpl extends ServiceImpl impl // 传参customerId与旧数据customerId一致,说明是修改自己名下的车辆,允许修改 this.updateById(truckEntity); } else { - throw new RuntimeException("无修改权限"); + throw Exceptions.clierr("无修改权限"); } } else { this.updateById(truckEntity); @@ -65,12 +66,12 @@ public class TruckServiceImpl extends ServiceImpl impl Long customerId = userDetail.getCurrentCustomerId(); // id和customerId必传 if (manager == null) { - throw new RuntimeException("manager必传"); + throw Exceptions.clierr("manager必传"); } // 只能删除自己名下车辆 List trucks = this.listByIds(ids); if (!trucks.stream().allMatch(truck -> truck.getCustomerId().equals(customerId))) { - throw new RuntimeException("无删除权限"); + throw Exceptions.clierr("无删除权限"); } if (!manager) { // 非管理员直接删除即可