fix

Helius

2021-07-15 d807e8a6d663f8392b58d8f48b0f8771b46d7995

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

@@ -1,12 +1,15 @@
package com.xzx.gc.order.service;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.common.utils.LocationUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.dto.AddJhyOrderDto;
import com.xzx.gc.order.dto.JhyOrderConfirmDto;
@@ -55,17 +58,25 @@
    @Autowired
    private IdUtils idUtils;

    @Autowired
    private DistribService distribService;

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

        // TODO 判断地址附近500米是否有集物员
        AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());

        List<JhyInfo> jhyInfos = jhyInfoMapper.selectJhyInfoListInAddressRange(addressInfo.getAddressId());
        if (CollUtil.isEmpty(jhyInfos)) {
            throw new RestException(-3, "该区域暂无集物员");
        }

        String orderNo = idUtils.generate("JW", 10);

        JhyOrder jhyOrder = new JhyOrder();
        AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());

        jhyOrder.setOrderNo(orderNo);
        jhyOrder.setArea(addressInfo.getAddressArea());
@@ -155,7 +166,12 @@
            throw new RestException(-3, "无权限操作");
        }

        order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
        if (userId.equals(order.getJhyId())) {
            order.setStatus(JhyOrder.ORDER_STATUS_WAITING);
        } else {
            order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
        }

        jhyOrderMapper.updateByPrimaryKey(order);
    }

@@ -217,5 +233,7 @@

        userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
        accountMapper.updateByPrimaryKey(userAccount);

        distribService.distribRecord(order.getId(), order.getUserId());
    }
}