Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-28 236ee756261300273a2e98087c014745dea1acea

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

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,6 +32,7 @@
import java.util.*;
import java.util.stream.Collectors;

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

/**
@@ -365,13 +367,13 @@
                    BeanUtils.copyProperties(convenientMerchantDO, shopStoreVO);
                }
                orderVo.setConvenientMerchantVO(shopStoreVO);
                //已完成、已退款才有评论 TODO
//        if (ComShopFlowerOrderDO.status.ywc == shopOrderDO.getStatus() || ComShopFlowerOrderDO.status.ytk == shopOrderDO.getStatus()) {
                ComShopFlowerEvaluateVO comShopFlowerEvaluateVO = comShopFlowerEvaluateDAO.selectByOrderNo(orderVo.getOrderNo());
                if (nonNull(comShopFlowerEvaluateVO)) {
                    orderVo.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
                //已完成、已退款才有评论
                if (ComShopFlowerOrderDO.status.ywc == orderVo.getStatus() || ComShopFlowerOrderDO.status.ytk == orderVo.getStatus()) {
                    ComShopFlowerEvaluateVO comShopFlowerEvaluateVO = comShopFlowerEvaluateDAO.selectByOrderNo(orderVo.getOrderNo());
                    if (nonNull(comShopFlowerEvaluateVO)) {
                        orderVo.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
                    }
                }
//            }
            });
        }
        return R.ok(orderPageVOIPage);
@@ -384,11 +386,23 @@
     * @return 订单详情
     */
    @Override
    public R orderDetail(Long orderId) {

    public R orderDetail(Long orderId, String phone) {
        ComShopFlowerOrderPageVO orderVO = new ComShopFlowerOrderPageVO();
        // 查询订单信息
        ComShopFlowerOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
        ComShopFlowerOrderDO shopOrderDO = null;
        if (StrUtil.isEmpty(phone)) {
            // 查询订单信息
            shopOrderDO = this.baseMapper.selectById(orderId);
        } else {
            //查询自提点信息
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, phone));
            if (isNull(convenientElevatingPointDO)) {
                return R.fail("自提点不存在");
            }
            Long pointDOId = convenientElevatingPointDO.getId();
            shopOrderDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getId, orderId).eq(ComShopFlowerOrderDO::getPointId, pointDOId));
        }


        if (shopOrderDO == null) {
            return R.fail("未查询到订单");
        }
@@ -464,17 +478,22 @@
            BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
            orderVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
        }
        //已完成、已退款才有评论 TODO
//        if (ComShopFlowerOrderDO.status.ywc == shopOrderDO.getStatus() || ComShopFlowerOrderDO.status.ytk == shopOrderDO.getStatus()) {
        //已完成、已退款才有评论
        if (ComShopFlowerOrderDO.status.ywc == shopOrderDO.getStatus() || ComShopFlowerOrderDO.status.ytk == shopOrderDO.getStatus()) {
            ComShopFlowerEvaluateVO comShopFlowerEvaluateVO = comShopFlowerEvaluateDAO.selectByOrderNo(shopOrderDO.getOrderNo());
            if (nonNull(comShopFlowerEvaluateVO)) {
                orderVO.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
            }
//        }
        }
        //设置退款金额
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getOrderNo()));
        if (nonNull(comShopFlowerRefundOrderDO)){
        if (nonNull(comShopFlowerRefundOrderDO)) {
            orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
        }

        //如果状态时取消状态，更新时间为去取消时间
        if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx) {
            orderVO.setCancelTime(shopOrderDO.getUpdateAt());
        }

        return R.ok(orderVO);
