20220902

xiaoyong931011

2022-09-08 ab6603d889f482459c1812e52ce2c5c04fe8e3e7

 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);
    }

    /**
     * 订单列表
     *
@@ -327,6 +342,7 @@
            String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
            orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
            orderStateDto.setAmount(mallOrderInfo.getAmount().toString());
            orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getCode());
            orderStateDto.setTemplateId(dataDictionaryCustom.getValue());