修BUG

doum

2025-09-03 d1f3f5634ffe2c8dcf21cb6f92f41f0e087fa2a2

 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.wx.SendWxMessage;
import com.doumee.config.wx.WxMiniConfig;
import com.doumee.config.wx.WxMiniUtilService;
import com.doumee.core.constants.Constants;
@@ -14,10 +15,11 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.GeoUtils;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.dto.*;
import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.AliSmsService;
import com.doumee.service.business.OrdersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -28,7 +30,10 @@
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Payer;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayRequest;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayWithRequestPaymentResponse;
import com.wechat.pay.java.service.refund.model.RefundNotification;
import jodd.util.StringUtil;
import lombok.With;
import lombok.extern.slf4j.Slf4j;
import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
@@ -39,17 +44,19 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * 订单信息记录Service实现
 * @author 江蹄蹄
 * @date 2025/07/09 12:00
 */
@Slf4j
@Service
public class OrdersServiceImpl implements OrdersService {

@@ -78,18 +85,46 @@
    private IdentityInfoMapper identityInfoMapper;

    @Autowired
    private WithdrawalOrdersMapper withdrawalOrdersMapper;

    @Autowired
    private ReceiveWeightMapper receiveWeightMapper;

    @Autowired
    private WxMiniUtilService wxMiniUtilService;

    @Autowired
    private RedisTemplate<String, Object> redisTemplate;
    private SendWxMessage sendWxMessage;

    @Autowired
    private AliSmsService aliSmsService;

    @Resource
    private RedisTemplate<String,Object> redisTemplate;

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public Object create(Orders orders) {
    public OrderReleaseVO create(Orders orders) {
        OrderReleaseVO orderReleaseVO = new OrderReleaseVO();
        Object objects = null;
        this.initVerification(orders);
        Member member = memberMapper.selectById(orders.getMember().getId());
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户信息异常");
        }

        orders.setCreateTime(new Date());
        orders.setUpdateTime(orders.getUpdateTime());
        orders.setPayStatus(Constants.ZERO);
        orders.setDeleted(Constants.ZERO);
        orders.setReleaseMemberId(orders.getMember().getId());
        orders.setCommentStatus(Constants.ZERO);
        //查询手续费
        Category platformCategory = categoryMapper.selectOne(new QueryWrapper<Category>().lambda().eq(Category::getType,Constants.THREE).eq(Category::getName,orders.getType()).eq(Category::getDeleted,Constants.ZERO).last("limit 1 "));
        if(Objects.isNull(platformCategory)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未设置平台配置信息");
        }
        orders.setPlatformRata(new BigDecimal(platformCategory.getDetail()).divide(new BigDecimal("100")));
        //订单编号
        orders.setCode(this.getNextCode(orders.getType()));
        Category category = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
@@ -102,18 +137,28 @@
        }
        //用餐订单
        if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
            orders.setStatus(Constants.ZERO);
            orders.setPayAccount(orders.getEstimatedAccount());
            Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
            orders.setReceiveAccount(orders.getPayAccount() - tcje);
            orders.setStatus(Constants.ordersStatus.waitPay.getKey());
            orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
            //唤起支付业务
            objects = this.getWxPayResponse(orders,orders.getMember().getOpenid());
            objects = this.getWxPayResponse(orders,member.getOpenid());
            orderReleaseVO.setObject(objects);
        }else{
            orders.setStatus(Constants.ONE);
            orders.setStatus(Constants.ordersStatus.wait.getKey());
        }
        orders.setOriginPriceNum1(orders.getPriceNum1());
        orders.setOriginPriceNum2(orders.getPriceNum2());
        orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
        orders.setConfirmOtherFee(0l);
        ordersMapper.insert(orders);

        orderReleaseVO.setId(orders.getId());
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orders.getMultifileList())){
            List<Multifile> multifileList = orders.getMultifileList();
            for (Multifile multifile:multifileList) {
                if(Objects.isNull(multifile)
                || Objects.isNull(multifile.getObjType())
                || StringUtils.isEmpty(multifile.getFileurl())
                || StringUtils.isEmpty(multifile.getName())){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"附件信息错误");
@@ -126,7 +171,7 @@
            multifileMapper.insert(multifileList);
        }
        //更新用户发单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum," (receive_num + 1 )").eq(Member::getId,orders.getMember().getId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" PUBLISH_NUM =  ( ifnull(PUBLISH_NUM,0) + 1 )").eq(Member::getId,orders.getMember().getId()));

        //创建操作日志
        Constants.OrdersLog ordersLog = Constants.OrdersLog.UPLOAD;
@@ -144,7 +189,7 @@
                .replace("{param}",orderTypeInfo);
        this.saveOrderLog(orders,ordersLog,
                logInfo,orders.getReleaseMemberId(),null);
        return objects;
        return orderReleaseVO;
    }

    private Object getWxPayResponse(Orders orders,String openid){
@@ -157,13 +202,14 @@
        request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
        request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
        request.setSubAppid(WxMiniConfig.wxProperties.getSubAppId());

        Payer payer = new Payer();
        payer.setSubOpenid(openid);
        request.setPayer(payer);
        request.setOutTradeNo(orders.getCode());
        request.setOutTradeNo(orders.getOutTradeNo());
        request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//这个回调url必须是https开头的
        Amount amount = new Amount();
        amount.setTotal(orders.getEstimatedAccount().intValue());
        amount.setTotal(1);//orders.getPayAccount().intValue());
        request.setAmount(amount);
//        PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
        // 跟之前下单示例一样，填充预下单参数
@@ -204,11 +250,10 @@
                || Objects.isNull(orders.getStartDate())
                || Objects.isNull(orders.getEndDate())
                || StringUtil.isBlank(orders.getLocation())
                || StringUtil.isBlank(orders.getLocationRemark())
                || StringUtil.isBlank(orders.getLinkPhone())
                || Objects.isNull(orders.getLat())
                || Objects.isNull(orders.getLgt())
                || Objects.isNull(orders.getCategoryId())
                || Objects.isNull(orders.getTotalDays())
                || (!Constants.equalsInteger(orders.getType(),Constants.TWO) && Objects.isNull(orders.getCategoryId()))
                || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.isNull(orders.getWorkType()))
                || Objects.isNull(orders.getPriceNum1())
                || Objects.isNull(orders.getEstimatedAccount())
@@ -216,19 +261,20 @@
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if((Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
                || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
                        &&Constants.equalsInteger(orders.getCarType(),Constants.TWO))
                || Constants.equalsInteger(orders.getType(),Constants.ONE)
        if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) &&
            ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) || Constants.equalsInteger(orders.getCarType(),Constants.ONE) ))
            || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ONE))
        ){
            if(Objects.isNull(orders.getPriceNum2())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }else{
            orders.setPriceNum2(Constants.ONE);
        }
        if(Objects.isNull(orders.getPriceNum2())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        orders.setTotalDays(DateUtil.daysBetweenDates(orders.getEndDate(),orders.getStartDate())+1);
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
            && Objects.isNull(orders.getCarType())){
            && ( Objects.isNull(orders.getCarType())  ) ){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
@@ -237,6 +283,7 @@
                    || Objects.isNull(orders.getTransportNum())
                    || StringUtils.isEmpty(orders.getTransportUnit())
                    || StringUtils.isEmpty(orders.getLocationEnd())
                    || StringUtils.isEmpty(orders.getCarUnit())
                    || Objects.isNull(orders.getLatEnd())
                    || Objects.isNull(orders.getLgtEnd())
                    || CollectionUtils.isEmpty(orders.getWayInfoDTOList())
@@ -246,9 +293,9 @@
            for (WayInfoDTO wayInfoDTO:orders.getWayInfoDTOList()) {
                if(Objects.isNull(wayInfoDTO)
                        ||StringUtils.isEmpty(wayInfoDTO.getLocation())
                        ||StringUtils.isEmpty(wayInfoDTO.getProvince())
                        ||StringUtils.isEmpty(wayInfoDTO.getCity())
                        ||StringUtils.isEmpty(wayInfoDTO.getArea())
//                        ||StringUtils.isEmpty(wayInfoDTO.getProvince())
//                        ||StringUtils.isEmpty(wayInfoDTO.getCity())
//                        ||StringUtils.isEmpty(wayInfoDTO.getArea())
                        ||Objects.isNull(wayInfoDTO.getLat())
                        ||Objects.isNull(wayInfoDTO.getLgt())
                ){
@@ -257,6 +304,12 @@
            }
            orders.setWayInfo(JSONObject.toJSONString(orders.getWayInfoDTOList()));
        }else{
            List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO)
                    .eq(Category::getType,Constants.TWO)
            );
            if(CollectionUtils.isEmpty(categoryList)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"餐标信息错误");
            }
            //用餐订单
            if(CollectionUtils.isEmpty(orders.getCateringDTOList())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -270,9 +323,22 @@
                ){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"用餐标准数据错误");
                }
                //餐标信息
                List<Category> categories = categoryList.stream().filter(i->Constants.equalsInteger(i.getId(),cateringDTO.getId())).collect(Collectors.toList());
                if(CollectionUtils.isEmpty(categories)){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"用餐标准数据错误，请刷新重试");
                }
                Category category = categories.get(Constants.ZERO);
                List<String> priceList = JSONArray.parseArray(category.getDetail(),String.class  );
                if(CollectionUtils.isEmpty(priceList)){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"用餐标准数据错误，请刷新重试");
                }
                if(priceList.stream().filter(i->((Long.valueOf(i)*100)+"").equals((cateringDTO.getPrice()+""))).collect(Collectors.toList()).size()==Constants.ZERO){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"用餐标准数据错误，请刷新重试");
                }
                sumPrice = sumPrice + (cateringDTO.getPrice() * cateringDTO.getNum()) ;
            }
            if(!sumPrice.equals(orders.getPrice())){
            if(new BigDecimal(sumPrice.toString()).compareTo(orders.getPrice())!=Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"单价计算错误");
            }
            orders.setWayInfo(JSONObject.toJSONString(orders.getCateringDTOList()));
