Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、编辑订单信息父订单来源改为从数据库取，解决上级无法编辑和子单编辑后类型变成主单问题；2、/order/main/page入参delete默认为false；

Browse Source
This commit is contained in:
gaoqr
2026-04-23 10:02:54 +08:00
parent 5d0879f9d8
commit 73ce01daa5
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java
+5 -1
View File
@@ -87,7 +87,11 @@ public class OrderPageReqVO extends PageParam {
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
@Schema(description = "是否作废", example = "0") @Schema(description = "是否作废", example = "0")
private Boolean deleted; private boolean deleted;
public boolean getDeleted() {
return deleted;
}
private Long organId; private Long organId;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+14 -5
View File
@@ -224,7 +224,7 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
public void updateOrder(OrderSaveReqVO updateReqVO) { public void updateOrder(OrderSaveReqVO updateReqVO) {
// 校验存在, 订单未删除 // 校验存在, 订单未删除
validateOrderExists(updateReqVO.getId(), getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()); OrderDO orderDO = validateOrderExists(updateReqVO.getId(), getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus());
//校验手机号是否合法 //校验手机号是否合法
validatePhoneNumber(updateReqVO.getPhoneNumber()); validatePhoneNumber(updateReqVO.getPhoneNumber());
@@ -232,7 +232,8 @@ public class OrderServiceImpl implements OrderService {
//验证自定义单号是否存在, 订单未删除 //验证自定义单号是否存在, 订单未删除
validateCustomOrderNoExists(updateReqVO.getCustomOrderNo(), updateReqVO.getId()); validateCustomOrderNoExists(updateReqVO.getCustomOrderNo(), updateReqVO.getId());
Long parentId = updateReqVO.getParentId(); Long orderParentId = orderDO.getParentId();
Long parentId = orderParentId == 0 ? null : orderParentId;
// 校验上级订单是否存在 // 校验上级订单是否存在
validateParentOrderExists(parentId); validateParentOrderExists(parentId);
@@ -273,7 +274,7 @@ public class OrderServiceImpl implements OrderService {
* @return * @return
*/ */
private Integer getOrderType(Long parentId, Integer orderType) { private Integer getOrderType(Long parentId, Integer orderType) {
if (ObjectUtil.isNotNull(parentId)) { if (ObjectUtil.isNotNull(parentId) && parentId != 0) {
if (!OrderTypeEnum.isSubType(orderType)) { if (!OrderTypeEnum.isSubType(orderType)) {
throw new ServiceException(ORDER_SUBTYPE_NOT_SUPPORT); throw new ServiceException(ORDER_SUBTYPE_NOT_SUPPORT);
} }
@@ -856,12 +857,20 @@ public class OrderServiceImpl implements OrderService {
} }
// 订单是否存在判断 /**
private void validateOrderExists(Long id, Long organId, Integer deleted) { * 订单是否存在判断
*
* @param id
* @param organId
* @param deleted
* @return
*/
private OrderDO validateOrderExists(Long id, Long organId, Integer deleted) {
OrderDO orderDO = orderMapper.selectOrderOne(id, organId, deleted); OrderDO orderDO = orderMapper.selectOrderOne(id, organId, deleted);
if (orderDO == null) { if (orderDO == null) {
throw new ServiceException(ORDER_NOT_EXISTS); throw new ServiceException(ORDER_NOT_EXISTS);
} }
return orderDO;
} }
/** /**