Commit f484f5dd by 周晓航

【【老订单聚合、老购物车聚合】购物车、下单新增购物车行加料数量字段】

https://www.tapd.cn/43862731/prong/stories/view/1143862731001052565
parent e2f4a92a
...@@ -13,10 +13,7 @@ ...@@ -13,10 +13,7 @@
package cn.freemud.adapter; package cn.freemud.adapter;
import cn.freemud.base.util.DateUtil; import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.CommonsConstant; import cn.freemud.constant.*;
import cn.freemud.constant.CustomerScoreConstant;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.bo.CreateOrderBONew; import cn.freemud.entities.bo.CreateOrderBONew;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.order.CreateOrderOperateDto; import cn.freemud.entities.dto.order.CreateOrderOperateDto;
...@@ -96,8 +93,6 @@ import java.util.*; ...@@ -96,8 +93,6 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
@Component @Component
public class OrderAdapter { public class OrderAdapter {
...@@ -1855,7 +1850,7 @@ public class OrderAdapter { ...@@ -1855,7 +1850,7 @@ public class OrderAdapter {
break; break;
} }
} }
canRefund = ALLOW_REFUND.equals(orderRefund); canRefund = OrderRefundConstant.ALLOW_REFUND.equals(orderRefund);
// 如果是订单完成状态的 支持退款, 这里还需要校验一下是否在退款时间范围内 // 如果是订单完成状态的 支持退款, 这里还需要校验一下是否在退款时间范围内
if (OrderStatusV1.COMPLETE.getCode().equals(status.getCode()) && canRefund) { if (OrderStatusV1.COMPLETE.getCode().equals(status.getCode()) && canRefund) {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment