fix

Helius

2021-07-15 f69fd42a3ae2d11713dcd284ae3db57e449ae6dd

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

@@ -1,6 +1,7 @@
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;
@@ -57,19 +58,19 @@
    @Autowired
    private IdUtils idUtils;

    @Autowired
    private DistribService distribService;

    public void addJhyOrder(AddJhyOrderDto orderDto) {
        JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderDto.getUserId());
        if (jhyInfo == null) {
            throw new RestException(-3, "集物员不存在");
        }

        if (jhyInfo != null && JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
            throw new RestException(-3, "集货员不能下单");
        }

        AddressInfo addressInfo = addressMapper.selectByPrimaryKey(orderDto.getAddressId());
        double distance = LocationUtils.getDistance(Convert.toDouble(jhyInfo.getLon()), Convert.toDouble(jhyInfo.getLat()), Convert.toDouble(addressInfo.getLongitude()), Convert.toDouble(addressInfo.getLatitude()));
        if (distance > 500) {

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

@@ -232,5 +233,7 @@

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

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