提交 6da3b34e authored 作者: hzh's avatar hzh

订单策略修改

上级 0375e5e0
package org.dromara.server.api; package org.dromara.server.api;
import org.dromara.server.api.domain.RemoteOrderApprove;
/** /**
* @author wenhe * @author wenhe
*/ */
...@@ -53,4 +55,10 @@ public interface RemoteYsOrderService { ...@@ -53,4 +55,10 @@ public interface RemoteYsOrderService {
*/ */
void payed(String orderType, String orderNo); void payed(String orderType, String orderNo);
/**
* 订单审批
*
* @param orderApprove 审批内容
*/
void orderApprove(RemoteOrderApprove orderApprove);
} }
package org.dromara.server.api.domain;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serial;
import java.io.Serializable;
/**
* @author hzh
* @date 2025-06-13
* @desc TODO
**/
@Data
@Accessors(chain = true)
public class RemoteOrderApprove implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private Long orderId;
/**
* 订单类型
*/
private String orderType;
/**
* 授权人id
*/
private Long authId;
}
...@@ -17,6 +17,7 @@ import org.dromara.common.ys.service.ITrainService; ...@@ -17,6 +17,7 @@ import org.dromara.common.ys.service.ITrainService;
import org.dromara.common.ys.service.IVehiclesService; import org.dromara.common.ys.service.IVehiclesService;
import org.dromara.order.api.enums.OrderType; import org.dromara.order.api.enums.OrderType;
import org.dromara.server.api.RemoteYsOrderService; import org.dromara.server.api.RemoteYsOrderService;
import org.dromara.server.api.domain.RemoteOrderApprove;
import org.dromara.server.domain.bo.*; import org.dromara.server.domain.bo.*;
import org.dromara.server.domain.vo.*; import org.dromara.server.domain.vo.*;
import org.dromara.server.service.*; import org.dromara.server.service.*;
...@@ -231,6 +232,11 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService { ...@@ -231,6 +232,11 @@ public class RemoteYsOrderServiceImpl implements RemoteYsOrderService {
orderHotelService.updateOrderInfo(List.of(orderNo)); orderHotelService.updateOrderInfo(List.of(orderNo));
}); });
} }
}
@Override
public void orderApprove(RemoteOrderApprove orderApprove) {
//TODO 修改订单信息
log.info("审批同意后,订单修改:{}", orderApprove);
} }
} }
...@@ -143,6 +143,11 @@ ...@@ -143,6 +143,11 @@
<artifactId>ruoyi-api-workflow</artifactId> <artifactId>ruoyi-api-workflow</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-server</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId> <artifactId>ruoyi-common-core</artifactId>
......
...@@ -11,6 +11,8 @@ import org.dromara.common.core.utils.StreamUtils; ...@@ -11,6 +11,8 @@ import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.common.mybatis.service.AbstractBaseService; import org.dromara.common.mybatis.service.AbstractBaseService;
import org.dromara.server.api.RemoteYsOrderService;
import org.dromara.server.api.domain.RemoteOrderApprove;
import org.dromara.workflow.api.domain.RemoteWorkflowService; import org.dromara.workflow.api.domain.RemoteWorkflowService;
import org.dromara.workflow.api.domain.event.ProcessEvent; import org.dromara.workflow.api.domain.event.ProcessEvent;
import org.dromara.workflow.api.domain.event.ProcessTaskEvent; import org.dromara.workflow.api.domain.event.ProcessTaskEvent;
...@@ -43,6 +45,8 @@ public class OrderApproveServiceImpl extends AbstractBaseService<OrderApproveVo, ...@@ -43,6 +45,8 @@ public class OrderApproveServiceImpl extends AbstractBaseService<OrderApproveVo,
@DubboReference @DubboReference
private final RemoteWorkflowService workflowService; private final RemoteWorkflowService workflowService;
@DubboReference
private final RemoteYsOrderService ysOrderService;
@Override @Override
public BaseMapperPlus<OrderApprove, OrderApproveVo> mapper() { public BaseMapperPlus<OrderApprove, OrderApproveVo> mapper() {
...@@ -103,6 +107,13 @@ public class OrderApproveServiceImpl extends AbstractBaseService<OrderApproveVo, ...@@ -103,6 +107,13 @@ public class OrderApproveServiceImpl extends AbstractBaseService<OrderApproveVo,
fa.setStatus(BusinessStatusEnum.WAITING.getStatus()); fa.setStatus(BusinessStatusEnum.WAITING.getStatus());
} }
baseMapper.updateById(fa); baseMapper.updateById(fa);
if (StringUtils.equals(fa.getStatus(), BusinessStatusEnum.FINISH.getStatus())) {
RemoteOrderApprove roa = new RemoteOrderApprove()
.setOrderId(fa.getOrderId())
.setOrderType(fa.getOrderType())
.setAuthId(fa.getAuthId());
ysOrderService.orderApprove(roa);
}
} }
/** /**
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论