blame | history | patch | commit | commitdiff | ignore whitespace
xiaoyong931011
2023-07-27 6b5d8c00ab9e3f96e4f577fabbde3bef351933da 
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java


@@ -13,10 +13,7 @@


import cc.mrbird.febs.mall.entity.*;


import cc.mrbird.febs.mall.mapper.*;


import cc.mrbird.febs.mall.service.*;


import cc.mrbird.febs.mall.vo.ApiLeaderListVo;


import cc.mrbird.febs.mall.vo.OrderDetailVo;


import cc.mrbird.febs.mall.vo.OrderListVo;


import cc.mrbird.febs.mall.vo.OrderRefundVo;


import cc.mrbird.febs.mall.vo.*;


import cc.mrbird.febs.pay.model.BrandWCPayRequestData;


import cc.mrbird.febs.pay.model.OrderStateDto;


import cc.mrbird.febs.pay.service.IPayService;


@@ -84,6 +81,7 @@


    private final MallElectronicFenceMapper mallElectronicFenceMapper;


    private final MallMemberWalletMapper mallMemberWalletMapper;


    private final MallRollPerkMapper mallRollPerkMapper;


    private final MallMoneyFlowMapper mallMoneyFlowMapper;




    @Override


    @Transactional(rollbackFor = Exception.class)


@@ -615,6 +613,9 @@


            long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);


            orderDetailVo.setRemainTime(remainTime);


        }


        String orderNo = orderInfo.getOrderNo();


        List<MoneyFlowVo> moneyFlowVos = mallMoneyFlowMapper.selectMoneyFlowByOrderNo(orderNo,orderInfo.getMemberId());


        orderDetailVo.setMoneyFlowVos(moneyFlowVos);


        return orderDetailVo;


    }