Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

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

@@ -79,6 +79,8 @@
    private WxMaConfiguration wxMaConfiguration;
    @Resource
    private UserService userService;
    @Resource
    private ConvenientElevatingPointDAO convenientElevatingPointDAO;


    @Override
@@ -113,6 +115,15 @@
        IPage<ComShopFlowerRefundOrderVO> pages = this.baseMapper.pageRefundOrder(page, pageComOrderRefundDTO);
        for (ComShopFlowerRefundOrderVO comShopFlowerRefundOrderVO : pages.getRecords()) {
            String orderNo = comShopFlowerRefundOrderVO.getOrderNo();
            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
@@ -125,7 +136,7 @@
                    orderGoodsVO.setNum(orderGoods.getAmount());
                    orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
                    orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());

                    orderGoodsVO.setGoodsAttr(orderGoods.getGoodsAttrName());
                    orderGoodsVOS.add(orderGoodsVO);
                    sbr.append(orderGoods.getGoodsName()).append(" ");
                });
@@ -141,6 +152,8 @@
                BeanUtils.copyProperties(shopStoreDO, shopStoreVO);
            }
            comShopFlowerRefundOrderVO.setConvenientMerchantVO(shopStoreVO);
            comShopFlowerRefundOrderVO.setStoreName(shopStoreVO.getName());

        }
        return R.ok(pages);
    }
@@ -193,7 +206,7 @@
                        comShopFlowerOrderDAO.updateById(comShopFlowerOrderDO);

                        //退款成功发送消息
                        sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家同意退款");
                        sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"同意退款");
                    }else {
                        //退款失败
                        comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
@@ -202,7 +215,7 @@
                        orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.no);
                        orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tksb);
                        //退款失败发送消息
                        sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"微信退款失败");
                        sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"退款失败");
                    }
                    comShopFlowerOrderPayDAO.insert(orderPayDO);
                }
@@ -216,7 +229,7 @@
            comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
            comShopFlowerRefundOrderDO.setHandleResult(ComShopFlowerRefundOrderDO.handleResult.refuse);
            //拒绝退款发送消息
            sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家拒绝退款");
            sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"拒绝退款");
        }
        this.baseMapper.updateById(comShopFlowerRefundOrderDO);
        return R.ok();