szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop

This commit is contained in:
Owen 2025-01-11 23:51:19 +08:00
parent c7119e4518 4c4038a647
commit b42bb50737
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-haoka/yudao-module-haoka-api/src/main/java/cn/iocoder/yudao/module/haoka/enums/ErrorCodeConstants.java
View File

@ -29,6 +29,7 @@ public interface ErrorCodeConstants {
ErrorCode ON_SALE_PRODUCT_NOT_EXISTS = new ErrorCode(1_801_001_021, "在售产品不存在");
ErrorCode ORDERS_NOT_EXISTS = new ErrorCode(1_805_001_001, "订单不存在");
ErrorCode ORDERS_NOT_AUDIT = new ErrorCode(1_805_001_001, "订单不能进行审核");
ErrorCode ORDER_SOURCE_NOT_EXISTS = new ErrorCode(1_805_002_001, "订单来源配置不存在");
ErrorCode ORDER_SOURCE_LIVE_NOT_EXISTS = new ErrorCode(1_805_003_001, "订单来源-直播间配置不存在");

11
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
View File

@ -20,6 +20,7 @@ import cn.iocoder.yudao.module.haoka.service.smstask.SmsTaskService;
import cn.iocoder.yudao.module.haoka.utils.IdCardAgeCalculator;
import cn.iocoder.yudao.module.haoka.utils.SnowflakeId;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@ -34,6 +35,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.haoka.dal.mysql.orders.OrdersMapper;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -269,6 +271,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
public void auditOrders(OrdersSaveReqVO updateReqVO) {
// 校验存在
validateOrdersExists(updateReqVO.getId());
// 校验是否可以审核
validateOrdersIfAudit(updateReqVO.getId());
// 更新
OrdersDO updateObj = BeanUtils.toBean(updateReqVO, OrdersDO.class);
// 判断自动发货还是手动发货 根据在售产品查询产品配置中的发货类型
@ -392,6 +396,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
throw exception(ORDERS_NOT_EXISTS);
}
}
private void validateOrdersIfAudit(Long id) {
OrdersDO ordersDO = ordersMapper.selectById(id);
ArrayList<Long> longs = Lists.newArrayList(120L, 125L, 200L);
if (longs.contains(ordersDO.getStatus())) {
throw exception(ORDERS_NOT_AUDIT);
}
}
@Override
public OrdersDO getOrders(Long id) {