@@ -494,69 +513,71 @@
        if (shopOrderDO == null) {
            return R.fail("未查询到订单");
        }
        if (!shopOrderDO.getStatus().equals(ComShopFlowerOrderDO.status.ddps)) {
            return R.fail("已配送订单不可取消");
        }
        // 取消订单
        shopOrderDO.setStatus(ComShopFlowerOrderDO.status.yqx);
        //退款
        String refundNo = WXPayUtil.generateNonceStr();
        try {
            String refundStr = WxPayUtils.refund(appid, mchId, shopOrderDO.getOrderNo(), shopOrderDO.getPayAmount(),
                    shopOrderDO.getPayAmount(), refundNo, isTest);
            log.info("退款请求接口返回参数:{}", refundStr);
            Map<String, String> mapResult = WXPayUtil.xmlToMap(refundStr);
            if (CollUtil.isNotEmpty(mapResult)) {
                String return_code = (String) mapResult.get("return_code");
                String result_code = (String) mapResult.get("result_code");
                String return_msg = mapResult.get("return_msg");
                ComShopFlowerOrderPayDO orderPayDO = new ComShopFlowerOrderPayDO();
        if (shopOrderDO.getStatus().equals(ComShopFlowerOrderDO.status.ddps)||shopOrderDO.getStatus().equals(ComShopFlowerOrderDO.status.dfh)) {
            // 取消订单
            shopOrderDO.setStatus(ComShopFlowerOrderDO.status.yqx);
            //退款
            String refundNo = WXPayUtil.generateNonceStr();
            try {
                String refundStr = WxPayUtils.refund(appid, mchId, shopOrderDO.getOrderNo(), shopOrderDO.getPayAmount(),
                        shopOrderDO.getPayAmount(), refundNo, isTest);
                log.info("退款请求接口返回参数:{}", refundStr);
                Map<String, String> mapResult = WXPayUtil.xmlToMap(refundStr);
                if (CollUtil.isNotEmpty(mapResult)) {
                    String return_code = (String) mapResult.get("return_code");
                    String result_code = (String) mapResult.get("result_code");
                    String return_msg = mapResult.get("return_msg");
                    ComShopFlowerOrderPayDO orderPayDO = new ComShopFlowerOrderPayDO();

                orderPayDO.setOrderNo(shopOrderDO.getOrderNo());
                orderPayDO.setOrderAmount(shopOrderDO.getTotalAmount());
                orderPayDO.setPayTime(new Date());
                orderPayDO.setStoreId(shopOrderDO.getStoreId());
                orderPayDO.setDeliveryType(shopOrderDO.getDeliveryType());
                orderPayDO.setOrderId(shopOrderDO.getId());
                orderPayDO.setPayType(ComShopFlowerOrderPayDO.payType.qx);
                if ("SUCCESS".equals(return_code) && return_code.equals(result_code)) {
                    //退款成功
                    // 添加订单支付记录表
                    orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.yes);
                    orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tkcg);
                    orderPayDO.setOrderNo(shopOrderDO.getOrderNo());
                    orderPayDO.setOrderAmount(shopOrderDO.getTotalAmount());
                    orderPayDO.setPayTime(new Date());
                    orderPayDO.setStoreId(shopOrderDO.getStoreId());
                    orderPayDO.setDeliveryType(shopOrderDO.getDeliveryType());
                    orderPayDO.setOrderId(shopOrderDO.getId());
                    orderPayDO.setPayType(ComShopFlowerOrderPayDO.payType.qx);
                    if ("SUCCESS".equals(return_code) && return_code.equals(result_code)) {
                        //退款成功
                        // 添加订单支付记录表
                        orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.yes);
                        orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tkcg);

                } else {
                    //退款失败
                    // 添加订单支付记录表
                    orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.no);
                    orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tksb);
                    shopOrderDO.setRemark(shopOrderDO.getRemark() + "_" + return_msg);
                    } else {
                        //退款失败
                        // 添加订单支付记录表
                        orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.no);
                        orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tksb);
                        shopOrderDO.setRemark(shopOrderDO.getRemark() + "_" + return_msg);
                    }
                    comShopFlowerOrderPayDAO.insert(orderPayDO);
                }
                comShopFlowerOrderPayDAO.insert(orderPayDO);
            } catch (Exception e) {
                log.error("申请退款失败，" + e.getMessage());
                e.printStackTrace();
                return R.fail("取消订单失败");
            }
        } catch (Exception e) {
            log.error("申请退款失败，" + e.getMessage());
            e.printStackTrace();
            return R.fail("取消订单失败");
        }
        if (this.baseMapper.updateById(shopOrderDO) > 0) {
            // 添加订单操作记录
            ComShopFlowerOrderOperateDO orderOperateDO = new ComShopFlowerOrderOperateDO();
            orderOperateDO.setOrderNo(shopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.cancel);
            orderOperateDO.setOperationTime(new Date());
            if (comShopOrderQueryDTO.getIsAdmin()) {
                orderOperateDO.setOperationContent("管理员" + comShopOrderQueryDTO.getOperUserAccount() + "取消订单");
                orderOperateDO.setOperationBy("用户" + comShopOrderQueryDTO.getOperUserAccount());
            if (this.baseMapper.updateById(shopOrderDO) > 0) {
                // 添加订单操作记录
                ComShopFlowerOrderOperateDO orderOperateDO = new ComShopFlowerOrderOperateDO();
                orderOperateDO.setOrderNo(shopOrderDO.getOrderNo());
                orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.cancel);
                orderOperateDO.setOperationTime(new Date());
                if (comShopOrderQueryDTO.getIsAdmin()) {
                    orderOperateDO.setOperationContent("管理员" + comShopOrderQueryDTO.getOperUserAccount() + "取消订单");
                    orderOperateDO.setOperationBy("用户" + comShopOrderQueryDTO.getOperUserAccount());
                } else {
                    orderOperateDO.setOperationContent("用户取消订单");
                    orderOperateDO.setOperationBy("用户");
                }
                comShopFlowerOrderOperateDAO.insert(orderOperateDO);
                return R.ok();
            } else {
                orderOperateDO.setOperationContent("用户取消订单");
                orderOperateDO.setOperationBy("用户");
                return R.fail("取消订单失败");
            }
            comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            return R.ok();
        } else {
            return R.fail("取消订单失败");
        }else {
            return R.fail("该订单不可取消");
        }


    }

