20220822

xiaoyong931011

2022-08-30 ce6fc16f568cc3c396e141f1f9a7e16d3abf802d

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -62,6 +62,21 @@
    private final MallMemberMapper mallMemberMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;



    /**
     * 订单多次退款列表
     *
     * @param mallRefundEntity
     * @param request
     * @return
     */
    @GetMapping("orderRefundList")
    public FebsResponse orderRefundList(MallRefundEntity mallRefundEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminMallOrderService.getOrderRefundListInPage(mallRefundEntity, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单列表
     *
@@ -321,7 +336,7 @@
            OrderStateDto orderStateDto = new OrderStateDto();
            orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
            String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
            orderStateDto.setGoodsName(StrUtil.sub(StrUtil.isEmpty(productNames)?"商品":productNames,0,10)+"...");
            orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
            orderStateDto.setOrderState("已送达");
            orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();