Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 c168f544ecd041760e7d0fba66c48e06b9ab67dc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java

@@ -115,10 +115,15 @@
        IPage<ComShopFlowerRefundOrderVO> pages = this.baseMapper.pageRefundOrder(page, pageComOrderRefundDTO);
        for (ComShopFlowerRefundOrderVO comShopFlowerRefundOrderVO : pages.getRecords()) {
            String orderNo = comShopFlowerRefundOrderVO.getOrderNo();
            ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderVO.getId());
            comShopFlowerRefundOrderVO.setTotalAmount(comShopFlowerOrderDO.getTotalAmount());
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(comShopFlowerOrderDO.getPointId());
            comShopFlowerRefundOrderVO.setPointName(convenientElevatingPointDO.getName());
            ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderVO.getOrderId());
            if (nonNull(comShopFlowerOrderDO)){
                comShopFlowerRefundOrderVO.setTotalAmount(comShopFlowerOrderDO.getTotalAmount());
                ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(comShopFlowerOrderDO.getPointId());
                if (nonNull(convenientElevatingPointDO)){
                    comShopFlowerRefundOrderVO.setPointName(convenientElevatingPointDO.getName());
                }
            }

            List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>();
            // 查询订单下商品信息
            List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO
@@ -140,14 +145,15 @@
            comShopFlowerRefundOrderVO.setOrderGoodsVOList(orderGoodsVOS);
            comShopFlowerRefundOrderVO.setGoodsName(sbr.toString());

            ConvenientMerchantVO shopStoreVO = new ConvenientMerchantVO();

            // 查询店铺信息
/*           ConvenientMerchantVO shopStoreVO = new ConvenientMerchantVO();
            ConvenientMerchantDO shopStoreDO = convenientMerchantDAO.selectById(comShopFlowerRefundOrderVO.getStoreId());
            if (shopStoreDO != null) {
                BeanUtils.copyProperties(shopStoreDO, shopStoreVO);
            }
            comShopFlowerRefundOrderVO.setConvenientMerchantVO(shopStoreVO);
            comShopFlowerRefundOrderVO.setStoreName(shopStoreVO.getName());
*/

        }
        return R.ok(pages);