待补单支付

This commit is contained in:
曹磊 2024-07-03 21:37:52 +08:00
parent ec23be6c89
commit a20fdf90e4
1 changed files with 9 additions and 3 deletions

View File

@ -789,7 +789,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
Artificer artificer = artificerService.getById(orders.getArtificerId()); Artificer artificer = artificerService.getById(orders.getArtificerId());
orders.setTechnicianType(artificer.getTechnicianType()); orders.setTechnicianType(artificer.getTechnicianType());
orders.setTechnicianRate(BigDecimal.ZERO); BigDecimal artificerVipRate = BigDecimal.ZERO;
VipDetails artificerVipDetails = vipDetailsDao.selectOne(new QueryWrapper<VipDetails>().eq("vip_name_type", artificer.getTechnicianType()));
if (artificerVipDetails != null) {
artificerVipRate = artificerVipDetails.getRate();
}
orders.setTechnicianRate(artificerVipRate);
//查询是否计算出租车扣费 //查询是否计算出租车扣费
String taxi = commonInfoService.findOne(394).getValue(); String taxi = commonInfoService.findOne(394).getValue();
//计算技师出租车收益按照技师表收益计算 //计算技师出租车收益按照技师表收益计算
@ -953,6 +958,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if (artificer.getTechnicianType() != oldArtificer.getTechnicianType()) { if (artificer.getTechnicianType() != oldArtificer.getTechnicianType()) {
return Result.error("当前订单技师等级与原订单技师等级不一致!"); return Result.error("当前订单技师等级与原订单技师等级不一致!");
} }
MassageType massageType = massageTypeService.getById(massageTypeId); MassageType massageType = massageTypeService.getById(massageTypeId);
orders.setMassageTypeId(massageTypeId); orders.setMassageTypeId(massageTypeId);
orders.setEntryName(massageType.getTitle()); orders.setEntryName(massageType.getTitle());
@ -1043,14 +1049,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders.setArtificerRate(artificer.getRate()); orders.setArtificerRate(artificer.getRate());
orders.setSumMoney(orders.getPayMoney().setScale(2, BigDecimal.ROUND_HALF_UP)); orders.setSumMoney(orders.getPayMoney().setScale(2, BigDecimal.ROUND_HALF_UP));
orders.setIsSupplement(1); orders.setIsSupplement(1);
orders.setProjectBenefits(BigDecimal.ZERO);
orders.setTechnicianType(artificer.getTechnicianType());
orders.setVipRate(oldOrders.getVipRate()); orders.setVipRate(oldOrders.getVipRate());
orders.setMassagePrice(oldOrders.getMassagePrice()); orders.setMassagePrice(oldOrders.getMassagePrice());
orders.setMassageNum(oldOrders.getMassageNum()); orders.setMassageNum(oldOrders.getMassageNum());
orders.setOrdersNo(getGeneralOrder()); orders.setOrdersNo(getGeneralOrder());
orders.setPrice(oldOrders.getPrice()); orders.setPrice(oldOrders.getPrice());
orders.setCouponMoney(oldOrders.getCouponMoney()); orders.setCouponMoney(oldOrders.getCouponMoney());
orders.setTechnicianType(artificer.getTechnicianType());
orders.setTechnicianRate(oldOrders.getTechnicianRate()); orders.setTechnicianRate(oldOrders.getTechnicianRate());
orders.setDuration(oldOrders.getDuration()); orders.setDuration(oldOrders.getDuration());