CueOrder
This commit is contained in:
parent
0f4ae36549
commit
b72d0c9969
@ -184,32 +184,33 @@ public class CreateOrderManager {
|
|||||||
}
|
}
|
||||||
// 两种情况会导致退货 5不合格 6价格不满意
|
// 两种情况会导致退货 5不合格 6价格不满意
|
||||||
// 检查当前状态
|
// 检查当前状态
|
||||||
if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
|
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL.value()) || Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
|
||||||
|
CueOrder cueOrder = new CueOrder();
|
||||||
|
cueOrder.setOrderId(orderId);
|
||||||
|
// 需要向order_addr插入一条数据
|
||||||
|
ServerResponseEntity<UserAddrVO> userAddrVO = userAddrFeignClient.cueGetUserAddrByAddrId(cueFillAddrDTO.getAddrId(), cueOrderVO.getUserId());
|
||||||
|
if (userAddrVO.isSuccess()) {
|
||||||
|
// 将地址信息插入到order_addr中
|
||||||
|
OrderAddrVO orderAddrVO = BeanUtil.toBean(userAddrVO, OrderAddrVO.class);
|
||||||
|
orderAddrVO.setUserId(cueOrderVO.getUserId());
|
||||||
|
ServerResponseEntity<Long> longServerResponseEntity = orderAddrFeignClient.addCueAddr(orderAddrVO);
|
||||||
|
if (longServerResponseEntity.isSuccess()) {
|
||||||
|
cueOrder.setOrderAddrId(longServerResponseEntity.getData());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
|
||||||
|
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value());
|
||||||
|
} else {
|
||||||
|
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value());
|
||||||
|
}
|
||||||
|
|
||||||
|
cueOrder.setUpdateTime(DateUtil.date());
|
||||||
|
cueOrderMapper.update(cueOrder);
|
||||||
|
this.updateOrderMall(null, cueOrderVO.getMallOrderId(), cueOrder.getOrderStatus());
|
||||||
|
} else {
|
||||||
throw new LuckException("状态已变更,请检查!");
|
throw new LuckException("状态已变更,请检查!");
|
||||||
}
|
}
|
||||||
|
|
||||||
CueOrder cueOrder = new CueOrder();
|
|
||||||
cueOrder.setOrderId(orderId);
|
|
||||||
// 需要向order_addr插入一条数据
|
|
||||||
ServerResponseEntity<UserAddrVO> userAddrVO = userAddrFeignClient.cueGetUserAddrByAddrId(cueFillAddrDTO.getAddrId(), cueOrderVO.getUserId());
|
|
||||||
if (userAddrVO.isSuccess()) {
|
|
||||||
// 将地址信息插入到order_addr中
|
|
||||||
OrderAddrVO orderAddrVO = BeanUtil.toBean(userAddrVO, OrderAddrVO.class);
|
|
||||||
orderAddrVO.setUserId(cueOrderVO.getUserId());
|
|
||||||
ServerResponseEntity<Long> longServerResponseEntity = orderAddrFeignClient.addCueAddr(orderAddrVO);
|
|
||||||
if (longServerResponseEntity.isSuccess()) {
|
|
||||||
cueOrder.setOrderAddrId(longServerResponseEntity.getData());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS.value())) {
|
|
||||||
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value());
|
|
||||||
} else {
|
|
||||||
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value());
|
|
||||||
}
|
|
||||||
|
|
||||||
cueOrder.setUpdateTime(DateUtil.date());
|
|
||||||
cueOrderMapper.update(cueOrder);
|
|
||||||
this.updateOrderMall(null, cueOrderVO.getMallOrderId(), cueOrder.getOrderStatus());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -222,28 +223,30 @@ public class CreateOrderManager {
|
|||||||
if (ObjectUtil.isNull(cueOrderVO)) {
|
if (ObjectUtil.isNull(cueOrderVO)) {
|
||||||
throw new LuckException("订单不存在,请检查!");
|
throw new LuckException("订单不存在,请检查!");
|
||||||
}
|
}
|
||||||
if (!Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value()) || !Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value())) {
|
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value()) || Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_SUCCESS_PRICE_DISCONTENT.value())) {
|
||||||
|
|
||||||
|
CueOrder cueOrder = new CueOrder();
|
||||||
|
cueOrder.setOrderId(cueRetractedDTO.getOrderId());
|
||||||
|
cueOrder.setOutletConfigId(cueRetractedDTO.getOutletConfigId());
|
||||||
|
cueOrder.setPrinterId(cueRetractedDTO.getPrinterId());
|
||||||
|
CurOderReturnsDTO curOderReturnsDTO = new CurOderReturnsDTO();
|
||||||
|
curOderReturnsDTO.setOrderId(cueOrderVO.getMallOrderId());
|
||||||
|
curOderReturnsDTO.setOutletConfigId(cueRetractedDTO.getOutletConfigId());
|
||||||
|
curOderReturnsDTO.setPrinterId(cueRetractedDTO.getPrinterId());
|
||||||
|
curOderReturnsDTO.setOrderAddrId(cueOrderVO.getOrderAddrId());
|
||||||
|
ServerResponseEntity<String> stringServerResponseEntity = deliveryFeignClient.curOderReturns(curOderReturnsDTO);
|
||||||
|
if (stringServerResponseEntity.isSuccess()) {
|
||||||
|
cueOrder.setBackTrackingNumber(stringServerResponseEntity.getData());
|
||||||
|
}
|
||||||
|
// 判断状态
|
||||||
|
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value())) {
|
||||||
|
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_FAIL_COMPLETED.value());
|
||||||
|
} else {
|
||||||
|
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value());
|
||||||
|
}
|
||||||
|
cueOrderMapper.update(cueOrder);
|
||||||
|
} else {
|
||||||
throw new LuckException("状态已变更,请检查!");
|
throw new LuckException("状态已变更,请检查!");
|
||||||
}
|
}
|
||||||
CueOrder cueOrder = new CueOrder();
|
|
||||||
cueOrder.setOrderId(cueRetractedDTO.getOrderId());
|
|
||||||
cueOrder.setOutletConfigId(cueRetractedDTO.getOutletConfigId());
|
|
||||||
cueOrder.setPrinterId(cueRetractedDTO.getPrinterId());
|
|
||||||
CurOderReturnsDTO curOderReturnsDTO = new CurOderReturnsDTO();
|
|
||||||
curOderReturnsDTO.setOrderId(cueOrderVO.getMallOrderId());
|
|
||||||
curOderReturnsDTO.setOutletConfigId(cueRetractedDTO.getOutletConfigId());
|
|
||||||
curOderReturnsDTO.setPrinterId(cueRetractedDTO.getPrinterId());
|
|
||||||
curOderReturnsDTO.setOrderAddrId(cueOrderVO.getOrderAddrId());
|
|
||||||
ServerResponseEntity<String> stringServerResponseEntity = deliveryFeignClient.curOderReturns(curOderReturnsDTO);
|
|
||||||
if (stringServerResponseEntity.isSuccess()) {
|
|
||||||
cueOrder.setBackTrackingNumber(stringServerResponseEntity.getData());
|
|
||||||
}
|
|
||||||
// 判断状态
|
|
||||||
if (Objects.equals(cueOrderVO.getOrderStatus(), OrderStatus.CUE_EVALUATION_FAIL_FILLED_RETURN_ADDRESS.value())) {
|
|
||||||
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_FAIL_COMPLETED.value());
|
|
||||||
} else {
|
|
||||||
cueOrder.setOrderStatus(OrderStatus.CUE_EVALUATION_SUCCESS_COMPLETED.value());
|
|
||||||
}
|
|
||||||
cueOrderMapper.update(cueOrder);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user