feat(config): 添加新的glt2环境配置并调整订单状态逻辑
- 新增 application-glt2.yml 环境配置文件 - 将默认激活环境从 dev 切换到 glt2 - 更新数据库连接地址和 Redis 配置 - 调整订单退款状态验证逻辑 - 修改订单状态判断条件以支持退款流程优化
This commit is contained in:
@@ -320,8 +320,7 @@ public class ShopOrderController extends BaseController {
|
||||
// 退款相关操作单独走退款接口,便于做财务权限隔离
|
||||
if (Objects.equals(shopOrder.getOrderStatus(), 4)
|
||||
|| Objects.equals(shopOrder.getOrderStatus(), 5)
|
||||
|| Objects.equals(shopOrder.getOrderStatus(), 6)
|
||||
|| Objects.equals(shopOrder.getOrderStatus(), 7)) {
|
||||
|| Objects.equals(shopOrder.getOrderStatus(), 6)) {
|
||||
return fail("退款相关操作请使用退款接口: PUT /api/shop/shop-order/refund");
|
||||
}
|
||||
ShopOrder shopOrderNow = shopOrderService.getById(shopOrder.getOrderId());
|
||||
@@ -425,8 +424,8 @@ public class ShopOrderController extends BaseController {
|
||||
if (req == null || req.getOrderId() == null || req.getOrderStatus() == null) {
|
||||
return fail("orderId 和 orderStatus 不能为空");
|
||||
}
|
||||
if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 6)) {
|
||||
return fail("orderStatus 仅支持 4(申请退款) 或 6(同意退款)");
|
||||
if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 6) && !Objects.equals(req.getOrderStatus(), 7)) {
|
||||
return fail("orderStatus 仅支持 4(申请退款) 或 6(同意退款) 或 7(客户端申请退款)");
|
||||
}
|
||||
|
||||
ShopOrder current = shopOrderService.getById(req.getOrderId());
|
||||
|
||||
Reference in New Issue
Block a user