@@ -281,6 +347,9 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"金额计算错误!");
        }
    }






@@ -305,12 +374,41 @@
    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateById(Orders orders) {
    public void update(Orders orders){
        if(Objects.isNull(orders)
        || Objects.isNull(orders.getId())){
                || Objects.isNull(orders.getId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Orders model = ordersMapper.selectById(orders.getId());
        if(!Constants.equalsInteger(model.getReleaseMemberId(),orders.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if(Constants.equalsInteger(model.getIsUpdate(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单已修改，待接单方确认，无法进行该操作");
        }
        if(!Constants.equalsInteger(model.getType(),Constants.TWO)){
            if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)
                    ||Constants.equalsInteger(model.getStatus(),Constants.ONE)){
                this.updateById(orders);
            }else if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
                this.updOrderData(orders,model);
            }else{
                throw new BusinessException(ResponseStatus.NOT_ALLOWED);
            }
        }else{
            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
        }



    }



//    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateById(Orders orders) {

        Orders model = ordersMapper.selectById(orders.getId());
        if(Constants.equalsInteger(model.getType(),Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"此类订单无法进行修改");
@@ -339,6 +437,7 @@
                        || StringUtils.isEmpty(multifile.getName())){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"附件信息错误");
                }
                multifile.setId(null);
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setCreateDate(new Date());
                multifile.setObjId(orders.getId());
@@ -346,6 +445,10 @@
            }
            multifileMapper.insert(multifileList);
        }
        orders.setOriginPriceNum1(orders.getPriceNum1());
        orders.setOriginPriceNum2(orders.getPriceNum2());
        orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount());
        orders.setConfirmOtherFee(0l);
        ordersMapper.updateById(orders);
    }

