Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596

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

@@ -176,11 +176,12 @@
            }
        }else{//查询到用户上一笔订单
            ComShopUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
            ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
            BeanUtils.copyProperties(userAddressDO,userAddressVO);
            orderPreviewVO.setUserAddressVO(userAddressVO);
            if(userAddressDO != null){
                ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
                BeanUtils.copyProperties(userAddressDO,userAddressVO);
                orderPreviewVO.setUserAddressVO(userAddressVO);
            }
        }

        return R.ok(orderPreviewVO);
    }

@@ -369,6 +370,7 @@
        //查询订单下商品信息
        List<ComShopOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO.selectList(new QueryWrapper<ComShopOrderGoodsDO>()
                .eq("order_no",shopOrderDO.getOrderNo()));
        StringBuilder sbr = new StringBuilder("");
        if(!orderGoodsDOList.isEmpty()){
            orderGoodsDOList.forEach(orderGoods -> {
                ComShopOrderGoodsVO orderGoodsVO = new ComShopOrderGoodsVO();
@@ -377,9 +379,11 @@
                orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
                orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
                orderGoodsVOS.add(orderGoodsVO);
                sbr.append(orderGoods.getGoodsName() + " " );
            });
        }
        orderVO.setOrderGoodsVOList(orderGoodsVOS);
        orderVO.setGoodsName(sbr.toString());

        ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
        //查询用户收货地址
@@ -389,6 +393,15 @@
            orderVO.setUserAddressVO(userAddressVO);
        }

        //操作日志
        List<ComShopOrderOperateDO> listOperLog = comShopOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopOrderOperateDO>().eq(ComShopOrderOperateDO::getOrderNo, shopOrderDO.getOrderNo()));
        List<ComShopOrderOperateVO> listOperLogVO = new ArrayList<>(listOperLog.size());
        listOperLog.forEach(logDO ->{
            ComShopOrderOperateVO copyVO = new ComShopOrderOperateVO();
            BeanUtils.copyProperties(logDO,copyVO);
            listOperLogVO.add(copyVO);
        });
        orderVO.setLogs(listOperLogVO);
        return R.ok(orderVO);
    }

@@ -606,6 +619,12 @@
    @Override
    public R getFundsStat(Long userId) {
        ComShopFundsVO comShopFundsVO = comShopOrderDAO.queryStatis(userId);
        if(comShopFundsVO==null){
            comShopFundsVO = new ComShopFundsVO();
            comShopFundsVO.setMonthTotal(new BigDecimal(0));
            comShopFundsVO.setTodayTotal(new BigDecimal(0));
            comShopFundsVO.setWeekTotal(new BigDecimal(0));
        }
        return R.ok(comShopFundsVO);
    }

@@ -675,9 +694,9 @@
        shopOrderDO.setStatus(ComShopOrderDO.status.dfh);
        shopOrderDO.setPayType(ComShopOrderDO.payType.wx);
        shopOrderDO.setPayStatus(ComShopOrderDO.payStatus.yes);
        shopOrderDO.setPayAmount(BigDecimal.valueOf(Integer.parseInt(wxPayNotifyOrderDTO.getCashFee()) * 100));
        shopOrderDO.setPayAmount(BigDecimal.valueOf(Integer.parseInt(wxPayNotifyOrderDTO.getCashFee()) / 100));
        shopOrderDO.setWxTardeNo(wxPayNotifyOrderDTO.getWxTradeNo());
        shopOrderDO.setPayTime(new Date(Long.parseLong(wxPayNotifyOrderDTO.getPayTime())));
        shopOrderDO.setPayTime(new Date(Long.parseLong(wxPayNotifyOrderDTO.getPayTime() + "000")));
        this.baseMapper.updateById(shopOrderDO);

        //查询订单商品
@@ -709,7 +728,6 @@
                comShopStoreDAO.updateById(storeDO);
            }
        }


        //添加订单操作记录
        ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();