Skip to content

O
order-group
Commit 168e5b66 by huiyang.chen
Options

candao

parent b6cb897a
Showing with 25 additions and 22 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -2612,6 +2612,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2612,6 +2612,7 @@ public class OrderServiceImpl implements Orderservice {
OrderRemindRequestDto dto =new OrderRemindRequestDto(); OrderRemindRequestDto dto =new OrderRemindRequestDto();
dto.setOrderKey(reminderVo.getOid()); dto.setOrderKey(reminderVo.getOid());
dto.setStoreId(userLoginInfoDto.getStoreId()); dto.setStoreId(userLoginInfoDto.getStoreId());
dto.setDeliveryChannel("CanDao");
QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto); QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto);
if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) { if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) {
return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR); return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR);
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
...@@ -167,28 +167,30 @@ public class OrderManagerAdapter { ...@@ -167,28 +167,30 @@ public class OrderManagerAdapter {
OrderStatus orderStatus = OrderStatus.getByCode(orderBean.getStatus()); OrderStatus orderStatus = OrderStatus.getByCode(orderBean.getStatus());
if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(),result.getCode())){ if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(),result.getCode())){
OperateType byOpType = OperateType.getByOpType(request.getOperateType()); OperateType byOpType = OperateType.getByOpType(request.getOperateType());
switch (byOpType) { if (byOpType != null) {
case ORDER_CONFIRM: switch (byOpType) {
orderStatus=OrderStatus.RECEIPT; case ORDER_CONFIRM:
break; orderStatus = OrderStatus.RECEIPT;
case ORDER_DONE: break;
orderStatus=OrderStatus.COMPLETE_MAKE; case ORDER_DONE:
break; orderStatus = OrderStatus.COMPLETE_MAKE;
case ORDER_SEND: break;
orderStatus=OrderStatus.DISTRIBUTION; case ORDER_SEND:
break; orderStatus = OrderStatus.DISTRIBUTION;
case ORDER_AFFIRM: break;
orderStatus=OrderStatus.COMPLETE; case ORDER_AFFIRM:
break; orderStatus = OrderStatus.COMPLETE;
case ORDER_REJECT: break;
case ORDER_AGREE_REFUND: case ORDER_REJECT:
orderStatus=OrderStatus.CANCEL; case ORDER_AGREE_REFUND:
refundStatus=RefundStatus.COMPLETE_REFUND; orderStatus = OrderStatus.CANCEL;
break; refundStatus = RefundStatus.COMPLETE_REFUND;
case ORDER_REJECT_REFUND: break;
refundStatus=RefundStatus.REFUSE_REFUND; case ORDER_REJECT_REFUND:
break; refundStatus = RefundStatus.REFUSE_REFUND;
default: break;
default:
}
} }
return ResponseUtil.success(new OrderManagerResponse(orderStatus,refundStatus)); return ResponseUtil.success(new OrderManagerResponse(orderStatus,refundStatus));
} }
......
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