@@ -355,15 +458,87 @@
            return;
        }
        for (Orders orders: orderss) {
            this.updateById(orders);
            //this.updateById(orders);
        }
    }

    @Override
    public Orders findById(Integer id) {
        return ordersMapper.selectById(id);
        Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
                        .selectAll(Orders.class)
                        .select(" m1.name " , Orders::getReleaseName)
                        .select(" m1.telephone " , Orders::getReleasePhone)
                        .select(" case when i.AUTH_TYPE = 0 then i.LINK_NAME else i.COMPANY_NAME end " , Orders::getAcceptName)
                        .select(" i.TELEPHONE " , Orders::getAcceptPhone)
                        .select("c1.name",Orders::getCategoryName)
                        .select("c2.name",Orders::getTransportTypeName)
                        .leftJoin(" category c1 on t.category_id = c1.id  ")
                        .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ")
                        .leftJoin("member m1 on t.RELEASE_MEMBER_ID = m1.id ")
                        .leftJoin("member m2 on t.ACCEPT_MEMBER_ID = m2.id ")
                        .leftJoin("identity_info i on m2.id = i.MEMBER_ID and i.TYPE = t.type and i.AUDIT_STATUS = 2  ")
                        .eq(Orders::getDeleted,Constants.ZERO)
                        .eq(Orders::getId,id)
                        .orderByDesc(Orders::getId));
        if(Objects.isNull(orders)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
        this.getPriceUnit(orders);

        //附件信息
        List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
            String path  = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORDERS_FILES).getCode();
            for (Multifile multifile:multifileList) {
                multifile.setFileurlFull(path + multifile.getFileurl());
            }
            orders.setMultifileList(multifileList);
        }
        //订单流转记录
        List<OrderLog> orderLogList = orderLogMapper.selectList(new QueryWrapper<OrderLog>().lambda()
                .eq(OrderLog::getDeleted,Constants.ZERO)
                .eq(OrderLog::getOrderId,orders.getId())
                .orderByAsc(OrderLog::getCreateTime)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(orderLogList)){
            for (OrderLog orderLog:orderLogList) {
                if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ZERO)&& org.apache.commons.lang3.StringUtils.isNotBlank(orders.getReleaseName())){
                    orderLog.setLogInfo(orderLog.getLogInfo().replace("{userName}",orders.getReleaseName()));
                }else if(Constants.equalsInteger(orderLog.getOptUserType(),Constants.ONE)&& org.apache.commons.lang3.StringUtils.isNotBlank(orders.getAcceptName())){
                    orderLog.setLogInfo(orderLog.getLogInfo().replace("{userName}",orders.getAcceptName()));
                }
            }
            orders.setOrderLogList(orderLogList);
        }
        return orders;
    }

    public void getPriceUnit(Orders orders){
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                orders.setPriceUnit("元/斤");
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                orders.setPriceUnit("元/人/天");
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                    orders.setPriceUnit("元/人/天");
                }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    orders.setPriceUnit("元/人/小时");
                }else{
                    orders.setPriceUnit("元/斤");
                }
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                orders.setPriceUnit("元/天");
            }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                orders.setPriceUnit("元/次");
            }
        }
    }
    @Override
    public Orders findOne(Orders orders) {
        QueryWrapper<Orders> wrapper = new QueryWrapper<>(orders);
@@ -379,176 +554,105 @@
    @Override
    public PageData<Orders> findPage(PageWrap<Orders> pageWrap) {
        IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Orders> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<Orders>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(Orders::getId, pageWrap.getModel().getId());
        Orders model  = pageWrap.getModel();
        queryWrapper.selectAll(Orders.class)
                .select(" m1.name " , Orders::getReleaseName)
                .select(" m1.telephone " , Orders::getReleasePhone)
                .select(" case when i.AUTH_TYPE = 0 then i.LINK_NAME else i.COMPANY_NAME end " , Orders::getAcceptName)
                .select(" i.TELEPHONE " , Orders::getAcceptPhone)
                .select("c1.name",Orders::getCategoryName)
                .select("c2.name",Orders::getTransportTypeName)
                .leftJoin(" category c1 on t.category_id = c1.id  ")
                .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ")
                .leftJoin("member m1 on t.RELEASE_MEMBER_ID = m1.id ")
                .leftJoin("member m2 on t.ACCEPT_MEMBER_ID = m2.id ")
                .leftJoin("identity_info i on m2.id = i.MEMBER_ID and i.TYPE = t.type and i.AUDIT_STATUS = 2  ")
                .eq(Orders::getDeleted,Constants.ZERO)
                .orderByDesc(Orders::getId)
        ;
        queryWrapper.ge(Objects.nonNull(model.getCreateTimeStart()),Orders::getCreateTime, Utils.Date.getStart(model.getCreateTimeStart()));
        queryWrapper.le(Objects.nonNull(model.getCreateTimeEnd()),Orders::getCreateTime, Utils.Date.getEnd(model.getCreateTimeEnd()));
        queryWrapper.ge(Objects.nonNull(model.getAcceptTimeStart()),Orders::getAcceptTime, Utils.Date.getStart(model.getAcceptTimeStart()));
        queryWrapper.le(Objects.nonNull(model.getAcceptTimeEnd()),Orders::getAcceptTime, Utils.Date.getEnd(model.getAcceptTimeEnd()));
        queryWrapper.ge(Objects.nonNull(model.getDoneTimeStart()),Orders::getFinishTime, Utils.Date.getStart(model.getDoneTimeStart()));
        queryWrapper.le(Objects.nonNull(model.getDoneTimeEnd()),Orders::getFinishTime, Utils.Date.getEnd(model.getDoneTimeEnd()));
        queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(model.getCode()),Orders::getCode, model.getCode());
        queryWrapper.eq(Objects.nonNull(model.getType()),Orders::getType, model.getType());
        queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus, model.getStatus());
        queryWrapper.eq(Objects.nonNull(model.getCommentStatus()),Orders::getCommentStatus, model.getCommentStatus());
        queryWrapper.eq(Objects.nonNull(model.getReleaseMemberId()),Orders::getReleaseMemberId, model.getReleaseMemberId());
        queryWrapper.eq(Objects.nonNull(model.getAcceptMemberId()),Orders::getAcceptMemberId, model.getAcceptMemberId());
        queryWrapper.eq(Objects.nonNull(model.getAcceptType()),Orders::getAcceptType, model.getAcceptType());
        queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getReleaseName()),"m1.name like '%"+model.getReleaseName()+"%' or m1.TELEPHONE like '%"+model.getReleaseName()+"%' ");
        queryWrapper.apply(org.apache.commons.lang3.StringUtils.isNotBlank(model.getAcceptName()),"( i.LINK_NAME like '%"+model.getAcceptName()+"%' or i.company_name like '%"+model.getAcceptName()+"%' or i.TELEPHONE like '%"+model.getAcceptName()+"%' ) ");
        IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
        for (Orders orders:iPage.getRecords()) {
           this.getOrderContent(orders);
           orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
           orders.setEstimatedAccountYuan(Objects.nonNull(orders.getEstimatedAccount())&&orders.getEstimatedAccount()>0?orders.getEstimatedAccount()/100:0L);
           orders.setPayAccountYuan(Objects.nonNull(orders.getPayAccount())&&orders.getPayAccount()>0?orders.getPayAccount()/100:0L);
        }
        if (pageWrap.getModel().getDeleted() != null) {
            queryWrapper.lambda().eq(Orders::getDeleted, pageWrap.getModel().getDeleted());
        }
        if (pageWrap.getModel().getCreateUser() != null) {
            queryWrapper.lambda().eq(Orders::getCreateUser, pageWrap.getModel().getCreateUser());
        }
        if (pageWrap.getModel().getCreateTime() != null) {
            queryWrapper.lambda().ge(Orders::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
            queryWrapper.lambda().le(Orders::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
        }
        if (pageWrap.getModel().getUpdateUser() != null) {
            queryWrapper.lambda().eq(Orders::getUpdateUser, pageWrap.getModel().getUpdateUser());
        }
        if (pageWrap.getModel().getUpdateTime() != null) {
            queryWrapper.lambda().ge(Orders::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
            queryWrapper.lambda().le(Orders::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(Orders::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getReleaseMemberId() != null) {
            queryWrapper.lambda().eq(Orders::getReleaseMemberId, pageWrap.getModel().getReleaseMemberId());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(Orders::getType, pageWrap.getModel().getType());
        }
        if (pageWrap.getModel().getStartDate() != null) {
            queryWrapper.lambda().ge(Orders::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
            queryWrapper.lambda().le(Orders::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
        }
        if (pageWrap.getModel().getEndDate() != null) {
            queryWrapper.lambda().ge(Orders::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()));
            queryWrapper.lambda().le(Orders::getEndDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
        }
        if (pageWrap.getModel().getLocation() != null) {
            queryWrapper.lambda().eq(Orders::getLocation, pageWrap.getModel().getLocation());
        }
        if (pageWrap.getModel().getLocationRemark() != null) {
            queryWrapper.lambda().eq(Orders::getLocationRemark, pageWrap.getModel().getLocationRemark());
        }
        if (pageWrap.getModel().getLat() != null) {
            queryWrapper.lambda().eq(Orders::getLat, pageWrap.getModel().getLat());
        }
        if (pageWrap.getModel().getProvince() != null) {
            queryWrapper.lambda().eq(Orders::getProvince, pageWrap.getModel().getProvince());
        }
        if (pageWrap.getModel().getCity() != null) {
            queryWrapper.lambda().eq(Orders::getCity, pageWrap.getModel().getCity());
        }
        if (pageWrap.getModel().getArea() != null) {
            queryWrapper.lambda().eq(Orders::getArea, pageWrap.getModel().getArea());
        }
        if (pageWrap.getModel().getLgt() != null) {
            queryWrapper.lambda().eq(Orders::getLgt, pageWrap.getModel().getLgt());
        }
        if (pageWrap.getModel().getCategoryId() != null) {
            queryWrapper.lambda().eq(Orders::getCategoryId, pageWrap.getModel().getCategoryId());
        }
        if (pageWrap.getModel().getWorkType() != null) {
            queryWrapper.lambda().eq(Orders::getWorkType, pageWrap.getModel().getWorkType());
        }
        if (pageWrap.getModel().getPriceNum1() != null) {
            queryWrapper.lambda().eq(Orders::getPriceNum1, pageWrap.getModel().getPriceNum1());
        }
        if (pageWrap.getModel().getPriceNum2() != null) {
            queryWrapper.lambda().eq(Orders::getPriceNum2, pageWrap.getModel().getPriceNum2());
        }
        if (pageWrap.getModel().getSupplement() != null) {
            queryWrapper.lambda().eq(Orders::getSupplement, pageWrap.getModel().getSupplement());
        }
        if (pageWrap.getModel().getPrice() != null) {
            queryWrapper.lambda().eq(Orders::getPrice, pageWrap.getModel().getPrice());
        }
        if (pageWrap.getModel().getEstimatedAccount() != null) {
            queryWrapper.lambda().eq(Orders::getEstimatedAccount, pageWrap.getModel().getEstimatedAccount());
        }
        if (pageWrap.getModel().getPayAccount() != null) {
            queryWrapper.lambda().eq(Orders::getPayAccount, pageWrap.getModel().getPayAccount());
        }
        if (pageWrap.getModel().getCarType() != null) {
            queryWrapper.lambda().eq(Orders::getCarType, pageWrap.getModel().getCarType());
        }
        if (pageWrap.getModel().getTransportTypeId() != null) {
            queryWrapper.lambda().eq(Orders::getTransportTypeId, pageWrap.getModel().getTransportTypeId());
        }
        if (pageWrap.getModel().getTransportNum() != null) {
            queryWrapper.lambda().eq(Orders::getTransportNum, pageWrap.getModel().getTransportNum());
        }
        if (pageWrap.getModel().getTransportUnit() != null) {
            queryWrapper.lambda().eq(Orders::getTransportUnit, pageWrap.getModel().getTransportUnit());
        }
        if (pageWrap.getModel().getLocationEnd() != null) {
            queryWrapper.lambda().eq(Orders::getLocationEnd, pageWrap.getModel().getLocationEnd());
        }
        if (pageWrap.getModel().getLatEnd() != null) {
            queryWrapper.lambda().eq(Orders::getLatEnd, pageWrap.getModel().getLatEnd());
        }
        if (pageWrap.getModel().getLgtEnd() != null) {
            queryWrapper.lambda().eq(Orders::getLgtEnd, pageWrap.getModel().getLgtEnd());
        }
        if (pageWrap.getModel().getWayInfo() != null) {
            queryWrapper.lambda().eq(Orders::getWayInfo, pageWrap.getModel().getWayInfo());
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(Orders::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(Orders::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getAcceptTime() != null) {
            queryWrapper.lambda().ge(Orders::getAcceptTime, Utils.Date.getStart(pageWrap.getModel().getAcceptTime()));
            queryWrapper.lambda().le(Orders::getAcceptTime, Utils.Date.getEnd(pageWrap.getModel().getAcceptTime()));
        }
        if (pageWrap.getModel().getAcceptMemberId() != null) {
            queryWrapper.lambda().eq(Orders::getAcceptMemberId, pageWrap.getModel().getAcceptMemberId());
        }
        if (pageWrap.getModel().getAcceptType() != null) {
            queryWrapper.lambda().eq(Orders::getAcceptType, pageWrap.getModel().getAcceptType());
        }
        if (pageWrap.getModel().getWorkStartTime() != null) {
            queryWrapper.lambda().ge(Orders::getWorkStartTime, Utils.Date.getStart(pageWrap.getModel().getWorkStartTime()));
            queryWrapper.lambda().le(Orders::getWorkStartTime, Utils.Date.getEnd(pageWrap.getModel().getWorkStartTime()));
        }
        if (pageWrap.getModel().getFinishTime() != null) {
            queryWrapper.lambda().ge(Orders::getFinishTime, Utils.Date.getStart(pageWrap.getModel().getFinishTime()));
            queryWrapper.lambda().le(Orders::getFinishTime, Utils.Date.getEnd(pageWrap.getModel().getFinishTime()));
        }
        if (pageWrap.getModel().getPlatformRata() != null) {
            queryWrapper.lambda().eq(Orders::getPlatformRata, pageWrap.getModel().getPlatformRata());
        }
        if (pageWrap.getModel().getWxExternalNo() != null) {
            queryWrapper.lambda().eq(Orders::getWxExternalNo, pageWrap.getModel().getWxExternalNo());
        }
        if (pageWrap.getModel().getCommentStatus() != null) {
            queryWrapper.lambda().eq(Orders::getCommentStatus, pageWrap.getModel().getCommentStatus());
        }
        if (pageWrap.getModel().getCommentInfo() != null) {
            queryWrapper.lambda().eq(Orders::getCommentInfo, pageWrap.getModel().getCommentInfo());
        }
        if (pageWrap.getModel().getCommentLevel() != null) {
            queryWrapper.lambda().eq(Orders::getCommentLevel, pageWrap.getModel().getCommentLevel());
        }
        if (pageWrap.getModel().getCommentTime() != null) {
            queryWrapper.lambda().ge(Orders::getCommentTime, Utils.Date.getStart(pageWrap.getModel().getCommentTime()));
            queryWrapper.lambda().le(Orders::getCommentTime, Utils.Date.getEnd(pageWrap.getModel().getCommentTime()));
        }
        if (pageWrap.getModel().getCommentType() != null) {
            queryWrapper.lambda().eq(Orders::getCommentType, pageWrap.getModel().getCommentType());
        }
        if (pageWrap.getModel().getCancelTime() != null) {
            queryWrapper.lambda().ge(Orders::getCancelTime, Utils.Date.getStart(pageWrap.getModel().getCancelTime()));
            queryWrapper.lambda().le(Orders::getCancelTime, Utils.Date.getEnd(pageWrap.getModel().getCancelTime()));
        }
        if (pageWrap.getModel().getIsUpdate() != null) {
            queryWrapper.lambda().eq(Orders::getIsUpdate, pageWrap.getModel().getIsUpdate());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
        return PageData.from(iPage);
    }

    public void getOrderContent(Orders orders){
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            orders.setOrderContent(Constants.workType.getName(orders.getWorkType()) +" | " + orders.getCategoryName());
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum1())){
                    orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"斤");
                }
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent() + " | " + orders.getPriceNum2() + "人");
                }
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)||Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    if(Objects.nonNull(orders.getPriceNum2())) {
                        orders.setOrderContent(orders.getOrderContent() + " | " + orders.getPriceNum2() + "人");
                    }
                }else{
                    if(Objects.nonNull(orders.getPriceNum1())) {
                        orders.setOrderContent(orders.getOrderContent() + " | " + orders.getPriceNum1() + "斤");
                    }
                }
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getCategoryName())){
                orders.setOrderContent(  orders.getCategoryName() +
                        (StringUtils.isEmpty(orders.getTransportTypeName())?"":" | " + orders.getTransportTypeName() ) +
                        (Objects.isNull(orders.getTransportNum())?null:" | " + orders.getTransportNum() +"斤"));
            }

            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent() + " | 用车" + orders.getPriceNum1() + "天");
                }
            }else{
                if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent() + " | 用车" + orders.getPriceNum1() + "次");
                }
            }
        }else{
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getWayInfo())){
                List<CateringDTO> cateringDTOList = JSONArray.parseArray(orders.getWayInfo(),CateringDTO.class);
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateringDTOList)){
                    for (CateringDTO cateringDTO:cateringDTOList) {
                        if(StringUtils.isEmpty(orders.getOrderContent())){
                            orders.setOrderContent(cateringDTO.getName()+cateringDTO.getPrice()+" 需"+cateringDTO.getNum()+"份");
                        }else{
                            orders.setOrderContent(orders.getOrderContent()+" | "+cateringDTO.getName()+cateringDTO.getPrice()+" 需"+cateringDTO.getNum()+"份");
                        }
                    }
                }
            }
        }
        return PageData.from(ordersMapper.selectPage(page, queryWrapper));

    }



    @Override
    public long count(Orders orders) {
@@ -568,41 +672,63 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ONE)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您自己的订单无法进行该操作");
        }
         member = memberMapper.selectById(member.getId());
        //查询用户是否有对应身份
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(!Constants.equalsInteger(member.getWorkerIdentity(),Constants.TWO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"身份信息异常，请联系管理员");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往个人信息中提交申请。");
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(!Constants.equalsInteger(member.getDriverIdentity(),Constants.TWO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"身份信息异常，请联系管理员");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往个人信息中提交申请。");
            }
        }else{
            if(!Constants.equalsInteger(member.getChefIdentity(),Constants.TWO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"身份信息异常，请联系管理员");
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"您还未注册该服务，请前往个人信息中提交申请。");
            }
        }
        orders.setUpdateTime(new Date());
        orders.setAcceptType(Constants.ZERO);
        orders.setAcceptTime(new Date());
        orders.setAcceptMemberId(member.getId());
        orders.setStatus(Constants.TWO);
        ordersMapper.updateById(orders);

         ordersMapper.update(new UpdateWrapper<Orders>().lambda().eq(Orders::getId,orders.getId())
                .set(Orders::getUpdateTime,new Date())
                .set(Orders::getAcceptType,Constants.ZERO)
                .set(Orders::getAcceptTime,new Date())
                .set(Orders::getAcceptMemberId,member.getId())
                .set(Orders::getStatus,Constants.ordersStatus.accept.getKey())
        );

        //更新接单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum," (publish_num + 1 )").eq(Member::getId,member.getId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" RECEIVE_NUM = (ifnull(RECEIVE_NUM,0) + 1 )").eq(Member::getId,member.getId()));

        //创建操作日志
        Constants.OrdersLog ordersLog = Constants.OrdersLog.RECEIVE;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),member.getId(),null);

        //TODO 微信公众号提醒 已接单提醒
        IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                .eq(IdentityInfo::getMemberId,member.getId())
                .eq(IdentityInfo::getType,orders.getType())
                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                .last("limit 1")
        );
        Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());

        if(Objects.nonNull(releaseMember)){
            if(org.apache.commons.lang3.StringUtils.isNotBlank(releaseMember.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
                //发送微信通知
                sendWxMessage.acceptMessage(releaseMember.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
            }
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getLinkPhone())){
                //短信通知
                aliSmsService.businessSendSms(Constants.smsContent.accept.getKey(),orders.getLinkPhone(),orders,null,
                        wokerIdentityInfo,categoryMapper);
            }
        }



