套娃生成待补单,退款待补单
This commit is contained in:
parent
2346d8e735
commit
000d901f00
|
@ -1662,6 +1662,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
|
|
||||||
private Result cancelSupplementMassageOrders(Long userId, Orders orders, Integer isAuto, Integer type) {
|
private Result cancelSupplementMassageOrders(Long userId, Orders orders, Integer isAuto, Integer type) {
|
||||||
if(type == 1){
|
if(type == 1){
|
||||||
|
if(orders.getTaxiMoney().compareTo(BigDecimal.ZERO) != 0){
|
||||||
//退车费或扣车费,成为待补单
|
//退车费或扣车费,成为待补单
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
String time = simpleDateFormat.format(new Date());
|
String time = simpleDateFormat.format(new Date());
|
||||||
|
@ -1759,6 +1760,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());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if(isAuto == 1){
|
if(isAuto == 1){
|
||||||
//按照比例 将扣除的车费钱
|
//按照比例 将扣除的车费钱
|
||||||
|
@ -1802,10 +1804,21 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
userMoneyDetails.setBlFlag(1);
|
userMoneyDetails.setBlFlag(1);
|
||||||
userMoneyDetailsService.save(userMoneyDetails);
|
userMoneyDetailsService.save(userMoneyDetails);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if(orders.getOldOrdersId() !=null){
|
||||||
|
//此笔单子退车费,并改为取消,再将原单改成待补单
|
||||||
orders.setRefusalContent("");
|
orders.setRefusalContent("");
|
||||||
|
orders.setTaxiMoney(BigDecimal.ZERO);
|
||||||
|
orders.setStatus(4);
|
||||||
|
baseMapper.updateById(orders);
|
||||||
|
cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 1);//退原单,原单的车费已被退/扣,所以只退项目
|
||||||
|
}else{
|
||||||
|
orders.setRefusalContent("");
|
||||||
|
orders.setTaxiMoney(BigDecimal.ZERO);
|
||||||
orders.setStatus(10);
|
orders.setStatus(10);
|
||||||
baseMapper.updateById(orders);
|
baseMapper.updateById(orders);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if(type == 2){
|
if(type == 2){
|
||||||
//退项目费
|
//退项目费
|
||||||
String couponIds = orders.getCouponId();
|
String couponIds = orders.getCouponId();
|
||||||
|
@ -2034,7 +2047,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
|
|
||||||
if(orders.getOldOrdersId()!=null){
|
if(orders.getOldOrdersId()!=null){
|
||||||
cancelSupplementOrders(userId, orders.getOldOrdersId(), 0, 2);//退原单,原单的车费已被退/扣,所以只退项目
|
cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 2);//退原单,原单的车费已被退/扣,所以只退项目
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Result.success();
|
return Result.success();
|
||||||
|
@ -2042,13 +2055,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
|
|
||||||
private Result cancelSupplementPackageOrders(Long userId, Orders orders, Integer isAuto, Integer type) {
|
private Result cancelSupplementPackageOrders(Long userId, Orders orders, Integer isAuto, Integer type) {
|
||||||
if(type == 1){
|
if(type == 1){
|
||||||
|
if(orders.getTaxiMoney().compareTo(BigDecimal.ZERO) != 0) {
|
||||||
//退车费或扣车费,成为待补单
|
//退车费或扣车费,成为待补单
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
String time = simpleDateFormat.format(new Date());
|
String time = simpleDateFormat.format(new Date());
|
||||||
//退款金额
|
//退款金额
|
||||||
BigDecimal userMoney = BigDecimal.ZERO;
|
BigDecimal userMoney = BigDecimal.ZERO;
|
||||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
if(isAuto == 0){
|
if (isAuto == 0) {
|
||||||
//退款车费
|
//退款车费
|
||||||
userMoney = orders.getTaxiMoney();
|
userMoney = orders.getTaxiMoney();
|
||||||
if (orders.getPayWay() == 1 || orders.getPayWay() == 2 || orders.getPayWay() == 3 || orders.getPayWay() == 4) {
|
if (orders.getPayWay() == 1 || orders.getPayWay() == 2 || orders.getPayWay() == 3 || orders.getPayWay() == 4) {
|
||||||
|
@ -2116,7 +2130,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
|
|
||||||
UserEntity userEntity = userService.selectUserById(orders.getUserId());
|
UserEntity userEntity = userService.selectUserById(orders.getUserId());
|
||||||
//超过十个字 则截取
|
//超过十个字 则截取
|
||||||
String content = "订单:"+orders.getOrdersNo()+",转为待补单";
|
String content = "订单:" + orders.getOrdersNo() + ",转为待补单";
|
||||||
//消息推送
|
//消息推送
|
||||||
if (StringUtils.isNotEmpty(userEntity.getOpenId())) {
|
if (StringUtils.isNotEmpty(userEntity.getOpenId())) {
|
||||||
CommonInfo one = commonInfoService.findOne(248);
|
CommonInfo one = commonInfoService.findOne(248);
|
||||||
|
@ -2140,7 +2154,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
|
userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(isAuto == 1){
|
if (isAuto == 1) {
|
||||||
//按照比例 将扣除的车费钱
|
//按照比例 将扣除的车费钱
|
||||||
BigDecimal taxiMoney = orders.getTaxiMoney();
|
BigDecimal taxiMoney = orders.getTaxiMoney();
|
||||||
BigDecimal sumMoney = orders.getTaxiMoney();//总扣费
|
BigDecimal sumMoney = orders.getTaxiMoney();//总扣费
|
||||||
|
@ -2182,10 +2196,21 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
userMoneyDetails.setBlFlag(1);
|
userMoneyDetails.setBlFlag(1);
|
||||||
userMoneyDetailsService.save(userMoneyDetails);
|
userMoneyDetailsService.save(userMoneyDetails);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if(orders.getOldOrdersId() !=null){
|
||||||
|
//此笔单子退车费,并改为取消,再将原单改成待补单
|
||||||
orders.setRefusalContent("");
|
orders.setRefusalContent("");
|
||||||
|
orders.setTaxiMoney(BigDecimal.ZERO);
|
||||||
|
orders.setStatus(4);
|
||||||
|
baseMapper.updateById(orders);
|
||||||
|
cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 1);//退原单,原单的车费已被退/扣,所以只退项目
|
||||||
|
}else{
|
||||||
|
orders.setRefusalContent("");
|
||||||
|
orders.setTaxiMoney(BigDecimal.ZERO);
|
||||||
orders.setStatus(10);
|
orders.setStatus(10);
|
||||||
baseMapper.updateById(orders);
|
baseMapper.updateById(orders);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if(type == 2){
|
if(type == 2){
|
||||||
//退项目费
|
//退项目费
|
||||||
//释放
|
//释放
|
||||||
|
|
Loading…
Reference in New Issue