@@ -641,7 +662,7 @@
        if (comShopOrderDO == null) {
            return R.fail("订单不存在");
        }
        if (!(comShopOrderDO.getStatus() == 1) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
        if (!(comShopOrderDO.getStatus() == ComShopFlowerOrderDO.status.dfh) || (comShopOrderDO.getDeliveryStatus() == ComShopFlowerOrderDO.deliveryStatus.yes)) {
            return R.fail("订单发货失败,订单状态不允许发货");
        }

@@ -662,13 +683,9 @@
            orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopFlowerOrderOperateDO.operationType.deliver);
            orderOperateDO.setOperationTime(new Date());
            if (orderShipDTO.getIsAdmin()) {
                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            } else {
                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            }

            orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
            orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            if (inserted != 1) {
                log.error("订单发货日志保存错误");
@@ -795,9 +812,9 @@
            log.error("未查询到支付订单,订单回调失败,订单号:" + wxPayNotifyOrderDTO.getOrderTradeNo());
            return;
        }
        if (ComShopFlowerOrderDO.deliveryType.store == shopOrderDO.getDeliveryType()){
        if (ComShopFlowerOrderDO.deliveryType.store == shopOrderDO.getDeliveryType()) {
            shopOrderDO.setStatus(ComShopFlowerOrderDO.status.ddps);
        }else {
        } else {
            shopOrderDO.setStatus(ComShopFlowerOrderDO.status.dfh);
        }

@@ -909,10 +926,10 @@
        IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByStoreId(page, pageComFlowerOrderListDTO);
        if (!orderPageVOIPage.getRecords().isEmpty()) {
            orderPageVOIPage.getRecords().forEach(orderVo -> {
                if (null!=orderVo.getPointId()){
                if (null != orderVo.getPointId()) {
                    ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(orderVo.getPointId());
                    ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
                    BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
                    BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
                    orderVo.setConvenientElevatingPointVO(convenientElevatingPointVO);
                }
            });
@@ -922,8 +939,8 @@

    @Override
    public R selectCountByDeliveryType(Integer deliveryType, Long userId) {
        //1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款 8.总订单
        String[] statusStr = {"ddps", "psz", "dsh", "dpj", "ywc", "yqx", "ytk"};
        //1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款 8.待发货
        String[] statusStr = {"ddps", "psz", "dsh", "dpj", "ywc", "yqx", "ytk", "dfh"};
        ConvenientMerchantVO convenientMerchantVO = convenientMerchantDAO.selectMerchantByUserId(userId);
        List<ComShopOrderCountVO> comShopOrderCountVOS = this.baseMapper.selectCountByDeliveryType(deliveryType, convenientMerchantVO.getId());
        Map<Integer, Integer> collect = comShopOrderCountVOS.stream().collect(Collectors.toMap(ComShopOrderCountVO::getStatus, ComShopOrderCountVO::getAmount));
@@ -1011,8 +1028,8 @@
        return R.ok(retMap);
    }

    public R selectOrderLineChart(Long storeId, Integer type,Integer tab) {
        if (tab == 1){
    public R selectOrderLineChart(Long storeId, Integer type, Integer tab) {
        if (tab == 1) {
            if (1 == type) {
                //近15天的订单量
                int days = 15;
@@ -1033,7 +1050,7 @@
                }
                return R.ok(retMap);
            }
        }else if (2==tab){
        } else if (2 == tab) {
            if (1 == type) {
                //近15天的营收
                int days = 15;
@@ -1090,12 +1107,12 @@
        ComShopFlowerOrderDeliveryNoListVO comShopFlowerOrderDeliveryNoListVO = new ComShopFlowerOrderDeliveryNoListVO();
        ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = comShopFlowerOrderDeliveryDAO.selectById(pageComFlowerOrderListDTO.getDeliveryId());
        ComShopFlowerOrderDeliveryVO comShopFlowerOrderDeliveryVO = new ComShopFlowerOrderDeliveryVO();
        BeanUtils.copyProperties(comShopFlowerOrderDeliveryDO,comShopFlowerOrderDeliveryVO);
        BeanUtils.copyProperties(comShopFlowerOrderDeliveryDO, comShopFlowerOrderDeliveryVO);

        Long pointId = comShopFlowerOrderDeliveryDO.getPointId();
        ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
        ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
        BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
        BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
        comShopFlowerOrderDeliveryVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
        comShopFlowerOrderDeliveryNoListVO.setComShopFlowerOrderDeliveryVO(comShopFlowerOrderDeliveryVO);
        comShopFlowerOrderDeliveryNoListVO.setPage(orderPageVOIPage);