套餐取消
This commit is contained in:
parent
a29d611b69
commit
23a9da35de
|
@ -3033,7 +3033,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
userMoneyDetails.setBlFlag(1);
|
userMoneyDetails.setBlFlag(1);
|
||||||
userMoneyDetailsService.save(userMoneyDetails);
|
userMoneyDetailsService.save(userMoneyDetails);
|
||||||
|
|
||||||
|
|
||||||
List<Orders> ordersList = baseMapper.selectList(new QueryWrapper<Orders>().isNotNull("pay_way").eq("parent_id", orders.getOrdersId()));
|
List<Orders> ordersList = baseMapper.selectList(new QueryWrapper<Orders>().isNotNull("pay_way").eq("parent_id", orders.getOrdersId()));
|
||||||
for (Orders orders1 : ordersList) {
|
for (Orders orders1 : ordersList) {
|
||||||
userMoneyDetails = new UserMoneyDetails();
|
userMoneyDetails = new UserMoneyDetails();
|
||||||
|
@ -3083,7 +3082,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
orders1.setStatus(4);
|
orders1.setStatus(4);
|
||||||
baseMapper.updateById(orders1);
|
baseMapper.updateById(orders1);
|
||||||
}
|
}
|
||||||
orders.setStatus(4);
|
|
||||||
|
|
||||||
Artificer artificer2 = artificerService.getById(orders.getArtificerId());
|
Artificer artificer2 = artificerService.getById(orders.getArtificerId());
|
||||||
if (userId != null && artificer2.getUserId().equals(userId)) {
|
if (userId != null && artificer2.getUserId().equals(userId)) {
|
||||||
|
@ -3142,6 +3140,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
data.put("time14", new TemplateMessageItem(DateUtils.format(new Date()), "#d71345"));
|
data.put("time14", new TemplateMessageItem(DateUtils.format(new Date()), "#d71345"));
|
||||||
userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
|
userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
|
||||||
}
|
}
|
||||||
|
orders.setStatus(4);
|
||||||
}
|
}
|
||||||
baseMapper.updateById(orders);
|
baseMapper.updateById(orders);
|
||||||
//删除技师占用时间表数据
|
//删除技师占用时间表数据
|
||||||
|
@ -3179,7 +3178,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
public Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type) {
|
public Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type) {
|
||||||
Orders orders = baseMapper.selectById(ordersId);
|
Orders orders = baseMapper.selectById(ordersId);
|
||||||
//状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单
|
//状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单
|
||||||
if(!orders.getRefusalContent().equals("")){
|
if(orders.getRefusalContent()!=null && !orders.getRefusalContent().equals("")){
|
||||||
}else{
|
}else{
|
||||||
if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
|
if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
|
||||||
return Result.error("补差价的单据无法生成待补单!");
|
return Result.error("补差价的单据无法生成待补单!");
|
||||||
|
|
Loading…
Reference in New Issue