20210818

xiaoyong931011

2021-08-18 a8fb0a175ff61c82819e7da191030c2f5e90ae98

 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java

@@ -61,17 +61,55 @@
    private IdUtils idUtils;

    public Map<String, Object> queryOrderList(QueryOrderListDto model) {
        String accountName = model.getName();
        String name = StrUtil.isEmpty(model.getName())?model.getName():StringUtils.encode(model.getName());
        String orderNo = model.getOrderNo();
        Integer status = model.getStatus() == null ? 0 : model.getStatus();
        List<Integer> status = new ArrayList<>();
        if(CollUtil.isNotEmpty(model.getStatus())){
            status = model.getStatus();
        }
        if(CollUtil.isEmpty(model.getStatus())){
            status.add(1);
            status.add(2);
            status.add(3);
            status.add(4);
            status.add(5);
            status.add(6);
        }
        Date createdTimeStart = model.getCreatedTimeStart();
        Date createdTimeEnd = model.getCreatedTimeEnd();
        PageHelper.startPage(model.getPage(), model.getLimit());
        List<QueryOrderListVo> maps = scoreOrderMapper.queryOrderList(name,orderNo,status,createdTimeStart,createdTimeEnd);
        Integer namePx = model.getNamePx() == null ? 2 : model.getNamePx();
        Integer typePx = model.getTypePx() == null ? 2 : model.getTypePx();
        List<QueryOrderListVo> maps = scoreOrderMapper.queryOrderList(name,accountName,orderNo,status,createdTimeStart,createdTimeEnd,namePx,typePx);
        if(CollUtil.isNotEmpty(maps)){
            for(QueryOrderListVo queryOrderListVo : maps){
                String decode = StringUtils.decode(queryOrderListVo.getName());
                queryOrderListVo.setName(decode);
                BigDecimal totalPrice = new BigDecimal(StrUtil.isEmpty(queryOrderListVo.getTotalPrice()) ? "0" : queryOrderListVo.getTotalPrice())
                        .setScale( 2, BigDecimal.ROUND_DOWN );
                queryOrderListVo.setTotalPrice(totalPrice.toString());

                Long id = queryOrderListVo.getId();
                Example example = new Example(ScoreOrderDetails.class);
                Example.Criteria criteria = example.createCriteria();
                criteria.andEqualTo("orderId",id);
                List<ScoreOrderDetails> scoreOrderDetails = scoreOrderDetailsMapper.selectByExample(example);
                if(CollUtil.isNotEmpty(scoreOrderDetails)){
                    queryOrderListVo.setOrderDetails(scoreOrderDetails);
//                    StringBuffer stringBuffer = new StringBuffer();
//                    for(ScoreOrderDetails scoreOrderDetail : scoreOrderDetails){
//                        String goodsName = scoreOrderDetail.getGoodsName();
//                        BigDecimal unitPrice = scoreOrderDetail.getUnitPrice();
//                        String sku = scoreOrderDetail.getSku();
//                        Integer cnt = scoreOrderDetail.getCnt();
//                        BigDecimal totalPriceOrderDetail = scoreOrderDetail.getTotalPrice();
//                        stringBuffer = stringBuffer.append(goodsName+"(")
//                                .append("规格："+sku+","+unitPrice.setScale( 2, BigDecimal.ROUND_DOWN ).toString()+"*"+cnt.toString()+",")
//                                .append("总价："+totalPriceOrderDetail.setScale( 2, BigDecimal.ROUND_DOWN ).toString()+";)");
//                    }
//                    queryOrderListVo.setOrderDetails(stringBuffer.toString());
                }
            }
        }
        PageInfo pageInfo = new PageInfo(maps);
@@ -150,9 +188,15 @@
    }

    public Long insureOrder(InsureOrderDto model) {
        long id = model.getId();
        ScoreOrder scoreOrderBefore = scoreOrderMapper.selectByPrimaryKey(id);
        ScoreOrder scoreOrder = new ScoreOrder();
        scoreOrder.setId(model.getId());
        scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
        if(ScoreOrder.STATUS_DOING == scoreOrderBefore.getStatus()){
            scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
        }
//        scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
        scoreOrder.setIsFinish(ScoreOrder.ISFINISH_YES);
        scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
        scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
        return scoreOrder.getId();
@@ -181,7 +225,6 @@
        }

        AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());

        if (accountInfo.getCollectScore() == null) {
            throw new RestException(-3, "积分不足");
        }
@@ -212,6 +255,7 @@
        orderDetails.setTotalPrice(totalPrice);
        orderDetails.setUnitPrice(sku.getPresentPrice());
        orderDetails.setGoodsId(goods.getId());
        orderDetails.setSkuId(sku.getId());
        orderDetails.setThumb(goods.getThumb());
        scoreOrderDetailsMapper.insert(orderDetails);

@@ -245,12 +289,12 @@
        scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING);
        scoreDetails.setOriginalScore(score);
        scoreDetails.setCurrentScore(remianScore);
        scoreDetails.setChangeScore(totalPrice);
        scoreDetails.setChangeScore(totalPrice.negate());
        scoreDetails.setCreatedTime(new Date());
        scoreDetailsMapper.insert(scoreDetails);

        sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
        sku.setQuantity(sku.getQuantity() - addGoodsOrderDto.getCnt());
        sku.setQuantity(sku.getQuantity() + addGoodsOrderDto.getCnt());
        scoreGoodsSkuMapper.updateByPrimaryKey(sku);
    }

@@ -328,7 +372,12 @@
            throw new RestException(-3, "暂不能确认收货");
        }

        scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
        if (ScoreOrder.ISFINISH_YES.equals(order.getIsFinish())) {
            scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DONE, userId);
        } else {
            scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
        }

    }

    public void cancelOrder(Long id, String userId) {