Commit ba77020a5e6726bab530106cedb2265485ad7f84

Authored by fengliang
1 parent ff1c6b17

update:获取订单详情时增加已支付订单状态获取交易信息

etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
@@ -99,7 +99,9 @@ public class OrderQueryServiceImpl implements OrderQueryService { @@ -99,7 +99,9 @@ public class OrderQueryServiceImpl implements OrderQueryService {
99 orderDetail.setOrderCoupons(orderCouponService.getCouponDtoList(orderDetail.getOrder().getId(),orderDetail.getOrder().getMarketId())); 99 orderDetail.setOrderCoupons(orderCouponService.getCouponDtoList(orderDetail.getOrder().getId(),orderDetail.getOrder().getMarketId()));
100 //获取商品 100 //获取商品
101 orderDetail.setOrderGoods(orderGoodsService.getProductDtoByOrderIdPc(orderDetail.getOrder().getId(),orderGetDto.getMarketId(),OrderGoodState.NORMAL.getCodeInteger())); 101 orderDetail.setOrderGoods(orderGoodsService.getProductDtoByOrderIdPc(orderDetail.getOrder().getId(),orderGetDto.getMarketId(),OrderGoodState.NORMAL.getCodeInteger()));
102 - if(orderDetail.getOrder().getState()!=null&&orderDetail.getOrder().getState().equals(OrderState.FINISH.getCodeInteger())){ 102 + if(orderDetail.getOrder().getState()!=null&&(
  103 + orderDetail.getOrder().getState().equals(OrderState.FINISH.getCodeInteger())
  104 + ||orderDetail.getOrder().getState().equals(OrderState.PAY_FINISH.getCodeInteger()))){
103 //获取交易单 105 //获取交易单
104 orderDetail.setOrderPaymentDto(orderPaymentService.getPaymenDtoByOrderId(orderDetail.getOrder().getId(),orderDetail.getOrder().getMarketId(),OrderPaymentState.FINISH_PAY.getCodeInteger())); 106 orderDetail.setOrderPaymentDto(orderPaymentService.getPaymenDtoByOrderId(orderDetail.getOrder().getId(),orderDetail.getOrder().getMarketId(),OrderPaymentState.FINISH_PAY.getCodeInteger()));
105 } 107 }