lzq
/
njzscloud-dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lzq:030f6fcfeadae0cd90b535445081f7fea74edeca
Branches Tags
lzq:master
..
compare: lzq:5af47b43f19c06cb2044e7f33434866cf2a0db8f
Branches Tags
lzq:master

No commits in common. "030f6fcfeadae0cd90b535445081f7fea74edeca" and "5af47b43f19c06cb2044e7f33434866cf2a0db8f" have entirely different histories.
030f6fcfea ... 5af47b43f1

3 changed files with 3 additions and 88 deletions
Show Stats Expand all files Collapse all files

41
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderExpenseItemsEntity.java
View File

@ -98,47 +98,6 @@ 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;
}

43
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/entity/OrderTransEntity.java
View File

@ -7,12 +7,10 @@ import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 运输信息
*
* @author ljw
*/
@Getter
@ -181,47 +179,6 @@ 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;
}

7
njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java
View File

@ -2,7 +2,6 @@ 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;
@ -51,7 +50,7 @@ public class TruckServiceImpl extends ServiceImpl<TruckMapper, TruckEntity> impl
// 传参customerId与旧数据customerId一致，说明是修改自己名下的车辆，允许修改
this.updateById(truckEntity);
} else {
throw Exceptions.clierr("无修改权限");
throw new RuntimeException("无修改权限");
}
} else {
this.updateById(truckEntity);
@ -66,12 +65,12 @@ public class TruckServiceImpl extends ServiceImpl<TruckMapper, TruckEntity> impl
Long customerId = userDetail.getCurrentCustomerId();
// id和customerId必传
if (manager == null) {
throw Exceptions.clierr("manager必传");
throw new RuntimeException("manager必传");
}
// 只能删除自己名下车辆
List<TruckEntity> trucks = this.listByIds(ids);
if (!trucks.stream().allMatch(truck -> truck.getCustomerId().equals(customerId))) {
throw Exceptions.clierr("无删除权限");
throw new RuntimeException("无删除权限");
}
if (!manager) {
// 非管理员直接删除即可