待补单拒单再生成待补单还可以生成
This commit is contained in:
parent
409c436bc5
commit
358ae466f6
|
@ -3162,9 +3162,12 @@ 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("")){
|
||||||
|
}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("补差价的单据无法生成待补单!");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10 || orders.getStatus() == 11) {
|
if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10 || orders.getStatus() == 11) {
|
||||||
if(orders.getUserPackageDetailId() !=null){
|
if(orders.getUserPackageDetailId() !=null){
|
||||||
return cancelSupplementPackageOrders(userId,orders,isAuto,type);
|
return cancelSupplementPackageOrders(userId,orders,isAuto,type);
|
||||||
|
|
|
@ -1711,7 +1711,8 @@
|
||||||
</select>
|
</select>
|
||||||
<!-- 获取储值积分(为他充值的)-->
|
<!-- 获取储值积分(为他充值的)-->
|
||||||
<select id="getCzjfList" resultType="com.sqx.modules.artificer.entity.Orders">
|
<select id="getCzjfList" resultType="com.sqx.modules.artificer.entity.Orders">
|
||||||
select id,user_recharge as jifen,create_time as jftime from user_recharge
|
select id,user_recharge as jifen,create_time as jftime
|
||||||
|
from user_recharge
|
||||||
where type = 2
|
where type = 2
|
||||||
and orders_id is null
|
and orders_id is null
|
||||||
and artificer_id = ${userId}
|
and artificer_id = ${userId}
|
||||||
|
|
Loading…
Reference in New Issue