Commit 8078e4d8 by ping.wu

使用订单枚举OrderStatusV1装换订单状态

parent e809cb5a
...@@ -1790,6 +1790,7 @@ public class OrderSdkAdapter { ...@@ -1790,6 +1790,7 @@ public class OrderSdkAdapter {
return orderStatus; return orderStatus;
} }
@Deprecated //使用订单枚举OrderStatusV1装换
public Integer getNewOrderStatus(Integer orderStatus) { public Integer getNewOrderStatus(Integer orderStatus) {
if (orderStatus == null) { if (orderStatus == null) {
return null; return null;
......
...@@ -4417,8 +4417,7 @@ public class OrderAdapter { ...@@ -4417,8 +4417,7 @@ public class OrderAdapter {
if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) { if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) {
List<Integer> orderStatus = new ArrayList<>(); List<Integer> orderStatus = new ArrayList<>();
for (Integer orderStatuses : queryOrdersDto.getOrderStatuses()) { for (Integer orderStatuses : queryOrdersDto.getOrderStatuses()) {
OrderStatusV1.getNewCode(orderStatuses); orderStatus.add(OrderStatusV1.getNewCode(orderStatuses));
orderStatus.add(orderSdkAdapter.getNewOrderStatus(orderStatuses));
} }
queryOrdersDto.setOrderStatuses(orderStatus); queryOrdersDto.setOrderStatuses(orderStatus);
} }
......
...@@ -35,6 +35,7 @@ import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest; ...@@ -35,6 +35,7 @@ import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType; import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType; import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq; import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq; import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
...@@ -424,7 +425,7 @@ public class SaasMallOrderService extends UniversalOrderService { ...@@ -424,7 +425,7 @@ public class SaasMallOrderService extends UniversalOrderService {
request.setThirdOrderCode(requestVO.getThirdOrderCode()); request.setThirdOrderCode(requestVO.getThirdOrderCode());
request.setPayChannelType(requestVO.getPayChannelType()); request.setPayChannelType(requestVO.getPayChannelType());
if (requestVO.getOrderStatus() != null) { if (requestVO.getOrderStatus() != null) {
request.setOrderState(orderSdkAdapter.getNewOrderStatus(requestVO.getOrderStatus().getCode())); request.setOrderState(OrderStatusV1.getNewCode((requestVO.getOrderStatus().getCode())));
} }
if (requestVO.getPayStatus() != null) { if (requestVO.getPayStatus() != null) {
request.setPayState(requestVO.getPayStatus().getCode()); request.setPayState(requestVO.getPayStatus().getCode());
......
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