#feat 1

yanghui

2022-12-01 95d89cb6458deb0162b74bef2e577e2e5eda0623

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

@@ -427,7 +427,7 @@
            //查询自提点信息
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, phone));
            if (isNull(convenientElevatingPointDO)) {
                return R.ok();
                return R.ok("订单不在该自提点");
            }
            Long pointDOId = convenientElevatingPointDO.getId();
            shopOrderDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getId, orderId).eq(ComShopFlowerOrderDO::getPointId, pointDOId));
@@ -479,7 +479,10 @@
                orderGoodsVOS.add(orderGoodsVO);
                sbr.append(orderGoods.getGoodsName()).append(" ");
            });
            orderVO.setGoodsAttrPic(orderGoodsDOList.get(0).getGoodsAttrPic());
            orderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
        }

        orderVO.setOrderGoodsVOList(orderGoodsVOS);
        orderVO.setGoodsName(sbr.toString());

@@ -517,15 +520,33 @@
            }
        }
        //设置退款金额
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getOrderNo()));
        ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getId()));
        if (nonNull(comShopFlowerRefundOrderDO)) {
            orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
            orderVO.setRefundTime(comShopFlowerRefundOrderDO.getRefundTime());
        }

        //如果状态时取消状态，更新时间为去取消时间
        if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx) {
            orderVO.setCancelTime(shopOrderDO.getUpdateAt());
        }
        //判断是否可以退款 订单是否已超过15天 是否已有退款订单
        int count = comShopFlowerRefundOrderDAO.selectCountRefundNowByOrderId(orderId);
        if (count > 0){
            orderVO.setRefundable(2);
        }else {
            if (null == orderVO.getReceivingTime()){
                orderVO.setRefundable(2);
            }else {
                //收货时间往前推15天和当前时间做比较
                Date date = DateUtils.addDay(orderVO.getReceivingTime(), 15);
                if(date.before(new Date())){
                    orderVO.setRefundable(2);
                }
            }
        }



        return R.ok(orderVO);
    }
@@ -674,6 +695,12 @@
                orderOperateDO.setOperationBy("用户");
            }
            comShopFlowerOrderOperateDAO.insert(orderOperateDO);

            //一个自提订单算一个货
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(shopOrderDO.getPointId());
            convenientElevatingPointDO.setPrepareGoodsNum(convenientElevatingPointDO.getPrepareGoodsNum() - 1);
            convenientElevatingPointDO.setAlreadyGoodsNum(convenientElevatingPointDO.getAlreadyGoodsNum() + 1);
            convenientElevatingPointDAO.updateById(convenientElevatingPointDO);
            return R.ok();
        } else {
            return R.fail("确认收货失败");