@@ -621,17 +747,17 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单修改待确认，无法进行该操作");
        }
        orders.setUpdateTime(new Date());
        orders.setStatus(Constants.THREE);
        orders.setStatus(Constants.ordersStatus.doing.getKey());
        orders.setWorkStartTime(new Date());
        ordersMapper.updateById(orders);

@@ -644,77 +770,162 @@

    /**
     * 发单方修改订单 - 已接单状态
     * @param updOrderDataDTO
     */
    @Override
//    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updOrderData(UpdOrderDataDTO updOrderDataDTO){
        if(Objects.isNull(updOrderDataDTO)
            || Objects.isNull(updOrderDataDTO.getOrderId())
            || Objects.isNull(updOrderDataDTO.getStartDate())
            || Objects.isNull(updOrderDataDTO.getEndDate())
            || Objects.isNull(updOrderDataDTO.getTotalDays())){
    public void updOrderData(Orders orders,Orders model){
        if(Objects.isNull(orders)
            || Objects.isNull(orders.getStartDate())
            || Objects.isNull(orders.getEndDate())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        Orders orders = ordersMapper.selectById(updOrderDataDTO.getOrderId());
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),updOrderDataDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单已修改，待接单方确认，无法进行该操作");
        }
        orders.setStartDate(updOrderDataDTO.getStartDate());
        orders.setEndDate(updOrderDataDTO.getEndDate());
        orders.setTotalDays(updOrderDataDTO.getTotalDays());
        model.setTotalDays(DateUtil.daysBetweenDates(orders.getEndDate(),orders.getStartDate())+1);
        model.setStartDate(orders.getStartDate());
        model.setEndDate(orders.getEndDate());
        //用车类型
        if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)) {
                orders.setPriceNum1(updOrderDataDTO.getTotalDays());
        if(Constants.equalsInteger(model.getType(),Constants.ONE)){
            if(Constants.equalsInteger(model.getCarType(),Constants.ZERO)) {
                model.setPriceNum1(orders.getTotalDays());
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)||(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)&&Constants.equalsInteger(orders.getCarType(),Constants.ZERO))){
                orders.setPriceNum1(updOrderDataDTO.getTotalDays());
        }else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(model.getWorkType(),Constants.ONE)||
                    (Constants.equalsInteger(model.getWorkType(),Constants.TWO)&&Constants.equalsInteger(model.getCarType(),Constants.ZERO))){
                model.setPriceNum1(orders.getTotalDays());
            }
        }else{
            orders.setPriceNum1(updOrderDataDTO.getTotalDays());
            model.setPriceNum1(orders.getTotalDays());
        }
        Long total = this.getTotal(orders);
        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getStartDate,updOrderDataDTO.getStartDate())
                .set(Orders::getEndDate,updOrderDataDTO.getEndDate())
                .set(Orders::getTotalDays,updOrderDataDTO.getTotalDays())
                .set(Orders::getStartDate,model.getStartDate())
                .set(Orders::getEndDate,model.getEndDate())
                .set(Orders::getTotalDays,model.getTotalDays())
                .set(Orders::getIsUpdate,Constants.ONE)
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getIsUpdateTime,new Date())
                .set(Orders::getUpdateTime,new Date())
                .set(Orders::getEstimatedAccount,total)
                .set(Orders::getOriginEstimatedAccount,total)
                .eq(Orders::getId,orders.getId())
        );
        //创建操作日志
        Constants.OrdersLog ordersLog = Constants.OrdersLog.UPD_ORDER;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),updOrderDataDTO.getMember().getId(),null);
        this.saveOrderLog(model,ordersLog,
                ordersLog.getInfo(),orders.getMember().getId(),null);

        //TODO 通知接单人 订单发生变更
        //通知接单人 订单发生变更
        Member member = memberMapper.selectById(model.getAcceptMemberId());
        if(Objects.nonNull(member)){
            if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())){
                model.setStartDate(orders.getStartDate());
                model.setEndDate(orders.getEndDate());
                //发送微信通知
                sendWxMessage.orderUpdMessage(member.getOpenid(),model);
            }
            IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                    .eq(IdentityInfo::getMemberId,member.getId())
                    .eq(IdentityInfo::getType,orders.getType())
                    .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                    .last("limit 1")
            );
            if(Objects.nonNull(wokerIdentityInfo)){
                //短信通知
                aliSmsService.businessSendSms(Constants.smsContent.orderUpd.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
                        null,categoryMapper);
            }
        }

    }


    @Override
    public Long getTotal(Orders orders){
        if(Objects.isNull(orders)
                ||Objects.isNull(orders.getPrice())
                ||Objects.isNull(orders.getPriceNum1())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(
            (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) ||
                    (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO)
                            &&Constants.equalsInteger(orders.getCarType(),Constants.TWO))
            (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
            || Constants.equalsInteger(orders.getType(),Constants.ONE)
                || Constants.equalsInteger(orders.getType(),Constants.TWO)
        ){
            orders.setPriceNum2(Constants.ONE);
        }else{
            if(Objects.isNull(orders.getPriceNum2())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
        }
        return orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
        BigDecimal bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString()));
        return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
    }


    /**
     * 接单方确认订单费用
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void  confirmFee(ConfirmFeeOrderDTO confirmUpdOrderDTO){
        if(Objects.isNull(confirmUpdOrderDTO)
                || Objects.isNull(confirmUpdOrderDTO.getOrderId())
                || Objects.isNull(confirmUpdOrderDTO.getPriceNum1())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Orders orders = ordersMapper.selectById(confirmUpdOrderDTO.getOrderId());
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        //类型:0=用工；1=运货；2=订餐
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            //用工类型:0=采摘工；1=分拣工；2=包装工；（用工订单）
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                //1=分拣工
                if( Objects.isNull(confirmUpdOrderDTO.getPriceNum2())){//必须有用工数量（人）
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
                }
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO)){
                //包装工 用车类型(用工包装/运货使用):0=天;1=次/小时;2=重量
                if( !Constants.equalsInteger(orders.getCarType(),Constants.TWO)
                        && Objects.isNull(confirmUpdOrderDTO.getPriceNum2())){
                    //不是按重量计费的，必须有用工数量（人）
                    throw new BusinessException(ResponseStatus.BAD_REQUEST);
                }
            }
        }else  if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            //运货订单

        }else{
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该订单不支持该操作，请返回刷新重试！");
        }
        orders.setPriceNum1(confirmUpdOrderDTO.getPriceNum1());
        orders.setPriceNum2(confirmUpdOrderDTO.getPriceNum2());
        Long totalFee = this.getTotal(orders);//重新计算费用
        Long payFee = totalFee+Constants.formatLongNum(confirmUpdOrderDTO.getConfirmOtherFee());//重新计算费用
        BigDecimal recFee = new BigDecimal(payFee).multiply((new BigDecimal(1).subtract(Constants.formatBigDecimal(orders.getPlatformRata())))).setScale(0, RoundingMode.HALF_UP) ;
        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getPriceNum1,confirmUpdOrderDTO.getPriceNum1())
                .set(Orders::getPriceNum2,confirmUpdOrderDTO.getPriceNum2())
                .set(Orders::getConfirmFeeRemark,confirmUpdOrderDTO.getConfirmFeeRemark())
                .set(Orders::getConfirmOtherFee,confirmUpdOrderDTO.getConfirmOtherFee())
                .set(Orders::getEstimatedAccount,totalFee)
                .set(Orders::getStatus,Constants.ordersStatus.feeconfirm.getKey())
                .set(Orders::getPayAccount,payFee)
                .set(Orders::getReceiveAccount,recFee.longValue())
                .set(Orders::getUpdateTime,new Date())
                .eq(Orders::getId,orders.getId())
        );
        //记录同意修改的日志
        Constants.OrdersLog ordersLog = Constants.OrdersLog.FEE_CONFIRM;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),confirmUpdOrderDTO.getMember().getId(),null);

    }

    /**
     * 接单方处理订单修改
@@ -735,19 +946,19 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行该操作");
        }
        if(!Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单修改状态已流转，无法进行该操作");
        }
        if(Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
        if(!Constants.equalsInteger(orders.getAcceptMemberId(),confirmUpdOrderDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        if( Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)){
        if(!Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)){
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getIsUpdate,Constants.TWO)
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getUpdateTime,new Date())
                    .eq(Orders::getId,orders.getId())
            );
            //记录同意修改的日志
@@ -757,44 +968,84 @@
        }else{
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getIsUpdate,Constants.TWO)
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getStatus,Constants.ONE)
                    .set(Orders::getUpdateTime,new Date())
                    .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
                    .set(Orders::getAcceptMemberId,null)
                    .set(Orders::getAcceptType,null)
                    .eq(Orders::getId,orders.getId())
            );

            memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,confirmUpdOrderDTO.getMember().getId()));
            memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("receive_num = receive_num - 1").eq(Member::getId,confirmUpdOrderDTO.getMember().getId()));

            //记录不同意修改的日志
            Constants.OrdersLog ordersLog = Constants.OrdersLog.UPD_DISAGREE;
            this.saveOrderLog(orders,ordersLog,
                    ordersLog.getInfo(),confirmUpdOrderDTO.getMember().getId(),null);

            //TODO 发送不同意变更通知

        }
        //短信通知
        aliSmsService.businessSendSms(!Constants.equalsInteger(confirmUpdOrderDTO.getStatus(),Constants.ONE)?
                        Constants.smsContent.agreeUpd.getKey():Constants.smsContent.disAgreeUpd.getKey()
                ,orders.getLinkPhone(),null,null,
                null,categoryMapper);
    }


    /**
     * 发单方取消订单
     * @param orderId
     * @param member
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void releaseCancelOrder(Integer orderId,Member member){
    public void cancelOrder(Integer orderId,Member member){
        Orders orders = ordersMapper.selectById(orderId);
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ONE)
                ||Constants.equalsInteger(orders.getStatus(),Constants.ZERO)
        || Constants.equalsInteger(orders.getStatus(),Constants.TWO))){
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
            this.releaseCancelOrder(orders,member);
        }else if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
            this.receiveCancelOrder(orders,member);
        }else{
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }


    }


    @Override
    public String cancelTips(Integer orderId,Member member){
        Orders orders = ordersMapper.selectById(orderId);
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }

        Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
        Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
                .apply(" DATE(cancel_time) = DATE(NOW()) ")
                .eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                .eq(Orders::getReleaseMemberId,member.getId()));
        //查询取消次数
        if(totalCancelTimes<=cancelTimes){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"今日订单主动取消次数已超出"+totalCancelTimes+"次,无法取消订单");
        }

        Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIME).getCode());
        Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate());
        if(hours < cancelTimeHour){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"距离订单开始时间不足"+cancelTimeHour+"小时,无法取消订单");
        }
        return  "今日还可主动取消"+(totalCancelTimes-cancelTimes)+"次，是否确认取消";

    }

    /**
     * 发单方取消订单
     * @param member
     */
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void releaseCancelOrder(Orders orders,Member member){
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())
                ||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey())
        || Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        //待支付用餐订单/待接单订单进行取消
