fix

Helius

2021-07-23 f2187e1fde463c5d8c99fa02ca13eb9240eea33e

 gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java

@@ -63,7 +63,9 @@
    public void addJhyOrder(AddJhyOrderDto orderDto) {
        JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
        if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
            throw new RestException(-3, "集货员不能下单");
            if (JhyInfo.IS_JHY_Y.equals(jhyInfo.getIsJhy())) {
                throw new RestException(-3, "集货员不能下单");
            }
        }

        AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
@@ -89,6 +91,18 @@
                address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
            }
        }

        List<JhyOrder> addressExist = jhyOrderMapper.selectJhyOrderListByStatus(StrUtil.split("1,2", ','), jhyOrder.getUserId());
        if (CollUtil.isNotEmpty(addressExist)) {
            for (JhyOrder order : addressExist) {
                String orderAddr = order.getArea() + order.getAddress();

                if (orderAddr.equals(address.toString())) {
                    throw new RestException(-3, "同一地址仅能有一单在进行中");
                }
            }
        }

        jhyOrder.setAddress(address.toString());

        jhyOrder.setUsername(addressInfo.getRelaName());
@@ -136,6 +150,8 @@
        JhyOrderDetailsVo detailsVo = new JhyOrderDetailsVo();
        BeanUtil.copyProperties(order, detailsVo);

        detailsVo.setLongitude(order.getLongitude());
        detailsVo.setLatitude(order.getLatitude());
        detailsVo.setAddress(order.getArea() + order.getAddress());
        detailsVo.setTotalPrice(total);
        detailsVo.setItems(items);
@@ -148,9 +164,17 @@
            throw new RestException(-3, "不是集货员");
        }

        if (JhyInfo.IS_JHY_N.equals(jhyInfo.getIsJhy())) {
            throw new RestException(-3, "暂无法抢单");
        }

        JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
        if (order == null) {
            throw new RestException(-3, "订单不存在");
        }

        if (order.getUserId().equals(jhyInfo.getUserId())) {
            throw new RestException(-3, "不能抢自己的单");
        }

        order.setJhyId(userId);
@@ -181,14 +205,23 @@
            throw new RestException(-3, "不是集物员");
        }

        jhyOrderItemsMapper.deleteItemsByOrderId(confirmDto.getOrderId());

        BigDecimal totalScore = BigDecimal.ZERO;
        for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
            JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
            BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
            BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
            orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
            orderItem.setWeight(weight);
            jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
            SysEnvironmentalInfo environmentalInfo = environmentalInfoMapper.selectByPrimaryKey(item.getId());

            JhyOrderItems orderItems = new JhyOrderItems();
            orderItems.setOrderId(confirmDto.getOrderId());
            orderItems.setPicture(environmentalInfo.getPicture());
            orderItems.setItemType(item.getId());
            orderItems.setTitle(environmentalInfo.getTitle());
            orderItems.setPrice(new BigDecimal(environmentalInfo.getPrice()));
            BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
            orderItems.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
            orderItems.setWeight(weight);
            jhyOrderItemsMapper.insert(orderItems);

            totalScore = totalScore.add(total);
        }
@@ -237,8 +270,8 @@
        distribService.distribRecord(order.getId(), order.getUserId());
    }

    public Map<Integer, Integer> orderStatusCount(String userId) {
        List<JhyStatusCountVo> count = jhyOrderMapper.selectOrderStatusCount(userId);
    public Map<Integer, Integer> orderStatusCount(Integer type, String userId) {
        List<JhyStatusCountVo> count = jhyOrderMapper.selectOrderStatusCount(type, userId);

        Map<Integer, Integer> map = new HashMap<>();
        for (int i = 1; i < 6; i++) {