@@ -804,19 +1055,19 @@
                //退款业务
                WithdrawalOrders  withdrawalOrders = new WithdrawalOrders();
                withdrawalOrders.setCreateTime(new Date());
                withdrawalOrders.setDeleted(Constants.ZERO);
                withdrawalOrders.setMemberId(orders.getReleaseMemberId());
                withdrawalOrders.setAmount(orders.getPayAccount());
                withdrawalOrders.setWxExternalNo("refund_"+orders.getCode());
                withdrawalOrders.setStatus(Constants.ONE);
                withdrawalOrders.setStatus(Constants.ZERO);
                withdrawalOrders.setDoneTime(new Date());
                withdrawalOrders.setType(Constants.ONE);
                withdrawalOrders.setObjId(orders.getId());
                wxMiniUtilService.wxRefund(withdrawalOrders,orders);
            }
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getStatus,99)
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getCancelTime,"now()")
                    .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                    .set(Orders::getUpdateTime,new Date())
                    .set(Orders::getCancelTime,new Date())
                    .set(Orders::getCancelType,Constants.ZERO)
                    .eq(Orders::getId,orders.getId())
            );
@@ -825,7 +1076,7 @@
            Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
            Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
                    .apply(" DATE(cancel_time) = DATE(NOW()) ")
                    .eq(Orders::getStatus,99)
                    .eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                    .eq(Orders::getReleaseMemberId,orders.getReleaseMemberId()));
            //查询取消次数
            if(totalCancelTimes<=cancelTimes){
@@ -852,43 +1103,56 @@
                wxMiniUtilService.wxRefund(withdrawalOrders,orders);
            }
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getStatus,99)
                    .set(Orders::getUpdateTime,"now()")
                    .set(Orders::getCancelTime,"now()")
                    .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                    .set(Orders::getUpdateTime,new Date())
                    .set(Orders::getCancelTime,new Date())
                    .set(Orders::getCancelType,Constants.ONE)
                    .eq(Orders::getId,orders.getId())
            );
            //TODO 发单方取消订单通知接单方

            //减少接单量
            memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,orders.getAcceptMemberId()));
            memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("receive_num = (receive_num - 1) ").eq(Member::getId,orders.getAcceptMemberId()));
        }
        //减少发单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum,"publish_num - 1").eq(Member::getId,orders.getReleaseMemberId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql("publish_num = (publish_num - 1)").eq(Member::getId,orders.getReleaseMemberId()));

        //日志存储
        Constants.OrdersLog ordersLog = Constants.OrdersLog.RELEASE_CANCEL;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),member.getId(),null);

        List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                .and(i->i.eq(Member::getId,orders.getReleaseMemberId()).or().eq(Member::getId,orders.getAcceptMemberId()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
            List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
            //发送微信通知
            sendWxMessage.cancelMessage(openIdList,orders,Constants.ONE);
        }

        IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
                .eq(IdentityInfo::getType,orders.getType())
                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                .last("limit 1")
        );
        if(Objects.nonNull(wokerIdentityInfo)){
            //短信通知
            aliSmsService.businessSendSms(Constants.smsContent.releaseCancel.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
                    null,categoryMapper);
        }
    }


    /**
     * 接单方取消接单
     * @param orderId
     * @param member
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void receiveCancelOrder(Integer orderId,Member member){
        Orders orders = ordersMapper.selectById(orderId);
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.TWO)){
    public void receiveCancelOrder(Orders orders,Member member){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
        if(!Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        //判断是否可修改 已取消次数 与 时间限制
@@ -908,22 +1172,32 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"距离订单开始时间不足"+cancelTimeHour+"小时,无法取消订单，如需处理请联系客服");
        }
        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getStatus,Constants.ONE)
                .set(Orders::getUpdateTime,new Date())
                .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
                .set(Orders::getAcceptMemberId,null)
                .set(Orders::getAcceptType,null)
                .eq(Orders::getId,orders.getId())
        );

        //减少接单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,orders.getAcceptMemberId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" receive_num = receive_num - 1 ").eq(Member::getId,orders.getAcceptMemberId()));
        //日志存储
        Constants.OrdersLog ordersLog = Constants.OrdersLog.CANCEL;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),member.getId(),null);

        //TODO 接单方取消订单通知

        List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                .and(i->i.eq(Member::getId,orders.getReleaseMemberId()).or().eq(Member::getId,orders.getAcceptMemberId()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
            List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
            //发送微信通知
            sendWxMessage.cancelMessage(openIdList,orders,Constants.TWO);
        }
        //短信通知
        aliSmsService.businessSendSms(Constants.smsContent.receiveCancel.getKey(),member.getTelephone(),orders,null,
                null,categoryMapper);
    }


@@ -933,7 +1207,7 @@
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Object doneOrder(DoneOrderDTO doneOrderDTO){
    public OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO){
        if(Objects.isNull(doneOrderDTO)||Objects.isNull(doneOrderDTO.getOrderId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -944,33 +1218,117 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        if(Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
        if(!Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非您的订单无法进行该操作");
        }
        Member payMember = memberMapper.selectById(doneOrderDTO.getMember().getId());
        if(Objects.isNull(payMember)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户信息异常");
        }

        OrderReleaseVO orderReleaseVO = new OrderReleaseVO();
        orderReleaseVO.setId(orders.getId());
        Object object = null;
        //用餐订单
        if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
            orders.setPayAccount(doneOrderDTO.getAmount());
            //提成金额
            Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
            Long tcje =  (new BigDecimal(orders.getPayAccount().toString()).multiply(Constants.formatBigDecimal(orders.getPlatformRata())).setScale(0,RoundingMode.HALF_UP).longValue());
            orders.setReceiveAccount(orders.getPayAccount() - tcje);
            orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
            ordersMapper.updateById(orders);
            //唤起支付业务
            object = this.getWxPayResponse(orders,orders.getMember().getOpenid());
            object = this.getWxPayResponse(orders,payMember.getOpenid());
            orderReleaseVO.setObject(object);
        }else{
            orders.setStatus(Constants.FOUR);
            orders.setStatus(Constants.ordersStatus.done.getKey());
            orders.setFinishTime(new Date());
            ordersMapper.updateById(orders);

            Member member = memberMapper.selectById(orders.getAcceptMemberId());

            //存储流水记录
            MemberRevenue memberRevenue = new MemberRevenue();
            memberRevenue.setCreateTime(new Date());
            memberRevenue.setMemberId(orders.getAcceptMemberId());
            memberRevenue.setType(orders.getType());
            memberRevenue.setOptType(Constants.ONE);
            memberRevenue.setBeforeAmount(member.getAmount());
            memberRevenue.setAmount(orders.getReceiveAccount());
            memberRevenue.setAfterAmount(member.getAmount() + orders.getReceiveAccount());
            if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
                memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()) + "-" +
                        (Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)?"采摘工":(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"分拣工":"包装工")));
            }else{
                memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()));
            }
            memberRevenue.setObjId(orders.getId());
            memberRevenue.setObjType(Constants.ZERO);
            memberRevenue.setStatus(Constants.ZERO);
            memberRevenueMapper.insert(memberRevenue);

            //日志存储
            Constants.OrdersLog ordersLog = Constants.OrdersLog.DONE;
            this.saveOrderLog(orders,ordersLog,
                    ordersLog.getInfo(),doneOrderDTO.getMember().getId(),null);

            sendWxMessage.revenueMessage(member.getOpenid(),orders);

            //短信通知接单方
            if(Objects.nonNull(orders.getAcceptMemberId())){
                IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                        .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
                        .eq(IdentityInfo::getType,orders.getType())
                        .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                        .last("limit 1")
                );
                if(Objects.nonNull(wokerIdentityInfo)){
                    aliSmsService.businessSendSms(Constants.smsContent.pay.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
                            null,categoryMapper);
                }
            }
        }
        return object;
        return orderReleaseVO;
    }



    @Override
    public OrderReleaseVO reusePay(ReusePayDTO reusePayDTO){
        if(Objects.isNull(reusePayDTO)||Objects.isNull(reusePayDTO.getOrderId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Orders orders = ordersMapper.selectById(reusePayDTO.getOrderId());
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getType(),Constants.TWO)&&Objects.isNull(reusePayDTO.getAmount())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }

        if(!((( Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.ZERO) )
                || ( !Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.THREE) ))
        && Constants.equalsInteger(orders.getPayStatus(),Constants.ZERO) )){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转");
        }
        OrderReleaseVO orderReleaseVO = new OrderReleaseVO();
        if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){
            orders.setPayAccount(reusePayDTO.getAmount());
            //提成金额
            Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue());
            orders.setReceiveAccount(orders.getPayAccount() - tcje);
        }
        orders.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
        ordersMapper.updateById(orders);
        //唤起支付业务
        Object object = this.getWxPayResponse(orders,orders.getMember().getOpenid());
        orderReleaseVO.setObject(object);
        orderReleaseVO.setId(orders.getId());
        return orderReleaseVO;
    }


    @Override
@@ -980,8 +1338,8 @@
        if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ONE)||Constants.equalsInteger(orders.getStatus(),Constants.TWO)
            ||Constants.equalsInteger(orders.getStatus(),Constants.THREE))){
        if(!(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.wait.getKey())||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())
                ||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())||Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey()))){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行取消");
        }
        //如果已支付 则需要进行退款
@@ -999,17 +1357,21 @@
        }

        //减少发单量
        memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getPublishNum,"publish_num - 1").eq(Member::getId,orders.getReleaseMemberId()));
        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .setSql("publish_num = ifnull(publish_num,0) - 1")
                .eq(Member::getId,orders.getReleaseMemberId()));

        if(Constants.equalsInteger(orders.getStatus(),Constants.TWO)||Constants.equalsInteger(orders.getStatus(),Constants.THREE)){
            //减少接单量
            memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getReceiveNum,"receive_num - 1").eq(Member::getId,orders.getAcceptMemberId()));
            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .setSql("receive_num = ifnull(receive_num,0) - 1")
                    .eq(Member::getId,orders.getAcceptMemberId()));
        }

        Date date = new Date();
        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getStatus,99)
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getCancelTime,"now()")
                .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                .set(Orders::getUpdateTime,date)
                .set(Orders::getCancelTime,date)
                .set(Orders::getCancelType,Constants.TWO)
                .eq(Orders::getId,orders.getId())
        );
@@ -1018,6 +1380,33 @@
        Constants.OrdersLog ordersLog = Constants.OrdersLog.SYSTEM_CANCEL;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),null,loginUserInfo.getId());

        List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                        .and(i->i.eq(Member::getId,orders.getReleaseMemberId()).or().eq(Member::getId,orders.getAcceptMemberId()))
                );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){
            List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList());
            orders.setCancelTime(new Date());
            //发送微信通知
            sendWxMessage.cancelMessage(openIdList,orders,Constants.ZERO);
        }
        //短信通知发单方
        aliSmsService.businessSendSms(Constants.smsContent.platformCancel.getKey(),orders.getLinkPhone(),orders,null,
                null,categoryMapper);
        //短信通知接单方
        if(Objects.nonNull(orders.getAcceptMemberId())){
            IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                    .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
                    .eq(IdentityInfo::getType,orders.getType())
                    .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                    .last("limit 1")
            );
            if(Objects.nonNull(wokerIdentityInfo)){
                aliSmsService.businessSendSms(Constants.smsContent.platformCancel2.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
                        null,categoryMapper);
            }
        }

    }


@@ -1036,7 +1425,7 @@
                ||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(orders.getStatus(),Constants.FOUR)){
        if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.done.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单状态已流转,无法进行评价");
        }
        if(Constants.equalsInteger(orders.getCommentStatus(),Constants.ONE)){
@@ -1045,26 +1434,24 @@

        ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                .set(Orders::getCommentStatus,Constants.ONE)
                .set(Orders::getUpdateTime,"now()")
                .set(Orders::getCommentTime,"now()")
                .set(Orders::getUpdateTime,new Date())
                .set(Orders::getCommentTime,new Date())
                .set(Orders::getCommentLevel,commentDTO.getLevel())
                .set(org.apache.commons.lang3.StringUtils.isNotBlank(commentDTO.getInfo()),Orders::getCommentInfo,commentDTO.getInfo())
                .set(Orders::getCommentType,Constants.ZERO)
                .eq(Orders::getId,orders.getId())
        );

        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .set(Member::getScore," ( total_score +" + commentDTO.getLevel() + " ) / (score_order_num + 1 )")
                .set(Member::getTotalScore," total_score +" + commentDTO.getLevel())
                .set(Member::getScoreOrderNum," score_order_num + 1 " ).eq(Member::getId,orders.getAcceptMemberId())
                .setSql(" score =  ( ifnull(total_score,0) +" + commentDTO.getLevel() + " ) / (ifnull(score_order_num,0) + 1 )")
                .setSql(" total_score =  ifnull(total_score,0) +" + commentDTO.getLevel())
                .setSql(" score_order_num = ifnull(score_order_num,0) + 1 " )
                .eq(Member::getId,orders.getAcceptMemberId())
        );

        //日志存储
        Constants.OrdersLog ordersLog = Constants.OrdersLog.COMMENT;
        this.saveOrderLog(orders,ordersLog,
                ordersLog.getInfo(),orders.getAcceptMemberId(),null);
    }




    /**
@@ -1076,7 +1463,7 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public String payNotify(String preOrderId,String paymentNo){
        Orders orders = ordersMapper.selectOne(new QueryWrapper<Orders>().lambda().eq(Orders::getCode,preOrderId).last("limit 1"));
        Orders orders = ordersMapper.selectOne(new QueryWrapper<Orders>().lambda().eq(Orders::getOutTradeNo,preOrderId).last("limit 1"));
        if(Constants.equalsInteger(orders.getType(),Constants.TWO)){
            //用餐订单  如果已经流转到已支付  则直接返回
            if(!Constants.equalsInteger(orders.getStatus(),Constants.ZERO)){
@@ -1084,9 +1471,11 @@
            }else{
                //处理支付完成逻辑
                ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getStatus,Constants.ONE)
                        .set(Orders::getUpdateTime,new Date())
                        .set(Orders::getStatus,Constants.ordersStatus.wait.getKey())
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getPayTime,new Date())
                        .set(Orders::getPayMethod,Constants.ZERO)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .eq(Orders::getId,orders.getId())
                );
@@ -1103,11 +1492,13 @@
            }else{
                //处理支付完成逻辑
                ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getUpdateTime,new Date())
                        .set(Orders::getStatus,Constants.FOUR)
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getPayTime,new Date())
                        .set(Orders::getPayMethod,Constants.ZERO)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .set(Orders::getFinishTime,"now()")
                        .set(Orders::getFinishTime,new Date())
                        .eq(Orders::getId,orders.getId())
                );

@@ -1115,12 +1506,20 @@
                //存储流水记录
                MemberRevenue memberRevenue = new MemberRevenue();
                memberRevenue.setCreateTime(new Date());
                memberRevenue.setDeleted(Constants.ZERO);
                memberRevenue.setTransactionNo(orders.getCode());
                memberRevenue.setMemberId(orders.getAcceptMemberId());
                memberRevenue.setType(orders.getType());
                memberRevenue.setOptType(Constants.ONE);
                memberRevenue.setBeforeAmount(member.getAmount());
                memberRevenue.setAmount(orders.getReceiveAccount());
                memberRevenue.setAfterAmount(member.getAmount() + orders.getReceiveAccount());
                if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
                    memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()) + "-" +
                            (Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)?"采摘工":(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"分拣工":"包装工")));
                }else{
                    memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()));
                }
                memberRevenue.setObjId(orders.getId());
                memberRevenue.setObjType(Constants.ZERO);
                memberRevenue.setStatus(Constants.ZERO);
@@ -1128,8 +1527,8 @@

                //更新接单用户的余额与历史总金额
                memberMapper.update(new UpdateWrapper<Member>().lambda()
                        .set(Member::getAmount,"amount + " + orders.getReceiveAccount() )
                        .set(Member::getTotalAmount,"amount + " + orders.getReceiveAccount() )
                        .setSql(" amount = ( amount + " + orders.getReceiveAccount() +")" )
                        .setSql(" total_amount = ( amount + " + orders.getReceiveAccount() + ")" )
                        .eq(Member::getId,member.getId())
                );

@@ -1138,7 +1537,23 @@
                this.saveOrderLog(orders,ordersLog,
                        ordersLog.getInfo(),orders.getReleaseMemberId(),null);

                //TODO 通知接单方 款项已到账
                // 通知接单方 款项已到账
                sendWxMessage.revenueMessage(member.getOpenid(),orders);

                //短信通知接单方
                if(Objects.nonNull(orders.getAcceptMemberId())){
                    IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                            .eq(IdentityInfo::getMemberId,orders.getAcceptMemberId())
                            .eq(IdentityInfo::getType,orders.getType())
                            .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                            .last("limit 1")
                    );
                    if(Objects.nonNull(wokerIdentityInfo)){
                        aliSmsService.businessSendSms(Constants.smsContent.pay.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
                                null,categoryMapper);
                    }
                }

            }
        }
        return  ("处理成功!");
@@ -1151,69 +1566,124 @@
        MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        Orders model = pageWrap.getModel();
        if(Objects.isNull(model)
            || Objects.isNull(model.getQueryLat())
            || Objects.isNull(model.getQueryLgt())
                || Objects.isNull(model.getQueryMyOrderType())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        BigDecimal chefLat = model.getQueryLat();
        BigDecimal chefLgt = model.getQueryLgt();
        BigDecimal driverLat = model.getQueryLat();
        BigDecimal driverLgt = model.getQueryLgt();
        BigDecimal workerLat = model.getQueryLat();
        BigDecimal workerLgt = model.getQueryLgt();
        IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                .eq(IdentityInfo::getType,Constants.ZERO)
                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                .last("limit 1")
        );
        if(Objects.nonNull(wokerIdentityInfo)){
            workerLat = wokerIdentityInfo.getLat();
            workerLgt = wokerIdentityInfo.getLgt();
        }
        IdentityInfo driverIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                .eq(IdentityInfo::getType,Constants.ONE)
                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                .last("limit 1")
        );
        if(Objects.nonNull(driverIdentityInfo)){
            driverLat = driverIdentityInfo.getLat();
            driverLgt = driverIdentityInfo.getLgt();
        }
        IdentityInfo chefIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                .eq(IdentityInfo::getType,Constants.TWO)
                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                .last("limit 1")
        );
        if(Objects.nonNull(chefIdentityInfo)){
            chefLat = chefIdentityInfo.getLat();
            chefLgt = chefIdentityInfo.getLgt();
        }
        queryWrapper.selectAll(Orders.class)
                .select("c1.name",Orders::getCategoryName)
                .select("c2.name",Orders::getTransportTypeName)
                .leftJoin(" category c1 on t.category_id = c1.id  ")
                .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ");
                .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ")
                .select(" case when T.LGT IS NULL OR T.LAT IS NULL THEN 0 " +
                        " when t.TYPE = 0 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+workerLgt+", "+workerLat+" )) /1000,DECIMAL(15,2))  " +
                        " when t.TYPE = 1 then   CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+driverLgt+", "+driverLat+" )) /1000,DECIMAL(15,2)) " +
                        " else  CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+chefLgt+", "+chefLat+" )) /1000,DECIMAL(15,2)) end " , Orders::getDistance)
                .eq(Objects.nonNull(model.getType()),Orders::getType,model.getType());
        if(Objects.nonNull(model.getQueryMyOrderType())){
            if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)){
                //发单方 我的订单
                queryWrapper.eq(Orders::getReleaseMemberId,model.getMember().getId());
                queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus,model.getStatus());
                queryWrapper.orderByDesc(Orders::getCreateTime);
            }else if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){
                //接单方 我的订单
                queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
                queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus,model.getStatus());
                queryWrapper.orderByDesc(Orders::getAcceptTime);
            }else{
                //接单大厅
                queryWrapper.and(i->
                        i.eq(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO),Orders::getType,Constants.ZERO)
                                .or()
                                .eq(Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO),Orders::getType,Constants.ONE)
                                .or()
                                .eq(Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),Orders::getType,Constants.TWO)
                );
                queryWrapper.eq(Orders::getStatus,Constants.ONE);
                //查询用户的接单权重
                ReceiveWeight receiveWeight = receiveWeightMapper.selectOne(new QueryWrapper<ReceiveWeight>().lambda().eq(ReceiveWeight::getDeleted,Constants.ZERO).apply(" RECEIVE_MIN < "+model.getMember().getReceiveNum()+" and RECEIVE_MAX > " + model.getMember().getReceiveNum()).last(" limit 1 "));
                if(Objects.nonNull(receiveWeight)){
                    queryWrapper.apply(" DATE_ADD(t.CREATE_TIME, INTERVAL "+receiveWeight.getDelayTime()+" MINUTE)  < now() ");
                }
                queryWrapper.eq(Orders::getStatus,Constants.ordersStatus.wait.getKey());
                queryWrapper.ne(Orders::getReleaseMemberId,model.getMember().getId());
                if(Objects.nonNull(model.getSortType())){
                    if(Constants.equalsInteger(model.getSortType(),Constants.ZERO)){
                        queryWrapper.orderByDesc(Orders::getCreateTime);
                    }else if(Constants.equalsInteger(model.getSortType(),Constants.ONE)){
                        queryWrapper.orderByAsc(" distance  ");
                    }else{
                        queryWrapper.orderByDesc(Orders::getEstimatedAccount);
                    }
                }
            }
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        } 
        IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
        if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){
            if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){
                model.getMember().setWorkerIdentityModel(
                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                                .eq(IdentityInfo::getType,Constants.ZERO)
                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                                .last("limit 1")
                        )
                );
                model.getMember().setDriverIdentityModel(
                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                                .eq(IdentityInfo::getType,Constants.ONE)
                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                                .last("limit 1")
                        )
                );
                model.getMember().setChefIdentityModel(
                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
                                .eq(IdentityInfo::getType,Constants.TWO)
                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                                .last("limit 1")
                        )
                );
            }
            for (Orders orders:iPage.getRecords()) {
               this.getDistance(model.getMember(),orders);
            }
        for (Orders orders:iPage.getRecords()) {
            this.getPriceUnit(orders);
        }
//        if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){
//            if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){
//                model.getMember().setWorkerIdentityModel(
//                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
//                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
//                                .eq(IdentityInfo::getType,Constants.ZERO)
//                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
//                                .last("limit 1")
//                        )
//                );
//                model.getMember().setDriverIdentityModel(
//                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
//                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
//                                .eq(IdentityInfo::getType,Constants.ONE)
//                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
//                                .last("limit 1")
//                        )
//                );
//                model.getMember().setChefIdentityModel(
//                        identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
//                                .eq(IdentityInfo::getMemberId,model.getMember().getId())
//                                .eq(IdentityInfo::getType,Constants.TWO)
//                                .eq(IdentityInfo::getAuditStatus,Constants.TWO)
//                                .last("limit 1")
//                        )
//                );
//            }
//            for (Orders orders:iPage.getRecords()) {
//               this.getDistance(model.getMember(),orders);
//            }
//        }
        return PageData.from(iPage);
    }

@@ -1222,72 +1692,83 @@

    //定位距离
    public void getDistance(Member member,Orders orders){
        try{
            if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
                if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
                        &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
                    orders.setDistance(
                            GeoUtils.haversineDistance(
                                    orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
                                    member.getWorkerIdentityModel().getLgt().doubleValue(),
                                    member.getWorkerIdentityModel().getLat().doubleValue()
                            )
                    );
                }

        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
                    &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
                orders.setDistance(
                        GeoUtils.haversineDistance(
                                orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
                                member.getWorkerIdentityModel().getLgt().doubleValue(),
                                member.getWorkerIdentityModel().getLat().doubleValue()
                        )
                );
            }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
                if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
                        &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
                    orders.setDistance(
                            GeoUtils.haversineDistance(
                                    orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
                                    member.getDriverIdentityModel().getLgt().doubleValue(),
                                    member.getDriverIdentityModel().getLat().doubleValue()
                            )
                    );
                }
            }else{
                if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
                        &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
                    orders.setDistance(
                            GeoUtils.haversineDistance(
                                    orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
                                    member.getChefIdentityModel().getLgt().doubleValue(),
                                    member.getChefIdentityModel().getLat().doubleValue()
                            )
                    );
                }
            }

        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
                    &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
                orders.setDistance(
                        GeoUtils.haversineDistance(
                                orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
                                member.getDriverIdentityModel().getLgt().doubleValue(),
                                member.getDriverIdentityModel().getLat().doubleValue()
                        )
                );
            }
        }else{
            if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
                    &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
                orders.setDistance(
                        GeoUtils.haversineDistance(
                                orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
                                member.getChefIdentityModel().getLgt().doubleValue(),
                                member.getChefIdentityModel().getLat().doubleValue()
                        )
                );
            }
        }catch (Exception e){
            orders.setDistance(0L);
        }
    }



    @Override
    public Orders getDetail(Integer id,Integer userType) {
    public Orders getDetail(Integer id,Member member) {
        Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
                        .selectAll(Orders.class)
                        .select(" m1.name " , Orders::getReleaseName)
                        .select(" m1.telephone " , Orders::getReleasePhone)
                        .select(" case when i.AUTH_TYPE = 0 then i.LINK_NAME else i.COMPANY_NAME end " , Orders::getAcceptName)
                        .select(" i.TELEPHONE " , Orders::getAcceptPhone)
                        .select("c1.name",Orders::getCategoryName)
                        .select("c2.name",Orders::getTransportTypeName)
                        .select(" m2.SCORE " , Orders::getScore)
                        .select(" m1.PUBLISH_NUM " , Orders::getPublishNum)
                        .select(" m2.RECEIVE_NUM " , Orders::getReceiveNum)
                        .select(" m1.COVER_IMAGE " , Orders::getReleaseCoverImage)
                        .select(" m2.COVER_IMAGE " , Orders::getAcceptCoverImage)
                        .leftJoin(" category c1 on t.category_id = c1.id  ")
                        .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id  ")
                        .leftJoin("member m1 on t.RELEASE_MEMBER_ID = m1.id ")
                        .leftJoin("member m2 on t.ACCEPT_MEMBER_ID = m2.id ")
                        .leftJoin("identity_info i on m2.id = i.MEMBER_ID and i.TYPE = t.type and i.AUDIT_STATUS = 2  ")

                        .eq(Orders::getId,id)
                );
        if(Objects.isNull(orders)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(Objects.nonNull(userType)){
            Member member = memberMapper.selectById(
                    Constants.equalsInteger(userType,Constants.ZERO)?orders.getReleaseMemberId():orders.getAcceptMemberId()
            );
            if(Objects.nonNull(member)){
                if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getCoverImage())){
                    //头像信息
                    String path  = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
                            +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
                    member.setFullCoverImage(path + member.getCoverImage());
                }
                orders.setMember(member);
            }
        //头像信息
        String coverPath  = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
        if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getReleaseCoverImage())){
            orders.setReleaseCoverImage(coverPath + orders.getReleaseCoverImage());
        }
        if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getAcceptCoverImage())){
            orders.setAcceptCoverImage(coverPath + orders.getAcceptCoverImage());
        }
        List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
@@ -1299,8 +1780,55 @@
            }
            orders.setMultifileList(multifileList);
        }
        orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
        orders.setCancelStatus(Constants.ZERO);
        if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())&&Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){
            orders.setConfirmCountdown(DateUtil.getXMinuteAfterDate(orders.getIsUpdateTime(),60).getTime() - System.currentTimeMillis());
        }

        this.getPriceUnit(orders);
        if(orders.getStatus() <= Constants.ordersStatus.accept.getKey()){
            if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
                //判断是否可修改 已取消次数 与 时间限制
                Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode());
                Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
                        .apply(" DATE(cancel_time) = DATE(NOW()) ")
                        .eq(Orders::getStatus,Constants.ordersStatus.cancel.getKey())
                        .eq(Orders::getReleaseMemberId,orders.getReleaseMemberId()));
                //查询取消次数
                if(totalCancelTimes<=cancelTimes){
                    orders.setCancelStatus(Constants.ONE);
                    return orders;
                }
                Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIME).getCode());
                Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate());
                if(hours < cancelTimeHour){
                    orders.setCancelStatus(Constants.ONE);
                    return orders;
                }
            }else if(Constants.equalsInteger(orders.getAcceptMemberId(),member.getId())){
                //判断是否可修改 已取消次数 与 时间限制
                Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RECEIVE_CANCEL_TIMES).getCode());
                Long cancelTimes = orderLogMapper.selectCount(new QueryWrapper<OrderLog>().lambda()
                        .apply(" DATE(create_time) = DATE(NOW()) ")
                        .eq(OrderLog::getObjType,Constants.OrdersLog.CANCEL.getKey())
                        .eq(OrderLog::getMemberId,member.getId()));
                //查询取消次数
                if(totalCancelTimes<=cancelTimes){
                    orders.setCancelStatus(Constants.ONE);
                    return orders;
                }

                Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RECEIVE_CANCEL_TIME).getCode());
                Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate());
                if(hours < cancelTimeHour){
                    orders.setCancelStatus(Constants.ONE);
                    return orders;
                }
            }
        } else{
            orders.setCancelStatus(Constants.ONE);
        }
        return orders;
    }

@@ -1310,16 +1838,187 @@
    public synchronized String  getNextCode(Integer type){
        String prefix = "YG";
        if(!Constants.equalsInteger(type,Constants.ZERO)){
            prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
            prefix = (Constants.equalsInteger(type,Constants.ONE)?"YH-":"DC-");
        }
        prefix =  DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
        Integer countNum  = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
        prefix =  prefix + DateUtil.getCurrDateTimeShort() +"-";

        Integer countNum  = (Integer) redisTemplate.opsForValue().get(Constants.RedisKeys.ORDER_CODE);//RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
        countNum = Constants.formatIntegerNum(countNum)+1;
        //更新缓存
        RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
        redisTemplate.opsForValue().set(Constants.RedisKeys.ORDER_CODE,countNum);
        String nextIndex =Integer.toString( countNum );
        return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
    }


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void refundCallback(RefundNotification refundNotification){
        WithdrawalOrders withdrawalOrders = withdrawalOrdersMapper.selectById(refundNotification.getOutRefundNo());
        if(Objects.isNull(withdrawalOrders)||!Constants.equalsInteger(withdrawalOrders.getStatus(),Constants.ZERO)){
            return;
        }
        withdrawalOrders.setWxExternalNo(refundNotification.getTransactionId());
        withdrawalOrders.setUpdateTime(new Date());
        withdrawalOrders.setDoneTime(withdrawalOrders.getUpdateTime());
        if (!"SUCCESS".equals(refundNotification.getRefundStatus().name())) {
            // 如果退款状态不正确，修改退款单状态
            withdrawalOrders.setStatus(Constants.TWO);
        }else{
            withdrawalOrders.setStatus(Constants.ONE);
        }
        //更新退款单状态
        withdrawalOrdersMapper.updateById(withdrawalOrders);
    }


    /**
     * 自动派单
     */
    @Override
    public void autoGrabOrders(){
        String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_DISPATCH).getCode();
        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO)
                .eq(Orders::getStatus,Constants.ONE).eq(Orders::getCommentStatus,Constants.ZERO)
                .apply(" DATE_ADD(create_time, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
                .last("limit 100")
        );
        for (Orders orders:ordersList) {
            BigDecimal lat = orders.getLat();
            BigDecimal lgt = orders.getLgt();
            //查询范围内的会员
            List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType());
//                    memberMapper.selectList(new MPJLambdaWrapper<Member>()
//                    .select(Member::getId,Member::getScore)
//                            .select(" ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > RECEIVE_NUM and RECEIVE_NUM > r.RECEIVE_MIN limit 1  ),0) " ,Member::getLevel)
//                            .select(  " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = ID limit  1 ),0) ",Member::getDistance )
////
//                    .apply(" id in (" +
//                            " select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = '"+orders.getType()+"' " +
//                            " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2))) < 100 " +
//                            ") ")
//                    .orderByDesc(" level , score ")
//                    .orderByAsc(Member::getDistance)
//                    .last(" limit 1 ")
//            );
            if(CollectionUtils.isEmpty(memberList)){
                continue;
            }

            Member member = memberList.get(Constants.ZERO);
            Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
            //自动派单
            Orders model = ordersMapper.selectById(orders.getId());
            if(!Constants.equalsInteger(model.getStatus(),Constants.ONE) || Constants.equalsInteger(model.getId(),model.getReleaseMemberId())){
               //如果订单已删除 并且非发布方
                continue;
            }
            ordersMapper.update(new UpdateWrapper<Orders>().lambda().eq(Orders::getId,model.getId())
                    .set(Orders::getUpdateTime,new Date())
                    .set(Orders::getAcceptType,Constants.ONE)
                    .set(Orders::getAcceptTime,new Date())
                    .set(Orders::getAcceptMemberId,member.getId())
                    .set(Orders::getStatus,Constants.ordersStatus.accept.getKey())
            );

            //更新接单量
            memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" RECEIVE_NUM = (ifnull(RECEIVE_NUM,0) + 1 )").eq(Member::getId,member.getId()));

            //创建操作日志
            Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO;
            this.saveOrderLog(orders,ordersLog,
                    ordersLog.getInfo(),member.getId(),null);

            IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
                    .eq(IdentityInfo::getMemberId,member.getId())
                    .eq(IdentityInfo::getType,orders.getType())
                    .eq(IdentityInfo::getAuditStatus,Constants.TWO)
                    .last("limit 1")
            );
            //通知发单方
            if(org.apache.commons.lang3.StringUtils.isNotBlank(releaseMember.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
                //发送微信通知
                sendWxMessage.acceptMessage(releaseMember.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
            }

            //通知接单方
            sendWxMessage.autoDispatchMessage(member.getOpenid(),orders,GeoUtils.haversineDistance(
                    orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
                    wokerIdentityInfo.getLgt().doubleValue(),
                    wokerIdentityInfo.getLat().doubleValue()
            ));
             
            aliSmsService.businessSendSms(Constants.smsContent.dispatch.getKey(),orders.getLinkPhone(),orders,null,
                    null,categoryMapper);
        }
    }

    //自动评价 订单完成7天后自动评价4星
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void autoComment(){
        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
                .eq(Orders::getStatus,Constants.FOUR).eq(Orders::getCommentStatus,Constants.ZERO)
                .apply(" DATE_ADD(finish_time, INTERVAL 7 DAY) < now() ")
                .last("limit 100")
        );

        for (Orders orders:ordersList) {
            ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                    .set(Orders::getCommentStatus,Constants.ONE)
                    .set(Orders::getUpdateTime,new Date())
                    .set(Orders::getCommentTime,new Date())
                    .set(Orders::getCommentLevel,Constants.FOUR)
                    .set(Orders::getCommentType,Constants.ZERO)
                    .eq(Orders::getId,orders.getId())
            );

            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .setSql(" score = ( ( total_score +" + Constants.FOUR + " ) / (score_order_num + 1 ) ) ")
                    .setSql(" total_score = ( total_score +" + Constants.FOUR + ")")
                    .setSql(" score_order_num = ( score_order_num + 1 ) " ).eq(Member::getId,orders.getAcceptMemberId())
            );

            //日志存储
            Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_COMMENT;
            this.saveOrderLog(orders,ordersLog,
                    ordersLog.getInfo(),orders.getAcceptMemberId(),null);
        }
    }


    //自动确认 订单修改后若未处理 根据配置自动处理
    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void autoConfirm(){
        String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode();
        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
                .eq(Orders::getStatus,Constants.ordersStatus.accept).eq(Orders::getIsUpdate,Constants.ONE)
                .apply(" DATE_ADD(IS_UPDATE_TIME, INTERVAL "+autoConfirmTime+" MINUTE) < now() ")
                .last("limit 100")
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ordersList)){
            for (Orders orders:ordersList) {
                ordersMapper.update(new UpdateWrapper<Orders>().lambda()
                        .set(Orders::getIsUpdate,Constants.TWO)
                        .set(Orders::getUpdateTime,new Date())
                        .eq(Orders::getId,orders.getId())
                );
                //记录同意修改的日志
                Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_AGREE;
                this.saveOrderLog(orders,ordersLog,
                        ordersLog.getInfo(),orders.getAcceptMemberId(),null);
            }
        }
    }


    @Override
    public  void initializeCode(){
        //更新缓存
        redisTemplate.opsForValue().set(Constants.RedisKeys.ORDER_CODE,0);
    }



}